uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace USB_*_HID_CLASS with USB_CLASS_HID

Browse Source
This commit is contained in:
László Monda
2016-03-03 21:17:11 +01:00
parent 7b04084f46
commit 55e5643bf0
8 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
right/usb_descriptor_configuration.c
View File

@@ -26,7 +26,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
USB_GENERIC_HID_INTERFACE_INDEX, USB_GENERIC_HID_INTERFACE_INDEX,
USB_INTERFACE_ALTERNATE_SETTING_NONE, USB_INTERFACE_ALTERNATE_SETTING_NONE,
USB_GENERIC_HID_ENDPOINT_COUNT, USB_GENERIC_HID_ENDPOINT_COUNT,
USB_GENERIC_HID_CLASS, USB_CLASS_HID,
USB_GENERIC_HID_SUBCLASS, USB_GENERIC_HID_SUBCLASS,
USB_GENERIC_HID_PROTOCOL, USB_GENERIC_HID_PROTOCOL,
USB_STRING_DESCRIPTOR_NONE, USB_STRING_DESCRIPTOR_NONE,
@@ -70,7 +70,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
USB_KEYBOARD_INTERFACE_INDEX, USB_KEYBOARD_INTERFACE_INDEX,
USB_INTERFACE_ALTERNATE_SETTING_NONE, USB_INTERFACE_ALTERNATE_SETTING_NONE,
USB_KEYBOARD_ENDPOINT_COUNT, USB_KEYBOARD_ENDPOINT_COUNT,
USB_KEYBOARD_CLASS, USB_CLASS_HID,
USB_KEYBOARD_SUBCLASS, USB_KEYBOARD_SUBCLASS,
USB_KEYBOARD_PROTOCOL, USB_KEYBOARD_PROTOCOL,
USB_STRING_DESCRIPTOR_NONE, USB_STRING_DESCRIPTOR_NONE,
@@ -104,7 +104,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] =
USB_MOUSE_INTERFACE_INDEX, USB_MOUSE_INTERFACE_INDEX,
USB_INTERFACE_ALTERNATE_SETTING_NONE, USB_INTERFACE_ALTERNATE_SETTING_NONE,
USB_MOUSE_ENDPOINT_COUNT, USB_MOUSE_ENDPOINT_COUNT,
USB_MOUSE_CLASS, USB_CLASS_HID,
USB_MOUSE_SUBCLASS, USB_MOUSE_SUBCLASS,
USB_MOUSE_PROTOCOL, USB_MOUSE_PROTOCOL,
USB_STRING_DESCRIPTOR_NONE, USB_STRING_DESCRIPTOR_NONE,

1
right/usb_descriptor_device.h
View File

@@ -21,6 +21,7 @@
USB_MOUSE_INTERFACE_COUNT + \ USB_MOUSE_INTERFACE_COUNT + \
USB_GENERIC_HID_INTERFACE_COUNT) USB_GENERIC_HID_INTERFACE_COUNT)
#define USB_CLASS_HID 0x03
#define USB_HID_COUNTRY_CODE_NOT_SUPPORTED 0x00 #define USB_HID_COUNTRY_CODE_NOT_SUPPORTED 0x00
#define USB_INTERFACE_ALTERNATE_SETTING_NONE 0x00 #define USB_INTERFACE_ALTERNATE_SETTING_NONE 0x00
#define USB_STRING_DESCRIPTOR_NONE 0x00 #define USB_STRING_DESCRIPTOR_NONE 0x00

2
right/usb_interface_generic_hid.c
View File

@@ -23,7 +23,7 @@ static usb_device_interface_struct_t UsbGenericHidInterface[] = {{
}}; }};
static usb_device_interfaces_struct_t UsbGenericHidInterfaces[USB_GENERIC_HID_INTERFACE_COUNT] = {{ 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_SUBCLASS,
USB_GENERIC_HID_PROTOCOL, USB_GENERIC_HID_PROTOCOL,
USB_GENERIC_HID_INTERFACE_INDEX, USB_GENERIC_HID_INTERFACE_INDEX,

1
right/usb_interface_generic_hid.h
View File

@@ -8,7 +8,6 @@
// Macros: // Macros:
#define USB_GENERIC_HID_CLASS 0x03
#define USB_GENERIC_HID_SUBCLASS 0x00 #define USB_GENERIC_HID_SUBCLASS 0x00
#define USB_GENERIC_HID_PROTOCOL 0x00 #define USB_GENERIC_HID_PROTOCOL 0x00

2
right/usb_interface_keyboard.c
View File

@@ -24,7 +24,7 @@ static usb_device_interface_struct_t UsbKeyboardInterface[] = {{
}}; }};
static usb_device_interfaces_struct_t UsbKeyboardInterfaces[USB_KEYBOARD_INTERFACE_COUNT] = {{ static usb_device_interfaces_struct_t UsbKeyboardInterfaces[USB_KEYBOARD_INTERFACE_COUNT] = {{
USB_KEYBOARD_CLASS, USB_CLASS_HID,
USB_KEYBOARD_SUBCLASS, USB_KEYBOARD_SUBCLASS,
USB_KEYBOARD_PROTOCOL, USB_KEYBOARD_PROTOCOL,
USB_KEYBOARD_INTERFACE_INDEX, USB_KEYBOARD_INTERFACE_INDEX,

1
right/usb_interface_keyboard.h
View File

@@ -8,7 +8,6 @@
// Macros: // Macros:
#define USB_KEYBOARD_CLASS 0x03
#define USB_KEYBOARD_SUBCLASS 0x01 #define USB_KEYBOARD_SUBCLASS 0x01
#define USB_KEYBOARD_PROTOCOL 0x01 #define USB_KEYBOARD_PROTOCOL 0x01

2
right/usb_interface_mouse.c
View File

@@ -15,7 +15,7 @@ static usb_device_interface_struct_t UsbMouseInterface[] = {{
}}; }};
static usb_device_interfaces_struct_t UsbMouseInterfaces[USB_MOUSE_INTERFACE_COUNT] = {{ static usb_device_interfaces_struct_t UsbMouseInterfaces[USB_MOUSE_INTERFACE_COUNT] = {{
USB_MOUSE_CLASS, USB_CLASS_HID,
USB_MOUSE_SUBCLASS, USB_MOUSE_SUBCLASS,
USB_MOUSE_PROTOCOL, USB_MOUSE_PROTOCOL,
USB_MOUSE_INTERFACE_INDEX, USB_MOUSE_INTERFACE_INDEX,

1
right/usb_interface_mouse.h
View File

@@ -3,7 +3,6 @@
// Macros: // Macros:
#define USB_MOUSE_CLASS 0x03
#define USB_MOUSE_SUBCLASS 0x01 #define USB_MOUSE_SUBCLASS 0x01
#define USB_MOUSE_PROTOCOL 0x02 #define USB_MOUSE_PROTOCOL 0x02