chore: move common alias functions to usb.go

Author: mikesmitty

src/machine/machine_atsamd21_usb.go

@@ -348,10 +348,6 @@ func (dev *USBDevice) SendUSBInPacket(ep uint32, data []byte) bool {
 	return true
 }
 
-func SendUSBInPacket(ep uint32, data []byte) bool {
-	return USBDev.SendUSBInPacket(ep, data)
-}
-
 // Prevent file size increases: https://github.com/tinygo-org/tinygo/pull/998
 //
 //go:noinline
@@ -432,18 +428,10 @@ func (dev *USBDevice) AckUsbOutTransfer(ep uint32) {
 	setEPSTATUSCLR(ep, sam.USB_DEVICE_EPSTATUSCLR_BK0RDY)
 }
 
-func AckUsbOutTransfer(ep uint32) {
-	USBDev.AckUsbOutTransfer(ep)
-}
-
 func (dev *USBDevice) SendZlp() {
 	usbEndpointDescriptors[0].DeviceDescBank[1].PCKSIZE.ClearBits(usb_DEVICE_PCKSIZE_BYTE_COUNT_Mask << usb_DEVICE_PCKSIZE_BYTE_COUNT_Pos)
 }
 
-func SendZlp() {
-	USBDev.SendZlp()
-}
-
 func epPacketSize(size uint16) uint32 {
 	switch size {
 	case 8:

src/machine/machine_atsamd51_usb.go

@@ -351,10 +351,6 @@ func (dev *USBDevice) SendUSBInPacket(ep uint32, data []byte) bool {
 	return true
 }
 
-func SendUSBInPacket(ep uint32, data []byte) bool {
-	return USBDev.SendUSBInPacket(ep, data)
-}
-
 // Prevent file size increases: https://github.com/tinygo-org/tinygo/pull/998
 //
 //go:noinline
@@ -435,18 +431,10 @@ func (dev *USBDevice) AckUsbOutTransfer(ep uint32) {
 	setEPSTATUSCLR(ep, sam.USB_DEVICE_ENDPOINT_EPSTATUSCLR_BK0RDY)
 }
 
-func AckUsbOutTransfer(ep uint32) {
-	USBDev.AckUsbOutTransfer(ep)
-}
-
 func (dev *USBDevice) SendZlp() {
 	usbEndpointDescriptors[0].DeviceDescBank[1].PCKSIZE.ClearBits(usb_DEVICE_PCKSIZE_BYTE_COUNT_Mask << usb_DEVICE_PCKSIZE_BYTE_COUNT_Pos)
 }
 
-func SendZlp() {
-	USBDev.SendZlp()
-}
-
 func epPacketSize(size uint16) uint32 {
 	switch size {
 	case 8:

src/machine/machine_nrf52840_usb.go

@@ -264,10 +264,6 @@ func (dev *USBDevice) SendUSBInPacket(ep uint32, data []byte) bool {
 	return true
 }
 
-func SendUSBInPacket(ep uint32, data []byte) bool {
-	return USBDev.SendUSBInPacket(ep, data)
-}
-
 // Prevent file size increases: https://github.com/tinygo-org/tinygo/pull/998
 //
 //go:noinline
@@ -313,18 +309,10 @@ func (dev *USBDevice) AckUsbOutTransfer(ep uint32) {
 	nrf.USBD.SIZE.EPOUT[ep].Set(0)
 }
 
-func AckUsbOutTransfer(ep uint32) {
-	USBDev.AckUsbOutTransfer(ep)
-}
-
 func (dev *USBDevice) SendZlp() {
 	nrf.USBD.TASKS_EP0STATUS.Set(1)
 }
 
-func SendZlp() {
-	USBDev.SendZlp()
-}
-
 // Set ENDPOINT_HALT/stall status on a USB IN endpoint.
 func (dev *USBDevice) SetStallEPIn(ep uint32) {
 	// Bit 8 is STALL, Bit 7 is IO (1 for IN), Bits 0-2 are EP number.

src/machine/machine_rp2_usb.go

@@ -76,10 +76,6 @@ func (dev *USBDevice) SendUSBInPacket(ep uint32, data []byte) bool {
 	return true
 }
 
-func SendUSBInPacket(ep uint32, data []byte) bool {
-	return USBDev.SendUSBInPacket(ep, data)
-}
-
 // Prevent file size increases: https://github.com/tinygo-org/tinygo/pull/998
 //
 //go:noinline
@@ -138,10 +134,6 @@ func (dev *USBDevice) AckUsbOutTransfer(ep uint32) {
 	setEPDataPID(ep, !epXdata0[ep])
 }
 
-func AckUsbOutTransfer(ep uint32) {
-	USBDev.AckUsbOutTransfer(ep)
-}
-
 // Set the USB endpoint Packet ID to DATA0 or DATA1.
 func setEPDataPID(ep uint32, dataOne bool) {
 	epXdata0[ep] = dataOne
@@ -156,10 +148,6 @@ func (dev *USBDevice) SendZlp() {
 	sendUSBPacket(0, []byte{}, 0)
 }
 
-func SendZlp() {
-	USBDev.SendZlp()
-}
-
 func sendViaEPIn(ep uint32, data []byte, count int) {
 	// Prepare buffer control register value
 	val := uint32(count) | usbBuf0CtrlAvail

src/machine/usb.go

@@ -371,3 +371,16 @@ func (d *USBDevice) ConfigureUSBEndpoint(desc descriptor.Descriptor, epSettings
 		usbSetupHandler[s.Index] = s.Handler
 	}
 }
+
+// Old usb functions kept for compatibility
+func AckUsbOutTransfer(ep uint32) {
+	USBDev.AckUsbOutTransfer(ep)
+}
+
+func SendUSBInPacket(ep uint32, data []byte) bool {
+	return USBDev.SendUSBInPacket(ep, data)
+}
+
+func SendZlp() {
+	USBDev.SendZlp()
+}