test: add smoke test

Author: mikesmitty

GNUmakefile

@@ -792,6 +792,10 @@ endif
 	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=feather-nrf52840    examples/usb-midi
 	@$(MD5SUM) test.hex
+	$(TINYGO) build -size short -o test.hex -target=pico    			examples/usb-storage
+	@$(MD5SUM) test.hex
+	$(TINYGO) build -size short -o test.hex -target=pico2    			examples/usb-storage
+	@$(MD5SUM) test.hex
 	$(TINYGO) build -size short -o test.hex -target=nrf52840-s140v6-uf2-generic	examples/machinetest
 	@$(MD5SUM) test.hex
 ifneq ($(STM32), 0)

src/examples/usb-storage/main.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"machine"
+	"machine/usb/msc"
+	"time"
+)
+
+func main() {
+	msc.Port(machine.Flash)
+
+	for {
+		time.Sleep(2 * time.Second)
+	}
+}

src/machine/machine_atsamd21_usb.go

@@ -179,10 +179,9 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
 		setEPINTFLAG(i, epFlags)
 		if (epFlags & sam.USB_DEVICE_EPINTFLAG_TRCPT0) > 0 {
 			buf := handleEndpointRx(i)
-			if usbRxHandler[i] != nil {
-				usbRxHandler[i](buf)
+			if usbRxHandler[i] == nil || usbRxHandler[i](buf) {
+				AckUsbOutTransfer(i)
 			}
-			handleEndpointRxComplete(i)
 		} else if (epFlags & sam.USB_DEVICE_EPINTFLAG_TRCPT1) > 0 {
 			if usbTxHandler[i] != nil {
 				usbTxHandler[i]()
@@ -402,7 +401,8 @@ func handleEndpointRx(ep uint32) []byte {
 	return udd_ep_out_cache_buffer[ep][:count]
 }
 
-func handleEndpointRxComplete(ep uint32) {
+// AckUsbOutTransfer is called to acknowledge the completion of a USB OUT transfer.
+func AckUsbOutTransfer(ep uint32) {
 	// set byte count to zero
 	usbEndpointDescriptors[ep].DeviceDescBank[0].PCKSIZE.ClearBits(usb_DEVICE_PCKSIZE_BYTE_COUNT_Mask << usb_DEVICE_PCKSIZE_BYTE_COUNT_Pos)
 

src/machine/machine_atsamd51_usb.go

@@ -182,10 +182,9 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
 		setEPINTFLAG(i, epFlags)
 		if (epFlags & sam.USB_DEVICE_ENDPOINT_EPINTFLAG_TRCPT0) > 0 {
 			buf := handleEndpointRx(i)
-			if usbRxHandler[i] != nil {
-				usbRxHandler[i](buf)
+			if usbRxHandler[i] == nil || usbRxHandler[i](buf) {
+				AckUsbOutTransfer(i)
 			}
-			handleEndpointRxComplete(i)
 		} else if (epFlags & sam.USB_DEVICE_ENDPOINT_EPINTFLAG_TRCPT1) > 0 {
 			if usbTxHandler[i] != nil {
 				usbTxHandler[i]()
@@ -405,7 +404,8 @@ func handleEndpointRx(ep uint32) []byte {
 	return udd_ep_out_cache_buffer[ep][:count]
 }
 
-func handleEndpointRxComplete(ep uint32) {
+// AckUsbOutTransfer is called to acknowledge the completion of a USB OUT transfer.
+func AckUsbOutTransfer(ep uint32) {
 	// set byte count to zero
 	usbEndpointDescriptors[ep].DeviceDescBank[0].PCKSIZE.ClearBits(usb_DEVICE_PCKSIZE_BYTE_COUNT_Mask << usb_DEVICE_PCKSIZE_BYTE_COUNT_Pos)
 

src/machine/machine_nrf52840_usb.go

@@ -193,10 +193,9 @@ func handleUSBIRQ(interrupt.Interrupt) {
 		if nrf.USBD.EVENTS_ENDEPOUT[i].Get() > 0 {
 			nrf.USBD.EVENTS_ENDEPOUT[i].Set(0)
 			buf := handleEndpointRx(uint32(i))
-			if usbRxHandler[i] != nil {
-				usbRxHandler[i](buf)
+			if usbRxHandler[i] == nil || usbRxHandler[i](buf) {
+				AckUsbOutTransfer(uint32(i))
 			}
-			handleEndpointRxComplete(uint32(i))
 			exitCriticalSection()
 		}
 	}
@@ -291,7 +290,8 @@ func handleEndpointRx(ep uint32) []byte {
 	return udd_ep_out_cache_buffer[ep][:count]
 }
 
-func handleEndpointRxComplete(ep uint32) {
+// AckUsbOutTransfer is called to acknowledge the completion of a USB OUT transfer.
+func AckUsbOutTransfer(ep uint32) {
 	// set ready for next data
 	nrf.USBD.SIZE.EPOUT[ep].Set(0)
 }

src/machine/machine_rp2040_usb.go

@@ -96,7 +96,7 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
 			if s2&(1<<(i*2+1)) > 0 {
 				buf := handleEndpointRx(uint32(i))
 				if usbRxHandler[i] == nil || usbRxHandler[i](buf) {
-					AckEndpointRxMessage(uint32(i))
+					AckUsbOutTransfer(uint32(i))
 				}
 			}
 		}

src/machine/machine_rp2350_usb.go

@@ -99,7 +99,7 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
 			if s2&(1<<(i*2+1)) > 0 {
 				buf := handleEndpointRx(uint32(i))
 				if usbRxHandler[i] == nil || usbRxHandler[i](buf) {
-					AckEndpointRxMessage(uint32(i))
+					AckUsbOutTransfer(uint32(i))
 				}
 			}
 		}

src/machine/machine_rp2_usb.go

@@ -115,8 +115,8 @@ func handleEndpointRx(ep uint32) []byte {
 	return _usbDPSRAM.EPxBuffer[ep].Buffer0[:sz]
 }
 
-// AckEndpointRxMessage is called to acknowledge the completion of a delayed USB OUT transfer.
-func AckEndpointRxMessage(ep uint32) {
+// AckUsbOutTransfer is called to acknowledge the completion of a USB OUT transfer.
+func AckUsbOutTransfer(ep uint32) {
 	ep = ep & 0x7F
 	setEPDataPID(ep, !epXdata0[ep])
 }

src/machine/usb/msc/msc.go

@@ -132,7 +132,7 @@ func (m *msc) processTasks() {
 			// Acknowledge the received data from the host
 			m.queuedBytes = 0
 			m.taskQueued = false
-			machine.AckEndpointRxMessage(usb.MSC_ENDPOINT_OUT)
+			machine.AckUsbOutTransfer(usb.MSC_ENDPOINT_OUT)
 		}
 		time.Sleep(10 * time.Microsecond)
 	}