From 65412b86fb6a542eaad39e18c88ffb53b2b2ffb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 26 Feb 2016 09:45:18 +0100 Subject: [PATCH] Rename some string descriptor related macros. --- right/usb_device_descriptor.c | 2 +- right/usb_device_descriptor.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/right/usb_device_descriptor.c b/right/usb_device_descriptor.c index 2952c77..39b0ab8 100644 --- a/right/usb_device_descriptor.c +++ b/right/usb_device_descriptor.c @@ -25,7 +25,7 @@ uint8_t UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = { USB_SHORT_GET_HIGH(USB_DEVICE_RELEASE_NUMBER), USB_STRING_DESCRIPTOR_ID_MANUFACTURER, USB_STRING_DESCRIPTOR_ID_PRODUCT, - USB_STRING_DESCRIPTOR_ID_SERIAL_NUMBER, + USB_STRING_DESCRIPTOR_ID_SUPPORTED_LANGUAGES, USB_DEVICE_CONFIGURATION_COUNT, }; diff --git a/right/usb_device_descriptor.h b/right/usb_device_descriptor.h index 7a8c74c..a072f3a 100644 --- a/right/usb_device_descriptor.h +++ b/right/usb_device_descriptor.h @@ -28,6 +28,7 @@ #define USB_LANGUAGE_ID_UNITED_STATES (0x0409U) #define USB_HID_COUNTRY_CODE_NOT_SUPPORTED (0x00U) #define USB_INTERFACE_ALTERNATE_SETTING_NONE (0x00U) + #define USB_STRING_DESCRIPTOR_NONE 0U // Descriptor lengths @@ -42,12 +43,11 @@ #define USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH (58U) #define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH (34U) - #define USB_STRING_DESCRIPTOR_NONE 0U - #define USB_STRING_DESCRIPTOR_ID_SERIAL_NUMBER 0U - #define USB_STRING_DESCRIPTOR_ID_MANUFACTURER 1U - #define USB_STRING_DESCRIPTOR_ID_PRODUCT 2U - #define USB_STRING_DESCRIPTOR_ID_MOUSE 3U - #define USB_STRING_DESCRIPTOR_ID_KEYBOARD 4U + #define USB_STRING_DESCRIPTOR_ID_SUPPORTED_LANGUAGES 0U + #define USB_STRING_DESCRIPTOR_ID_MANUFACTURER 1U + #define USB_STRING_DESCRIPTOR_ID_PRODUCT 2U + #define USB_STRING_DESCRIPTOR_ID_MOUSE 3U + #define USB_STRING_DESCRIPTOR_ID_KEYBOARD 4U // Functions: