summaryrefslogtreecommitdiff
path: root/lib/lufa-descriptor-usbserial.c
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2014-03-15 21:16:23 +0000
committerChristian Pointner <equinox@spreadspace.org>2014-03-15 21:16:23 +0000
commit565d4aa1a4f838c17520a58071c7d51dcc556aa7 (patch)
treedded009885b64d74daee136ceab44a83a55a9aa6 /lib/lufa-descriptor-usbserial.c
parentadded deps to Makefile (diff)
fixed usb string length
git-svn-id: https://svn.spreadspace.org/avr/trunk@254 aa12f405-d877-488e-9caf-2d797e2a1cc7
Diffstat (limited to 'lib/lufa-descriptor-usbserial.c')
-rw-r--r--lib/lufa-descriptor-usbserial.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/lufa-descriptor-usbserial.c b/lib/lufa-descriptor-usbserial.c
index 1c049be..fa2ef25 100644
--- a/lib/lufa-descriptor-usbserial.c
+++ b/lib/lufa-descriptor-usbserial.c
@@ -204,10 +204,11 @@ const USB_Descriptor_String_t PROGMEM LanguageString =
*/
const USB_Descriptor_String_t PROGMEM ManufacturerString =
{
- .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
#ifndef USB_MANUFACTURER
+ .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
.UnicodeString = L"Dean Camera"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_MANUFACTURER_LEN), .Type = DTYPE_String},
.UnicodeString = USB_MANUFACTURER
#endif
};
@@ -218,10 +219,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString =
*/
const USB_Descriptor_String_t PROGMEM ProductString =
{
- .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},
#ifndef USB_PRODUCT
+ .Header = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},
.UnicodeString = L"LUFA USB-RS232 Adapter"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
.UnicodeString = USB_PRODUCT
#endif
};