diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-05-20 17:16:21 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2012-05-20 17:16:21 +0000 |
| commit | 87a8f05c504df358dd8daf018069bf83d767e130 (patch) | |
| tree | aac4b2e9f666d28d37ca6078afc08926021867f8 /Projects/XPLAINBridge/USARTDescriptors.c | |
| parent | 7f4149489110377f6773b5e78147e9cde04bbeeb (diff) | |
| parent | cc3ee891c9316e3106a5b6379c9e9e1b1cb1c195 (diff) | |
Merge in latest trunk.
git-svn-id: http://lufa-lib.googlecode.com/svn/branches/AppConfigHeaders@2232 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/XPLAINBridge/USARTDescriptors.c')
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 1b265411..2a96c146 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -213,7 +213,8 @@ const USB_Descriptor_String_t PROGMEM USART_ProductString = */ uint16_t USART_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, - const void** const DescriptorAddress) + const void** const DescriptorAddress, + uint8_t* const DescriptorMemorySpace) { const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorNumber = (wValue & 0xFF); @@ -221,6 +222,8 @@ uint16_t USART_GetDescriptor(const uint16_t wValue, const void* Address = NULL; uint16_t Size = NO_DESCRIPTOR; + *DescriptorMemorySpace = MEMSPACE_FLASH; + switch (DescriptorType) { case DTYPE_Device: |