fix: correct error return values

Author: mikesmitty

src/machine/usb/msc/scsi_unmap.go

@@ -51,8 +51,7 @@ func (m *msc) scsiUnmap(b []byte) {
 	for i := 8; i < descEnd; i += 16 {
 		err := m.unmapBlocksFromDescriptor(b[i:], uint64(m.blockCount))
 		if err != nil {
-			// TODO: Might need a better error code here for device errors?
-			m.sendScsiError(csw.StatusFailed, scsi.SenseVolumeOverflow, scsi.SenseCodeLBAOutOfRange)
+			m.sendScsiError(csw.StatusFailed, scsi.SenseIllegalRequest, scsi.SenseCodeLBAOutOfRange)
 			return
 		}
 	}

src/machine/usb/msc/setup.go

@@ -3,7 +3,6 @@ package msc
 import (
 	"machine"
 	"machine/usb"
-	"machine/usb/msc/csw"
 )
 
 func setupPacketHandler(setup usb.Setup) bool {
@@ -36,6 +35,10 @@ func (m *msc) handleClearFeature(setup usb.Setup, wValue uint16) bool {
 	if wValue != 0 {
 		return ok
 	}
+
+	// Clear the direction bit from the endpoint address for comparison
+	wIndex := setup.WIndex & 0x7F
+
 	// Clearing the stall is not enough, continue stalling until a reset is received first
 	// 6.6.1 CBW Not Valid
 	// If the CBW is not valid, the device shall STALL the Bulk-In pipe. Also, the device
@@ -47,7 +50,6 @@ func (m *msc) handleClearFeature(setup usb.Setup, wValue uint16) bool {
 	// (c) a Clear Feature HALT to the Bulk-Out endpoint (clear stall OUT)
 	// https://usb.org/sites/default/files/usbmassbulk_10.pdf
 	if m.state == mscStateNeedReset {
-		wIndex := setup.WIndex & 0x7F // Clear the direction bit from the endpoint address for comparison
 		if wIndex == usb.MSC_ENDPOINT_IN {
 			m.stallEndpoint(usb.MSC_ENDPOINT_IN)
 		} else if wIndex == usb.MSC_ENDPOINT_OUT {
@@ -56,9 +58,6 @@ func (m *msc) handleClearFeature(setup usb.Setup, wValue uint16) bool {
 		return ok
 	}
 
-	// Clear the direction bit from the endpoint address for comparison
-	wIndex := setup.WIndex & 0x7F
-
 	// Clear the IN/OUT stalls if addressed to the endpoint, or both if addressed to the interface
 	if wIndex == usb.MSC_ENDPOINT_IN || wIndex == mscInterface {
 		m.clearStallEndpoint(usb.MSC_ENDPOINT_IN)
@@ -70,7 +69,7 @@ func (m *msc) handleClearFeature(setup usb.Setup, wValue uint16) bool {
 	}
 	// Send a CSW if needed to resume after the IN endpoint stall is cleared
 	if m.state == mscStateStatus && wIndex == usb.MSC_ENDPOINT_IN {
-		m.sendCSW(csw.StatusPassed)
+		m.sendCSW(m.respStatus)
 		ok = true
 	}