diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2016-04-03 11:34:34 +1000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2016-04-03 11:34:34 +1000 |
| commit | 9cca7a594f23f46d56ded6ab806235e3fc62055d (patch) | |
| tree | 5204ce2d3c0f53112430a411b34f85cb670bee1c /Projects/XPLAINBridge/USARTDescriptors.c | |
| parent | 9864c02eb4a33b260cc016b7108a12412b9264b5 (diff) | |
| parent | 9669a00c34dc7545b2ca538b5aa0fde745483824 (diff) | |
| download | lufa-9cca7a594f23f46d56ded6ab806235e3fc62055d.tar.gz lufa-9cca7a594f23f46d56ded6ab806235e3fc62055d.tar.bz2 lufa-9cca7a594f23f46d56ded6ab806235e3fc62055d.zip | |
Merge branch 'master' into dmbs
Diffstat (limited to 'Projects/XPLAINBridge/USARTDescriptors.c')
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 1478e2888..76da7c22e 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2015. + Copyright (C) Dean Camera, 2016. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2015 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2016 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -198,8 +198,7 @@ const USB_Descriptor_String_t PROGMEM USART_ProductString = USB_STRING_DESCRIPTO */ uint16_t USART_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, - const void** const DescriptorAddress, - uint8_t* const DescriptorMemorySpace) + const void** const DescriptorAddress) { const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorNumber = (wValue & 0xFF); @@ -207,8 +206,6 @@ 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: |