diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-03-15 21:16:23 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-03-15 21:16:23 +0000 |
| commit | 565d4aa1a4f838c17520a58071c7d51dcc556aa7 (patch) | |
| tree | dded009885b64d74daee136ceab44a83a55a9aa6 /lib | |
| parent | added 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')
| -rw-r--r-- | lib/lufa-descriptor-keyboardmouse.c | 6 | ||||
| -rw-r--r-- | lib/lufa-descriptor-midi.c | 8 | ||||
| -rw-r--r-- | lib/lufa-descriptor-rndis.c | 6 | ||||
| -rw-r--r-- | lib/lufa-descriptor-usbdualserial.c | 6 | ||||
| -rw-r--r-- | lib/lufa-descriptor-usbserial.c | 6 |
5 files changed, 20 insertions, 12 deletions
diff --git a/lib/lufa-descriptor-keyboardmouse.c b/lib/lufa-descriptor-keyboardmouse.c index ca19381..acc319b 100644 --- a/lib/lufa-descriptor-keyboardmouse.c +++ b/lib/lufa-descriptor-keyboardmouse.c @@ -208,10 +208,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
};
@@ -222,10 +223,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */
const USB_Descriptor_String_t PROGMEM ProductString =
{
- .Header = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
#ifndef USB_PRODUCT
+ .Header = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
.UnicodeString = L"LUFA Mouse and Keyboard Demo"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
.UnicodeString = USB_PRODUCT
#endif
};
diff --git a/lib/lufa-descriptor-midi.c b/lib/lufa-descriptor-midi.c index ee5e6c3..99fab41 100644 --- a/lib/lufa-descriptor-midi.c +++ b/lib/lufa-descriptor-midi.c @@ -261,11 +261,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
};
@@ -276,11 +276,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */
const USB_Descriptor_String_t PROGMEM ProductString =
{
- .Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
-
#ifndef USB_PRODUCT
+ .Header = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
.UnicodeString = L"LUFA MIDI Demo"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
.UnicodeString = USB_PRODUCT
#endif
};
diff --git a/lib/lufa-descriptor-rndis.c b/lib/lufa-descriptor-rndis.c index 28ea637..ba29037 100644 --- a/lib/lufa-descriptor-rndis.c +++ b/lib/lufa-descriptor-rndis.c @@ -191,10 +191,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
};
@@ -205,10 +206,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
};
diff --git a/lib/lufa-descriptor-usbdualserial.c b/lib/lufa-descriptor-usbdualserial.c index 0d506c7..639391c 100644 --- a/lib/lufa-descriptor-usbdualserial.c +++ b/lib/lufa-descriptor-usbdualserial.c @@ -318,10 +318,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
};
@@ -332,10 +333,11 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */
const USB_Descriptor_String_t PROGMEM ProductString =
{
- .Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
#ifndef USB_PRODUCT
+ .Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
.UnicodeString = L"LUFA Dual CDC Demo"
#else
+ .Header = {.Size = USB_STRING_LEN(USB_PRODUCT_LEN), .Type = DTYPE_String},
.UnicodeString = USB_PRODUCT
#endif
};
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
};
|