refactor USB init functions to minimize API

This commit is contained in:
sago35
2022-05-12 20:37:51 +09:00
parent 8fa58fdc6d
commit e94ab78926
5 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -1974,7 +1974,7 @@ func (tcc *TCC) Set(channel uint8, value uint32) {
} }
} }
func InitUSBIO() { func initUSB() {
// Configure USB D+/D- pins. // Configure USB D+/D- pins.
USBCDC_DM_PIN.Configure(PinConfig{Mode: PinCom}) USBCDC_DM_PIN.Configure(PinConfig{Mode: PinCom})
USBCDC_DP_PIN.Configure(PinConfig{Mode: PinCom}) USBCDC_DP_PIN.Configure(PinConfig{Mode: PinCom})
+2 -3
View File
@@ -7,8 +7,7 @@ import "machine/usb"
var USB = &usb.CDC{} var USB = &usb.CDC{}
func InitUSB(port int) { func InitUSB() {
InitUSBIO() initUSB()
USB.Port = port
USB.Configure(usb.CDCConfig{}) USB.Configure(usb.CDCConfig{})
} }
+2 -3
View File
@@ -7,8 +7,7 @@ import "machine/usb"
var USB = &usb.HID{} var USB = &usb.HID{}
func InitUSB(port int) { func InitUSB() {
InitUSBIO() initUSB()
USB.Port = port
USB.Configure(usb.HIDConfig{}) USB.Configure(usb.HIDConfig{})
} }
+3
View File
@@ -497,6 +497,9 @@ func (d *dhw) controlTransferContinue(endpoint uint8, count, total uint32) {
if xfer, ok := d.ep[num][dir].activeTransfer(); ok { if xfer, ok := d.ep[num][dir].activeTransfer(); ok {
data, size := xfer.packetComplete(count) data, size := xfer.packetComplete(count)
d.endpointTransfer(endpoint, data, size) d.endpointTransfer(endpoint, data, size)
if size == 0 || size < xfer.maxPacketSize {
d.controlTransferComplete(endpoint, count, total)
}
} }
} }
+1 -1
View File
@@ -33,7 +33,7 @@ func init() {
// machine.USB.Configure(usb.UARTConfig{}) // machine.USB.Configure(usb.UARTConfig{})
//} //}
machine.InitUSB(0) machine.InitUSB()
} }
func putchar(c byte) { func putchar(c byte) {