From 40bef157b1ad956de9240354f57d9d05c9fafbd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Fri, 26 Feb 2016 09:39:28 +0100
Subject: [PATCH] Reaname and rearrange a couple of descriptor related macros.

---
 right/usb_device_descriptor.c | 20 ++++++------
 right/usb_device_descriptor.h | 58 ++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/right/usb_device_descriptor.c b/right/usb_device_descriptor.c
index b91fd75..2952c77 100644
--- a/right/usb_device_descriptor.c
+++ b/right/usb_device_descriptor.c
@@ -11,16 +11,16 @@
 uint8_t UsbDeviceDescriptor[USB_DESCRIPTOR_LENGTH_DEVICE] = {
     USB_DESCRIPTOR_LENGTH_DEVICE,
     USB_DESCRIPTOR_TYPE_DEVICE,
-    USB_SHORT_GET_LOW(USB_DEVICE_SPECIFICATION_BCD_VERSION),
-    USB_SHORT_GET_HIGH(USB_DEVICE_SPECIFICATION_BCD_VERSION),
+    USB_SHORT_GET_LOW(USB_DEVICE_SPECIFICATION_VERSION),
+    USB_SHORT_GET_HIGH(USB_DEVICE_SPECIFICATION_VERSION),
     USB_DEVICE_CLASS,
     USB_DEVICE_SUBCLASS,
     USB_DEVICE_PROTOCOL,
     USB_CONTROL_MAX_PACKET_SIZE,
-    USB_SHORT_GET_LOW(USB_VENDOR_ID),
-    USB_SHORT_GET_HIGH(USB_VENDOR_ID),
-    USB_SHORT_GET_LOW(USB_PRODUCT_ID),
-    USB_SHORT_GET_HIGH(USB_PRODUCT_ID),
+    USB_SHORT_GET_LOW(USB_DEVICE_VENDOR_ID),
+    USB_SHORT_GET_HIGH(USB_DEVICE_VENDOR_ID),
+    USB_SHORT_GET_LOW(USB_DEVICE_PRODUCT_ID),
+    USB_SHORT_GET_HIGH(USB_DEVICE_PRODUCT_ID),
     USB_SHORT_GET_LOW(USB_DEVICE_RELEASE_NUMBER),
     USB_SHORT_GET_HIGH(USB_DEVICE_RELEASE_NUMBER),
     USB_STRING_DESCRIPTOR_ID_MANUFACTURER,
@@ -50,7 +50,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
     USB_DESCRIPTOR_LENGTH_INTERFACE,
     USB_DESCRIPTOR_TYPE_INTERFACE,
     USB_MOUSE_INTERFACE_INDEX,
-    USB_INTERFACE_ALTERNATE_SETTING,
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
     USB_MOUSE_ENDPOINT_COUNT,
     USB_MOUSE_CLASS,
     USB_MOUSE_SUBCLASS,
@@ -59,7 +59,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
 
 // Mouse HID descriptor
 
-    USB_DESCRIPTOR_LENGTH_HID,
+    USB_HID_DESCRIPTOR_LENGTH,
     USB_DESCRIPTOR_TYPE_HID,
     USB_SHORT_GET_LOW(USB_HID_VERSION),
     USB_SHORT_GET_HIGH(USB_HID_VERSION),
@@ -84,7 +84,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
     USB_DESCRIPTOR_LENGTH_INTERFACE,
     USB_DESCRIPTOR_TYPE_INTERFACE,
     USB_KEYBOARD_INTERFACE_INDEX,
-    USB_INTERFACE_ALTERNATE_SETTING,
+    USB_INTERFACE_ALTERNATE_SETTING_NONE,
     USB_KEYBOARD_ENDPOINT_COUNT,
     USB_KEYBOARD_CLASS,
     USB_KEYBOARD_SUBCLASS,
@@ -93,7 +93,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
 
 // Keyboard HID descriptor
 
-    USB_DESCRIPTOR_LENGTH_HID,
+    USB_HID_DESCRIPTOR_LENGTH,
     USB_DESCRIPTOR_TYPE_HID,
     USB_SHORT_GET_LOW(USB_HID_VERSION),
     USB_SHORT_GET_HIGH(USB_HID_VERSION),
diff --git a/right/usb_device_descriptor.h b/right/usb_device_descriptor.h
index d799004..7a8c74c 100644
--- a/right/usb_device_descriptor.h
+++ b/right/usb_device_descriptor.h
@@ -8,44 +8,46 @@
 
 // Macros:
 
-    #define USB_VENDOR_ID 0x15A2U
-    #define USB_PRODUCT_ID 0x007EU
-
-    #define USB_LANGUAGE_ID_UNITED_STATES (0x0409U)
-
-    #define USB_DEVICE_SPECIFICATION_BCD_VERSION (0x0200U)
-    #define USB_DEVICE_RELEASE_NUMBER (0x0101U)
-
     #define USB_DEVICE_CLASS (0x00U)
     #define USB_DEVICE_SUBCLASS (0x00U)
     #define USB_DEVICE_PROTOCOL (0x00U)
 
-    #define USB_DEVICE_MAX_POWER (50U) // Expressed in 2 mA units (2*50 = 100 mA)
+    #define USB_DEVICE_SPECIFICATION_VERSION (0x0200U)
+    #define USB_HID_VERSION (0x0100U)
 
+    #define USB_DEVICE_VENDOR_ID (0x15A2U)
+    #define USB_DEVICE_PRODUCT_ID (0x007EU)
+    #define USB_DEVICE_RELEASE_NUMBER (0x0101U)
+
+    #define USB_COMPOSITE_CONFIGURATION_INDEX (1U)
+    #define USB_DEVICE_CONFIGURATION_COUNT (1U)
+    #define USB_REPORT_DESCRIPTOR_COUNT_PER_HID_DEVICE (1U)
+    #define USB_DEVICE_MAX_POWER (50U) // Expressed in 2mA units
+    #define USB_COMPOSITE_INTERFACE_COUNT (USB_KEYBOARD_INTERFACE_COUNT + USB_MOUSE_INTERFACE_COUNT)
+
+    #define USB_LANGUAGE_ID_UNITED_STATES (0x0409U)
+    #define USB_HID_COUNTRY_CODE_NOT_SUPPORTED (0x00U)
+    #define USB_INTERFACE_ALTERNATE_SETTING_NONE (0x00U)
+
+    // Descriptor lengths
+
+    #define USB_HID_DESCRIPTOR_LENGTH (9U)
     #define USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH (59U)
-    #define USB_DESCRIPTOR_LENGTH_HID (9U)
+
+    // String descriptors
+
+    #define USB_STRING_DESCRIPTOR_COUNT (5U)
+
     #define USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH (4U)
     #define USB_MANUFACTURER_STRING_DESCRIPTOR_LENGTH (58U)
     #define USB_PRODUCT_STRING_DESCRIPTOR_LENGTH (34U)
 
-    #define USB_DEVICE_CONFIGURATION_COUNT (1U)
-    #define USB_STRING_DESCRIPTOR_COUNT (5U)
-    #define USB_DEVICE_LANGUAGE_COUNT (1U)
-
-    #define USB_STRING_DESCRIPTOR_NONE 0x00U
-    #define USB_STRING_DESCRIPTOR_ID_SERIAL_NUMBER 0x00U
-    #define USB_STRING_DESCRIPTOR_ID_MANUFACTURER  0x01U
-    #define USB_STRING_DESCRIPTOR_ID_PRODUCT       0x02U
-    #define USB_STRING_DESCRIPTOR_ID_MOUSE         0x03U
-    #define USB_STRING_DESCRIPTOR_ID_KEYBOARD      0x04U
-
-    #define USB_COMPOSITE_CONFIGURATION_INDEX (1U)
-    #define USB_HID_COUNTRY_CODE_NOT_SUPPORTED (0x00U)
-    #define USB_REPORT_DESCRIPTOR_COUNT_PER_HID_DEVICE (0X01U)
-    #define USB_HID_VERSION (0x0100U)
-    #define USB_INTERFACE_ALTERNATE_SETTING (0x00U)
-
-    #define USB_COMPOSITE_INTERFACE_COUNT (USB_KEYBOARD_INTERFACE_COUNT + USB_MOUSE_INTERFACE_COUNT)
+    #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
 
 // Functions: