summaryrefslogtreecommitdiff
path: root/lib/lufa-descriptor-usbserial.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/lufa-descriptor-usbserial.c')
-rw-r--r--lib/lufa-descriptor-usbserial.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/lufa-descriptor-usbserial.c b/lib/lufa-descriptor-usbserial.c
index 6e9f022..1c049be 100644
--- a/lib/lufa-descriptor-usbserial.c
+++ b/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"