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

Ditch USB_*_SUBCLASS and USB_*_PROTOCOL macros in favor of the standard USB_HID_SUBCLASS_* USB_HID_PROTOCOL_* macros.

Browse Source
This commit is contained in:
László Monda
2016-03-03 22:02:28 +01:00
parent 55e5643bf0
commit df63abeb3a
8 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
right/usb_descriptor_configuration.c
View File

@@ -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

7
right/usb_descriptor_device.h
View File

@@ -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

4
right/usb_interface_generic_hid.c
View File

@@ -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),

3
right/usb_interface_generic_hid.h
View File

@@ -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

15
right/usb_interface_keyboard.c
View File

@@ -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),

3
right/usb_interface_keyboard.h
View File

@@ -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

4
right/usb_interface_mouse.c
View File

@@ -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),

3
right/usb_interface_mouse.h
View File

@@ -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