diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-06-05 15:11:53 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-06-05 15:11:53 +0000 |
| commit | 43dac3ec3726b3c7b2d72fda8a5c595f19ea1b03 (patch) | |
| tree | c6dfdface736aa46309b0df34dedc2b0a35b4a29 | |
| parent | fixed lib for chips without bootloader function... (more workaround than fix) (diff) | |
USB Manufacturer and Product are now configurable
git-svn-id: https://svn.spreadspace.org/avr/trunk@55 aa12f405-d877-488e-9caf-2d797e2a1cc7
| -rw-r--r-- | lib/lufa-descriptor-usbserial.c | 11 | ||||
| -rw-r--r-- | usb-led/Makefile | 3 | ||||
| -rw-r--r-- | usb-serial/Makefile | 3 | ||||
| -rw-r--r-- | usb-spi/Makefile | 3 |
4 files changed, 18 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"
diff --git a/usb-led/Makefile b/usb-led/Makefile index 2872abd..020e38a 100644 --- a/usb-led/Makefile +++ b/usb-led/Makefile @@ -36,4 +36,7 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\""
+LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\""
+
include ../include.mk
diff --git a/usb-serial/Makefile b/usb-serial/Makefile index 73a91b7..7ec4afa 100644 --- a/usb-serial/Makefile +++ b/usb-serial/Makefile @@ -36,4 +36,7 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\""
+LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\""
+
include ../include.mk
diff --git a/usb-spi/Makefile b/usb-spi/Makefile index 59bb14c..15b9bde 100644 --- a/usb-spi/Makefile +++ b/usb-spi/Makefile @@ -36,4 +36,7 @@ LUFA_OPTS += -D USE_FLASH_DESCRIPTORS LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+LUFA_OPTS += -D USB_MANUFACTURER="L\"equinox\""
+LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\""
+
include ../include.mk
|