tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-16 02:33:28 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

machine/atsamd21: correct order of params for USB CDC descriptor

Browse Source 
Signed-off-by: Ron Evans <ron@hybridgroup.com>
This commit is contained in:
Ron Evans
2019-09-02 10:40:28 +02:00
committed by Ayke
parent 4ee26fd54b
commit e26f0b35e3
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine_atsamd21.go
+6 -10
View File
@@ -1408,12 +1408,8 @@ func handleUSB() {
handleEndpoint(i) handleEndpoint(i)
} }
setEPINTFLAG(i, epFlags) setEPINTFLAG(i, epFlags)
case usb_CDC_ENDPOINT_IN, usb_CDC_ENDPOINT_ACM: case usb_CDC_ENDPOINT_ACM:
// set bank ready setEPINTFLAG(i, epFlags)
setEPSTATUSCLR(i, sam.USB_DEVICE_EPSTATUSCLR_BK1RDY)
// ack transfer complete
setEPINTFLAG(i, sam.USB_DEVICE_EPINTFLAG_TRCPT1)
} }
} }
} }
@@ -1808,9 +1804,9 @@ func sendConfiguration(setup usbSetup) {
dif := NewInterfaceDescriptor(usb_CDC_DATA_INTERFACE, 2, usb_CDC_DATA_INTERFACE_CLASS, 0, 0) dif := NewInterfaceDescriptor(usb_CDC_DATA_INTERFACE, 2, usb_CDC_DATA_INTERFACE_CLASS, 0, 0)
in := NewEndpointDescriptor((usb_CDC_ENDPOINT_OUT | usbEndpointOut), usb_ENDPOINT_TYPE_BULK, usbEndpointPacketSize, 0) out := NewEndpointDescriptor((usb_CDC_ENDPOINT_OUT | usbEndpointOut), usb_ENDPOINT_TYPE_BULK, usbEndpointPacketSize, 0)
out := NewEndpointDescriptor((usb_CDC_ENDPOINT_IN | usbEndpointIn), usb_ENDPOINT_TYPE_BULK, usbEndpointPacketSize, 0) in := NewEndpointDescriptor((usb_CDC_ENDPOINT_IN | usbEndpointIn), usb_ENDPOINT_TYPE_BULK, usbEndpointPacketSize, 0)
cdc := NewCDCDescriptor(iad, cdc := NewCDCDescriptor(iad,
cif, cif,
@@ -1820,8 +1816,8 @@ func sendConfiguration(setup usbSetup) {
callManagement, callManagement,
cifin, cifin,
dif, dif,
in, out,
out) in)
sz := uint16(configDescriptorSize + cdcSize) sz := uint16(configDescriptorSize + cdcSize)
config := NewConfigDescriptor(sz, 2) config := NewConfigDescriptor(sz, 2)
src/machine/usb.go
+3 -3
View File
@@ -316,8 +316,8 @@ func NewCDCDescriptor(i IADDescriptor, c InterfaceDescriptor,
callm CMFunctionalDescriptor, callm CMFunctionalDescriptor,
ci EndpointDescriptor, ci EndpointDescriptor,
di InterfaceDescriptor, di InterfaceDescriptor,
inp EndpointDescriptor, outp EndpointDescriptor,
outp EndpointDescriptor) CDCDescriptor { inp EndpointDescriptor) CDCDescriptor {
return CDCDescriptor{iad: i, return CDCDescriptor{iad: i,
cif: c, cif: c,
header: h, header: h,
@@ -352,8 +352,8 @@ func (d CDCDescriptor) Bytes() []byte {
buf.Write(d.callManagement.Bytes()) buf.Write(d.callManagement.Bytes())
buf.Write(d.cifin.Bytes()) buf.Write(d.cifin.Bytes())
buf.Write(d.dif.Bytes()) buf.Write(d.dif.Bytes())
buf.Write(d.in.Bytes())
buf.Write(d.out.Bytes()) buf.Write(d.out.Bytes())
buf.Write(d.in.Bytes())
return buf.Bytes() return buf.Bytes()
} }