From 565d4aa1a4f838c17520a58071c7d51dcc556aa7 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 15 Mar 2014 21:16:23 +0000
Subject: fixed usb string length

git-svn-id: https://svn.spreadspace.org/avr/trunk@254 aa12f405-d877-488e-9caf-2d797e2a1cc7
---
 lib/lufa-descriptor-usbserial.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/lufa-descriptor-usbserial.c')

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
 };
-- 
cgit v1.2.3