From 93ba3defd76ff3dba5194eb4b6798eee8b70fdfb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 1 Feb 2013 01:13:39 +0000 Subject: Manufacturer and Product name now changeable by Makefile git-svn-id: https://svn.spreadspace.org/avr/trunk@110 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- lib/lufa-descriptor-rndis.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/lufa-descriptor-rndis.c b/lib/lufa-descriptor-rndis.c index a75bfd5..28ea637 100644 --- a/lib/lufa-descriptor-rndis.c +++ b/lib/lufa-descriptor-rndis.c @@ -191,9 +191,12 @@ const USB_Descriptor_String_t PROGMEM LanguageString = */ const USB_Descriptor_String_t PROGMEM ManufacturerString = { - .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String}, - - .UnicodeString = L"Dean Camera" + .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, @@ -202,9 +205,12 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString = */ const USB_Descriptor_String_t PROGMEM ProductString = { - .Header = {.Size = USB_STRING_LEN(19), .Type = DTYPE_String}, - - .UnicodeString = L"LUFA RNDIS CDC Demo" + .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" -- cgit v1.2.3