aboutsummaryrefslogtreecommitdiff
path: root/Projects/XPLAINBridge/USARTDescriptors.c
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2012-05-20 17:09:39 +0000
committerDean Camera <[email protected]>2012-05-20 17:09:39 +0000
commit5833b27f80f4b6b10f5765468f5863e57b97a65a (patch)
treea8df9f72605f3f069fa42a67d35ba6874cc0144d /Projects/XPLAINBridge/USARTDescriptors.c
parent32cfb8cf4f56f45ddfc50a6b2803ac98496c2c0b (diff)
downloadqmk_firmware-5833b27f80f4b6b10f5765468f5863e57b97a65a.tar.gz
qmk_firmware-5833b27f80f4b6b10f5765468f5863e57b97a65a.zip
Alter the XPLAINBridge and AVRISP-MKII clone projects so that the descriptors from the AVRISP-MKII clone project can be directly used in the XPLAINBridge project. Add support for RESET_TOGGLES_LIBUSB_COMPAT option in the XPLAINBridge project.
Diffstat (limited to 'Projects/XPLAINBridge/USARTDescriptors.c')
-rw-r--r--Projects/XPLAINBridge/USARTDescriptors.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c
index 6c131afd4c..491b875908 100644
--- a/Projects/XPLAINBridge/USARTDescriptors.c
+++ b/Projects/XPLAINBridge/USARTDescriptors.c
@@ -224,7 +224,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);
@@ -232,6 +233,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: