chore: clean up debug variables

Author: mikesmitty

src/machine/usb/msc/msc.go

@@ -1,7 +1,6 @@
 package msc
 
 import (
-	"fmt"
 	"machine"
 	"machine/usb"
 	"machine/usb/descriptor"
@@ -58,21 +57,6 @@ type msc struct {
 	senseKey           scsi.Sense
 	addlSenseCode      scsi.SenseCode
 	addlSenseQualifier uint8
-
-	// TODO: Cleanup
-	loops        uint32 // Number of loops in the current state
-	prevState    mscState
-	savedState   mscState
-	packetsSent  uint32   // Number of packets sent
-	packetsRecv  uint32   // Number of packets received
-	packetsAcked uint32   // Number of packets acknowledged
-	packetErrors uint32   // Number of error packets sent
-	canaryA      uint32   // Canaries for debugging
-	canaryB      uint32   // Canaries for debugging
-	canaryC      uint32   // Canaries for debugging
-	canaryBuf    [31]byte // CBW buffer container
-	cbwLog       []CBW    // CBW log container
-	msgLog       []MsgLog // TX/RX log container
 }
 
 // Port returns the USB Mass Storage port
@@ -168,10 +152,6 @@ func (m *msc) resetBuffer(length int) {
 
 func (m *msc) sendUSBPacket(b []byte) {
 	if machine.USBDev.InitEndpointComplete {
-		if len(m.msgLog) > 0 {
-			m.saveMsgLog(b, true) // FIXME: Cleanup
-		}
-		m.packetsSent++ // TODO: Cleanup?
 		// Send the USB packet
 		machine.SendUSBInPacket(usb.MSC_ENDPOINT_IN, b)
 	}
@@ -190,7 +170,6 @@ func (m *msc) sendCSW(status csw.Status) {
 
 func txHandler() {
 	if MSC != nil {
-		MSC.packetsAcked++ // TODO: Cleanup?
 		MSC.txHandler()
 	}
 }
@@ -202,10 +181,6 @@ func (m *msc) txHandler() {
 func rxHandler(b []byte) bool {
 	ack := true
 	if MSC != nil {
-		if len(MSC.msgLog) > 0 {
-			MSC.saveMsgLog(b, false) // FIXME: Cleanup
-		}
-		MSC.packetsRecv++ // TODO: Cleanup?
 		ack = MSC.run(b, true)
 	}
 	return ack
@@ -239,14 +214,6 @@ command execution and moves to mscStateStatusSent.
 6. The host ACKs the CSW and the MSC moves back to mscStateCmd, waiting for the next CBW.
 */
 func (m *msc) run(b []byte, isEpOut bool) bool {
-	// TODO: Cleanup?
-	if m.prevState != m.state {
-		m.savedState = m.prevState
-		m.loops = 0
-		m.prevState = m.state
-	}
-	m.loops++
-
 	ack := true
 
 	switch m.state {
@@ -258,11 +225,6 @@ func (m *msc) run(b []byte, isEpOut bool) bool {
 			return ack
 		}
 
-		// Save debug log of received CBW commands
-		if len(m.cbwLog) > 0 {
-			m.saveCBW(b)
-		}
-
 		// Create a temporary CBW wrapper to validate the incoming data. Has to be temporary
 		// to avoid it escaping into the heap since we're in interrupt context
 		cbw := CBW{Data: b}
@@ -335,123 +297,3 @@ func (m *msc) run(b []byte, isEpOut bool) bool {
 
 	return ack
 }
-
-// TODO: Cleanup
-func (m *msc) CanaryBuf() string {
-	if m.canaryA > 0 {
-		return fmt.Sprintf("% x", m.canaryBuf)
-	}
-	return ""
-}
-
-func stateToString(state mscState) string {
-	switch state {
-	case mscStateCmd:
-		return "CmdWait"
-	case mscStateData:
-		return "Data"
-	case mscStateStatus:
-		return "SendStatus"
-	case mscStateStatusSent:
-		return "StatusSent"
-	case mscStateNeedReset:
-		return "NeedReset"
-	default:
-		return "Unknown"
-	}
-}
-
-func (m *msc) State() string {
-	switch m.state {
-	case mscStateCmd:
-		return fmt.Sprintf("(%d/%d/%d) [%d/%d/%d/%d] CmdWait (%d) <- %s", m.canaryA, m.canaryB, m.canaryC, m.packetsRecv, m.packetsSent, m.packetsAcked, m.packetErrors, m.loops, stateToString(m.savedState))
-	case mscStateData:
-		return fmt.Sprintf("(%d/%d/%d) [%d/%d/%d/%d] Data [%d/%d/%d] (%d) <- %s", m.canaryA, m.canaryB, m.canaryC, m.packetsRecv, m.packetsSent, m.packetsAcked, m.packetErrors, m.queuedBytes, m.sentBytes, m.totalBytes, m.loops, stateToString(m.savedState))
-	case mscStateStatus:
-		return fmt.Sprintf("(%d/%d/%d) [%d/%d/%d/%d] SendStatus (%d) <- %s", m.canaryA, m.canaryB, m.canaryC, m.packetsRecv, m.packetsSent, m.packetsAcked, m.packetErrors, m.loops, stateToString(m.savedState))
-	case mscStateStatusSent:
-		return fmt.Sprintf("(%d/%d/%d) [%d/%d/%d/%d] StatusSent (%d) <- %s", m.canaryA, m.canaryB, m.canaryC, m.packetsRecv, m.packetsSent, m.packetsAcked, m.packetErrors, m.loops, stateToString(m.savedState))
-	case mscStateNeedReset:
-		return fmt.Sprintf("(%d/%d/%d) [%d/%d/%d/%d] NeedReset (%d) <- %s", m.canaryA, m.canaryB, m.canaryC, m.packetsRecv, m.packetsSent, m.packetsAcked, m.packetErrors, m.loops, stateToString(m.savedState))
-	default:
-		return "Unknown"
-	}
-}
-
-func (m *msc) saveCBW(b []byte) {
-	n := len(m.cbwLog) - 1
-	// Shift the log entries up to make room for a new entry
-	for i := 0; i < n; i++ {
-		copy(m.cbwLog[i].Data, m.cbwLog[i+1].Data)
-		m.cbwLog[i].HasCmd = m.cbwLog[i+1].HasCmd
-	}
-	copy(m.cbwLog[n].Data, b)
-	m.cbwLog[n].HasCmd = true
-}
-
-func (m *msc) SetCBWLogSize(n int) {
-	// Initialize the CBW log with a fixed size
-	m.cbwLog = make([]CBW, n)
-	for i := range m.cbwLog {
-		m.cbwLog[i].Data = make([]byte, 31)
-	}
-}
-
-func (m *msc) CBWLog() []CBW {
-	return m.cbwLog
-}
-
-type MsgLog struct {
-	CBW    CBW
-	Data   []byte
-	Length int
-	Tx     bool
-	Valid  bool
-}
-
-func (m *msc) saveMsgLog(b []byte, tx bool) {
-	n := len(m.msgLog) - 1
-	// Shift the log entries up to make room for a new entry
-	for i := 0; i < n; i++ {
-		copy(m.msgLog[i].CBW.Data, m.msgLog[i+1].CBW.Data)
-		copy(m.msgLog[i].Data, m.msgLog[i+1].Data)
-		m.msgLog[i].Length = m.msgLog[i+1].Length
-		m.msgLog[i].Tx = m.msgLog[i+1].Tx
-		m.msgLog[i].Valid = m.msgLog[i+1].Valid
-	}
-	copy(m.msgLog[n].CBW.Data, m.cbw.Data)
-	copy(m.msgLog[n].Data, b)
-	m.msgLog[n].Length = len(b)
-	m.msgLog[n].Tx = tx
-	m.msgLog[n].Valid = true
-}
-
-func (m *msc) SetMsgLogSize(n int) {
-	// Initialize the TX log with a fixed size
-	m.msgLog = make([]MsgLog, n)
-	for i := range m.msgLog {
-		m.msgLog[i].CBW = CBW{Data: make([]byte, cbwMsgLen)}
-		m.msgLog[i].Data = make([]byte, m.maxPacketSize)
-	}
-}
-
-func (m *msc) MsgLog() []MsgLog {
-	return m.msgLog
-}
-
-func (m *msc) ClearMsgLog() {
-	// Clear the TX log
-	for i := range m.msgLog {
-		m.msgLog[i].Valid = false
-	}
-}
-
-func allZero(b []byte) bool {
-	// FIXME: Cleanup
-	for i := 0; i < len(b); i++ {
-		if b[i] != 0 {
-			return false
-		}
-	}
-	return len(b) != 0
-}

src/machine/usb/msc/scsi.go

@@ -278,8 +278,6 @@ func (m *msc) scsiQueueTask(cmdType scsi.CmdType, b []byte) bool {
 }
 
 func (m *msc) sendScsiError(status csw.Status, key scsi.Sense, code scsi.SenseCode) {
-	m.packetErrors++ // TODO: Cleanup?
-
 	// Generate CSW into m.cswBuf
 	residue := m.totalBytes - m.sentBytes