diff options
| author | Christian Pointner <equinox@mur.at> | 2012-06-05 16:09:11 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2012-06-05 16:09:11 +0000 |
| commit | 09440ebcd892d2f8abee1c79a6a046d0c7157e07 (patch) | |
| tree | 936ab3296adab9f50f0033c342e7a033475377d2 /software/avr.lib/lufa-descriptor-usbserial.c | |
| parent | some timing test for idm communication (not working yet - hardware probs?) (diff) | |
USB Manufacturer and Product
git-svn-id: https://svn.spreadspace.org/mur.sat@502 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software/avr.lib/lufa-descriptor-usbserial.c')
| -rw-r--r-- | software/avr.lib/lufa-descriptor-usbserial.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/software/avr.lib/lufa-descriptor-usbserial.c b/software/avr.lib/lufa-descriptor-usbserial.c index 6e9f022..1c049be 100644 --- a/software/avr.lib/lufa-descriptor-usbserial.c +++ b/software/avr.lib/lufa-descriptor-usbserial.c @@ -197,6 +197,7 @@ const USB_Descriptor_String_t PROGMEM LanguageString = .UnicodeString = {LANGUAGE_ID_ENG}
};
+
/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
* form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
* Descriptor.
@@ -204,8 +205,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
.UnicodeString = L"Dean Camera"
+#else
+ .UnicodeString = USB_MANUFACTURER
+#endif
};
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
@@ -215,8 +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
.UnicodeString = L"LUFA USB-RS232 Adapter"
+#else
+ .UnicodeString = USB_PRODUCT
+#endif
};
/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
|