diff options
| author | AJM <poslathian@poslathian.(none)> | 2010-04-24 22:23:50 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-05-20 22:09:15 -0400 |
| commit | 6ad3acd15e9859ac9bc77c1eb04d67108dcc5a03 (patch) | |
| tree | 689a264bfd8535205a9a905afc03e38cf762520b /core/usb/descriptors.c | |
| parent | a86ec7c81d7ad2037e900899a0b32c5592cae7c0 (diff) | |
| download | librambutan-6ad3acd15e9859ac9bc77c1eb04d67108dcc5a03.tar.gz librambutan-6ad3acd15e9859ac9bc77c1eb04d67108dcc5a03.zip | |
finally got TX working without any delay, there is some weird timing involved in what happens when the line state is toggled (host port disconnected) and theres still data waiting to go out, this will hang any while(txCount != 0) calls. similarly, sending data without checking txCount != 0 will hard fault the chip. This is all handled now by usbSendBytes, which returns -1 for unconnected, and 0 for simply 'waiting to send'
Diffstat (limited to 'core/usb/descriptors.c')
| -rw-r--r-- | core/usb/descriptors.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/usb/descriptors.c b/core/usb/descriptors.c index 7ff26a2..5038709 100644 --- a/core/usb/descriptors.c +++ b/core/usb/descriptors.c @@ -143,7 +143,7 @@ const USB_Descriptor_Config usbVcomDescriptor_Config = { which is 0x0409 for US English */ -uint8 usbVcomDescriptor_LangID[USB_DESCRIPTOR_STRING_LEN(1)] = +const uint8 usbVcomDescriptor_LangID[USB_DESCRIPTOR_STRING_LEN(1)] = { USB_DESCRIPTOR_STRING_LEN(1), USB_DESCRIPTOR_TYPE_STRING, @@ -151,7 +151,7 @@ uint8 usbVcomDescriptor_LangID[USB_DESCRIPTOR_STRING_LEN(1)] = 0x04 }; -uint8 usbVcomDescriptor_iManufacturer[USB_DESCRIPTOR_STRING_LEN(8)] = +const uint8 usbVcomDescriptor_iManufacturer[USB_DESCRIPTOR_STRING_LEN(8)] = { USB_DESCRIPTOR_STRING_LEN(8), USB_DESCRIPTOR_TYPE_STRING, @@ -159,7 +159,7 @@ uint8 usbVcomDescriptor_iManufacturer[USB_DESCRIPTOR_STRING_LEN(8)] = 'L', 0, 'a', 0, 'b', 0, 's', 0 }; -uint8 usbVcomDescriptor_iProduct[USB_DESCRIPTOR_STRING_LEN(8)] = +const uint8 usbVcomDescriptor_iProduct[USB_DESCRIPTOR_STRING_LEN(8)] = { USB_DESCRIPTOR_STRING_LEN(8), USB_DESCRIPTOR_TYPE_STRING, |