From 2f0ec3589ac3bda7970c9c055b19d0fe1ccc1c4c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 15 Mar 2014 21:33:43 +0000 Subject: upgraded avr utils git-svn-id: https://svn.spreadspace.org/mur.sat@881 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- software/avr.lib/lufa-descriptor-usbserial.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'software/avr.lib/lufa-descriptor-usbserial.c') diff --git a/software/avr.lib/lufa-descriptor-usbserial.c b/software/avr.lib/lufa-descriptor-usbserial.c index 1c049be..fa2ef25 100644 --- a/software/avr.lib/lufa-descriptor-usbserial.c +++ b/software/avr.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 }; -- cgit v1.2.3