tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-10 05:53:39 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

machine/usb: refactor endpoint configuration

Browse Source
This commit is contained in:
sago35
2023-08-02 08:30:51 +09:00
committed by Ron Evans
parent 069e4f0d98
commit 395ee2d338
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/usb.go
+11 -11
View File
@@ -266,18 +266,18 @@ func EnableCDC(txHandler func(), rxHandler func([]byte), setupHandler func(usb.S
ConfigureUSBEndpoint(usbDescriptor,
[]usb.EndpointConfig{
{
No: usb.CDC_ENDPOINT_ACM,
IsIn: true,
Type: usb.ENDPOINT_TYPE_INTERRUPT,
Index: usb.CDC_ENDPOINT_ACM,
IsIn: true,
Type: usb.ENDPOINT_TYPE_INTERRUPT,
},
{
No: usb.CDC_ENDPOINT_OUT,
Index: usb.CDC_ENDPOINT_OUT,
IsIn: false,
Type: usb.ENDPOINT_TYPE_BULK,
RxHandler: rxHandler,
},
{
No: usb.CDC_ENDPOINT_IN,
Index: usb.CDC_ENDPOINT_IN,
IsIn: true,
Type: usb.ENDPOINT_TYPE_BULK,
TxHandler: txHandler,
@@ -285,7 +285,7 @@ func EnableCDC(txHandler func(), rxHandler func([]byte), setupHandler func(usb.S
},
[]usb.SetupConfig{
{
No: usb.CDC_ACM_INTERFACE,
Index: usb.CDC_ACM_INTERFACE,
Handler: setupHandler,
},
})
@@ -296,19 +296,19 @@ func ConfigureUSBEndpoint(desc descriptor.Descriptor, epSettings []usb.EndpointC
for _, ep := range epSettings {
if ep.IsIn {
endPoints[ep.No] = uint32(ep.Type | usb.EndpointIn)
endPoints[ep.Index] = uint32(ep.Type | usb.EndpointIn)
if ep.TxHandler != nil {
usbTxHandler[ep.No] = ep.TxHandler
usbTxHandler[ep.Index] = ep.TxHandler
}
} else {
endPoints[ep.No] = uint32(ep.Type | usb.EndpointOut)
endPoints[ep.Index] = uint32(ep.Type | usb.EndpointOut)
if ep.RxHandler != nil {
usbRxHandler[ep.No] = ep.RxHandler
usbRxHandler[ep.Index] = ep.RxHandler
}
}
}
for _, s := range setup {
usbSetupHandler[s.No] = s.Handler
usbSetupHandler[s.Index] = s.Handler
}
}