From deb1675f84aa96395845012a39513b69bc2ccb36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sun, 5 Jan 2014 00:21:15 +0100 Subject: Use the new USB_STRING_DESCRIPTOR macro for every string descriptor. --- Projects/RelayBoard/Descriptors.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'Projects/RelayBoard') diff --git a/Projects/RelayBoard/Descriptors.c b/Projects/RelayBoard/Descriptors.c index 3bfaac251..d5951867a 100644 --- a/Projects/RelayBoard/Descriptors.c +++ b/Projects/RelayBoard/Descriptors.c @@ -119,33 +119,18 @@ const USB_Descriptor_String_t PROGMEM RelayBoard_LanguageString = * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -const USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString = -{ - .Header = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String}, - - .UnicodeString = L"SISPM" -}; +const USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString = USB_STRING_DESCRIPTOR(L"SISPM"); /** Product descriptor string. This is a Unicode string containing the product'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. */ -const USB_Descriptor_String_t PROGMEM RelayBoard_ProductString = -{ - .Header = {.Size = USB_STRING_LEN(10), .Type = DTYPE_String}, - - .UnicodeString = L"RelayBoard" -}; +const USB_Descriptor_String_t PROGMEM RelayBoard_ProductString = USB_STRING_DESCRIPTOR(L"RelayBoard"); /** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a * series of uppercase hexadecimal digits. */ -const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = -{ - .Header = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String}, - - .UnicodeString = L"00001" -}; +const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = USB_STRING_DESCRIPTOR(L"00001"); /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" * documentation) by the application code so that the address and size of a requested descriptor can be given -- cgit v1.2.3