From 55e5643bf0058df5d586c94ddf7fc201584523ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Thu, 3 Mar 2016 21:17:11 +0100
Subject: [PATCH] Replace USB_*_HID_CLASS with USB_CLASS_HID

---
 right/usb_descriptor_configuration.c | 6 +++---
 right/usb_descriptor_device.h        | 1 +
 right/usb_interface_generic_hid.c    | 2 +-
 right/usb_interface_generic_hid.h    | 1 -
 right/usb_interface_keyboard.c       | 2 +-
 right/usb_interface_keyboard.h       | 1 -
 right/usb_interface_mouse.c          | 2 +-
 right/usb_interface_mouse.h          | 1 -
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/right/usb_descriptor_configuration.c b/right/usb_descriptor_configuration.c
index d6d1222..e74bcf6 100644
--- a/right/usb_descriptor_configuration.c
+++ b/right/usb_descriptor_configuration.c
@@ -26,7 +26,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
     USB_GENERIC_HID_INTERFACE_INDEX,
     USB_INTERFACE_ALTERNATE_SETTING_NONE,
     USB_GENERIC_HID_ENDPOINT_COUNT,
-    USB_GENERIC_HID_CLASS,
+    USB_CLASS_HID,
     USB_GENERIC_HID_SUBCLASS,
     USB_GENERIC_HID_PROTOCOL,
     USB_STRING_DESCRIPTOR_NONE,
@@ -70,7 +70,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
     USB_KEYBOARD_INTERFACE_INDEX,
     USB_INTERFACE_ALTERNATE_SETTING_NONE,
     USB_KEYBOARD_ENDPOINT_COUNT,
-    USB_KEYBOARD_CLASS,
+    USB_CLASS_HID,
     USB_KEYBOARD_SUBCLASS,
     USB_KEYBOARD_PROTOCOL,
     USB_STRING_DESCRIPTOR_NONE,
@@ -104,7 +104,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
     USB_MOUSE_INTERFACE_INDEX,
     USB_INTERFACE_ALTERNATE_SETTING_NONE,
     USB_MOUSE_ENDPOINT_COUNT,
-    USB_MOUSE_CLASS,
+    USB_CLASS_HID,
     USB_MOUSE_SUBCLASS,
     USB_MOUSE_PROTOCOL,
     USB_STRING_DESCRIPTOR_NONE,
diff --git a/right/usb_descriptor_device.h b/right/usb_descriptor_device.h
index 230c86f..f0bb3b3 100644
--- a/right/usb_descriptor_device.h
+++ b/right/usb_descriptor_device.h
@@ -21,6 +21,7 @@
                                            USB_MOUSE_INTERFACE_COUNT + \
                                            USB_GENERIC_HID_INTERFACE_COUNT)
 
+    #define USB_CLASS_HID 0x03
     #define USB_HID_COUNTRY_CODE_NOT_SUPPORTED   0x00
     #define USB_INTERFACE_ALTERNATE_SETTING_NONE 0x00
     #define USB_STRING_DESCRIPTOR_NONE           0x00
diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c
index 14c960a..684fc6c 100644
--- a/right/usb_interface_generic_hid.c
+++ b/right/usb_interface_generic_hid.c
@@ -23,7 +23,7 @@ static usb_device_interface_struct_t UsbGenericHidInterface[] = {{
 }};
 
 static usb_device_interfaces_struct_t UsbGenericHidInterfaces[USB_GENERIC_HID_INTERFACE_COUNT] = {{
-    USB_GENERIC_HID_CLASS,
+    USB_CLASS_HID,
     USB_GENERIC_HID_SUBCLASS,
     USB_GENERIC_HID_PROTOCOL,
     USB_GENERIC_HID_INTERFACE_INDEX,
diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h
index 6d952b5..69d61ec 100644
--- a/right/usb_interface_generic_hid.h
+++ b/right/usb_interface_generic_hid.h
@@ -8,7 +8,6 @@
 
 // Macros:
 
-    #define USB_GENERIC_HID_CLASS 0x03
     #define USB_GENERIC_HID_SUBCLASS 0x00
     #define USB_GENERIC_HID_PROTOCOL 0x00
 
diff --git a/right/usb_interface_keyboard.c b/right/usb_interface_keyboard.c
index 4fdffbb..d0012a8 100644
--- a/right/usb_interface_keyboard.c
+++ b/right/usb_interface_keyboard.c
@@ -24,7 +24,7 @@ static usb_device_interface_struct_t UsbKeyboardInterface[] = {{
 }};
 
 static usb_device_interfaces_struct_t UsbKeyboardInterfaces[USB_KEYBOARD_INTERFACE_COUNT] = {{
-    USB_KEYBOARD_CLASS,
+    USB_CLASS_HID,
     USB_KEYBOARD_SUBCLASS,
     USB_KEYBOARD_PROTOCOL,
     USB_KEYBOARD_INTERFACE_INDEX,
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index 7bb7e8f..2a42b52 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.h
@@ -8,7 +8,6 @@
 
 // Macros:
 
-    #define USB_KEYBOARD_CLASS 0x03
     #define USB_KEYBOARD_SUBCLASS 0x01
     #define USB_KEYBOARD_PROTOCOL 0x01
 
diff --git a/right/usb_interface_mouse.c b/right/usb_interface_mouse.c
index 8020dd1..736af60 100644
--- a/right/usb_interface_mouse.c
+++ b/right/usb_interface_mouse.c
@@ -15,7 +15,7 @@ static usb_device_interface_struct_t UsbMouseInterface[] = {{
 }};
 
 static usb_device_interfaces_struct_t UsbMouseInterfaces[USB_MOUSE_INTERFACE_COUNT] = {{
-    USB_MOUSE_CLASS,
+    USB_CLASS_HID,
     USB_MOUSE_SUBCLASS,
     USB_MOUSE_PROTOCOL,
     USB_MOUSE_INTERFACE_INDEX,
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index 776ce4a..10f5403 100644
--- a/right/usb_interface_mouse.h
+++ b/right/usb_interface_mouse.h
@@ -3,7 +3,6 @@
 
 // Macros:
 
-    #define USB_MOUSE_CLASS 0x03
     #define USB_MOUSE_SUBCLASS 0x01
     #define USB_MOUSE_PROTOCOL 0x02