From df63abeb3a5aec7dbbc86b8715fb0ca1bcd07533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Thu, 3 Mar 2016 22:02:28 +0100 Subject: [PATCH] Ditch USB_*_SUBCLASS and USB_*_PROTOCOL macros in favor of the standard USB_HID_SUBCLASS_* USB_HID_PROTOCOL_* macros. --- right/usb_descriptor_configuration.c | 12 ++++++------ right/usb_descriptor_device.h | 7 +++++++ right/usb_interface_generic_hid.c | 4 ++-- right/usb_interface_generic_hid.h | 3 --- right/usb_interface_keyboard.c | 15 +++------------ right/usb_interface_keyboard.h | 3 --- right/usb_interface_mouse.c | 4 ++-- right/usb_interface_mouse.h | 3 --- 8 files changed, 20 insertions(+), 31 deletions(-) diff --git a/right/usb_descriptor_configuration.c b/right/usb_descriptor_configuration.c index e74bcf6..919de6c 100644 --- a/right/usb_descriptor_configuration.c +++ b/right/usb_descriptor_configuration.c @@ -27,8 +27,8 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_INTERFACE_ALTERNATE_SETTING_NONE, USB_GENERIC_HID_ENDPOINT_COUNT, USB_CLASS_HID, - USB_GENERIC_HID_SUBCLASS, - USB_GENERIC_HID_PROTOCOL, + USB_HID_SUBCLASS_NONE, + USB_HID_PROTOCOL_NONE, USB_STRING_DESCRIPTOR_NONE, // Generic HID descriptor @@ -71,8 +71,8 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_INTERFACE_ALTERNATE_SETTING_NONE, USB_KEYBOARD_ENDPOINT_COUNT, USB_CLASS_HID, - USB_KEYBOARD_SUBCLASS, - USB_KEYBOARD_PROTOCOL, + USB_HID_SUBCLASS_BOOT, + USB_HID_PROTOCOL_KEYBOARD, USB_STRING_DESCRIPTOR_NONE, // Keyboard HID descriptor @@ -105,8 +105,8 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_INTERFACE_ALTERNATE_SETTING_NONE, USB_MOUSE_ENDPOINT_COUNT, USB_CLASS_HID, - USB_MOUSE_SUBCLASS, - USB_MOUSE_PROTOCOL, + USB_HID_SUBCLASS_BOOT, + USB_HID_PROTOCOL_MOUSE, USB_STRING_DESCRIPTOR_NONE, // Mouse HID descriptor diff --git a/right/usb_descriptor_device.h b/right/usb_descriptor_device.h index f0bb3b3..5e63f8f 100644 --- a/right/usb_descriptor_device.h +++ b/right/usb_descriptor_device.h @@ -26,6 +26,13 @@ #define USB_INTERFACE_ALTERNATE_SETTING_NONE 0x00 #define USB_STRING_DESCRIPTOR_NONE 0x00 + #define USB_HID_SUBCLASS_NONE 0 + #define USB_HID_SUBCLASS_BOOT 1 + + #define USB_HID_PROTOCOL_NONE 0 + #define USB_HID_PROTOCOL_KEYBOARD 1 + #define USB_HID_PROTOCOL_MOUSE 2 + // Descriptor lengths #define USB_HID_DESCRIPTOR_LENGTH 9 diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c index 684fc6c..a57edd0 100644 --- a/right/usb_interface_generic_hid.c +++ b/right/usb_interface_generic_hid.c @@ -24,8 +24,8 @@ static usb_device_interface_struct_t UsbGenericHidInterface[] = {{ static usb_device_interfaces_struct_t UsbGenericHidInterfaces[USB_GENERIC_HID_INTERFACE_COUNT] = {{ USB_CLASS_HID, - USB_GENERIC_HID_SUBCLASS, - USB_GENERIC_HID_PROTOCOL, + USB_HID_SUBCLASS_NONE, + USB_HID_PROTOCOL_NONE, USB_GENERIC_HID_INTERFACE_INDEX, UsbGenericHidInterface, sizeof(UsbGenericHidInterface) / sizeof(usb_device_interfaces_struct_t), diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h index 69d61ec..e38aa7f 100644 --- a/right/usb_interface_generic_hid.h +++ b/right/usb_interface_generic_hid.h @@ -8,9 +8,6 @@ // Macros: - #define USB_GENERIC_HID_SUBCLASS 0x00 - #define USB_GENERIC_HID_PROTOCOL 0x00 - #define USB_GENERIC_HID_INTERFACE_INDEX 0 #define USB_GENERIC_HID_INTERFACE_COUNT 1 diff --git a/right/usb_interface_keyboard.c b/right/usb_interface_keyboard.c index d0012a8..8868033 100644 --- a/right/usb_interface_keyboard.c +++ b/right/usb_interface_keyboard.c @@ -1,15 +1,6 @@ #include "include/board/board.h" -#include "fsl_gpio.h" -#include "usb_device_config.h" -#include "usb.h" -#include "usb_device.h" -#include "include/usb/usb_device_class.h" -#include "include/usb/usb_device_hid.h" -#include "include/usb/usb_device_ch9.h" +#include "usb_api.h" #include "usb_composite_device.h" -#include "include/lufa/HIDClassCommon.h" -#include "usb_interface_keyboard.h" -#include "usb_descriptor_configuration.h" static usb_device_endpoint_struct_t UsbKeyboardEndpoints[USB_KEYBOARD_ENDPOINT_COUNT] = {{ USB_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), @@ -25,8 +16,8 @@ static usb_device_interface_struct_t UsbKeyboardInterface[] = {{ static usb_device_interfaces_struct_t UsbKeyboardInterfaces[USB_KEYBOARD_INTERFACE_COUNT] = {{ USB_CLASS_HID, - USB_KEYBOARD_SUBCLASS, - USB_KEYBOARD_PROTOCOL, + USB_HID_SUBCLASS_BOOT, + USB_HID_PROTOCOL_KEYBOARD, USB_KEYBOARD_INTERFACE_INDEX, UsbKeyboardInterface, sizeof(UsbKeyboardInterface) / sizeof(usb_device_interfaces_struct_t), diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h index 2a42b52..e12af4b 100644 --- a/right/usb_interface_keyboard.h +++ b/right/usb_interface_keyboard.h @@ -8,9 +8,6 @@ // Macros: - #define USB_KEYBOARD_SUBCLASS 0x01 - #define USB_KEYBOARD_PROTOCOL 0x01 - #define USB_KEYBOARD_INTERFACE_INDEX 1 #define USB_KEYBOARD_INTERFACE_COUNT 1 diff --git a/right/usb_interface_mouse.c b/right/usb_interface_mouse.c index 736af60..a4d22d9 100644 --- a/right/usb_interface_mouse.c +++ b/right/usb_interface_mouse.c @@ -16,8 +16,8 @@ static usb_device_interface_struct_t UsbMouseInterface[] = {{ static usb_device_interfaces_struct_t UsbMouseInterfaces[USB_MOUSE_INTERFACE_COUNT] = {{ USB_CLASS_HID, - USB_MOUSE_SUBCLASS, - USB_MOUSE_PROTOCOL, + USB_HID_SUBCLASS_BOOT, + USB_HID_PROTOCOL_MOUSE, USB_MOUSE_INTERFACE_INDEX, UsbMouseInterface, sizeof(UsbMouseInterface) / sizeof(usb_device_interfaces_struct_t), diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h index 10f5403..ef3f4eb 100644 --- a/right/usb_interface_mouse.h +++ b/right/usb_interface_mouse.h @@ -3,9 +3,6 @@ // Macros: - #define USB_MOUSE_SUBCLASS 0x01 - #define USB_MOUSE_PROTOCOL 0x02 - #define USB_MOUSE_INTERFACE_INDEX 2 #define USB_MOUSE_INTERFACE_COUNT 1