From 1ffb45795afd57d7ae534962505551f200efbcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 26 Feb 2016 10:18:39 +0100 Subject: [PATCH] Move USB_{KEYBOARD,MOUSE}_REPORT_LENGTH to hid_{keyboard,mouse}.h --- right/hid_keyboard.c | 4 ++-- right/hid_keyboard.h | 8 ++++++-- right/hid_mouse.h | 6 +++++- right/usb_keyboard_descriptors.h | 1 - right/usb_mouse_descriptors.h | 1 - 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/right/hid_keyboard.c b/right/hid_keyboard.c index b2ac9c7..0e2c209 100644 --- a/right/hid_keyboard.c +++ b/right/hid_keyboard.c @@ -71,9 +71,9 @@ usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *pa return error; } -usb_status_t UsbKeyboardSetConfigure(class_handle_t handle, uint8_t configure) +usb_status_t UsbKeyboardSetConfigure(class_handle_t handle, uint8_t configuration) { - if (USB_COMPOSITE_CONFIGURATION_INDEX == configure) { + if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) { return UsbKeyboardAction(); } return kStatus_USB_Error; diff --git a/right/hid_keyboard.h b/right/hid_keyboard.h index e9b2b8c..125c8b5 100644 --- a/right/hid_keyboard.h +++ b/right/hid_keyboard.h @@ -1,6 +1,10 @@ #ifndef __USB_DEVICE_HID_KEYBOARD_H__ #define __USB_DEVICE_HID_KEYBOARD_H__ +// Macros: + + #define USB_KEYBOARD_REPORT_LENGTH (0x08U) + // Typedefs: typedef struct _usb_device_hid_keyboard_struct { @@ -10,9 +14,9 @@ // Functions: - extern usb_status_t UsbKeyboardInit(usb_device_composite_struct_t *deviceComposite); + extern usb_status_t UsbKeyboardInit(usb_device_composite_struct_t *compositeDevice); extern usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *param); - extern usb_status_t UsbKeyboardSetConfigure(class_handle_t handle, uint8_t configure); + extern usb_status_t UsbKeyboardSetConfigure(class_handle_t handle, uint8_t configuration); extern usb_status_t UsbKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); #endif diff --git a/right/hid_mouse.h b/right/hid_mouse.h index 517e4b9..5695f2f 100644 --- a/right/hid_mouse.h +++ b/right/hid_mouse.h @@ -1,6 +1,10 @@ #ifndef __USB_DEVICE_HID_MOUSE_H__ #define __USB_DEVICE_HID_MOUSE_H__ +// Macros: + + #define USB_MOUSE_REPORT_LENGTH (0x04U) + // Typedefs: typedef struct usb_device_hid_mouse_struct { @@ -10,7 +14,7 @@ // Functions: - extern usb_status_t UsbMouseInit(usb_device_composite_struct_t *deviceComposite); + extern usb_status_t UsbMouseInit(usb_device_composite_struct_t *compositeDevice); extern usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param); extern usb_status_t UsbMouseSetConfigure(class_handle_t handle, uint8_t configure); extern usb_status_t UsbMouseSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); diff --git a/right/usb_keyboard_descriptors.h b/right/usb_keyboard_descriptors.h index 5344c32..2a03981 100644 --- a/right/usb_keyboard_descriptors.h +++ b/right/usb_keyboard_descriptors.h @@ -17,7 +17,6 @@ #define USB_KEYBOARD_INTERRUPT_IN_PACKET_SIZE (8U) #define USB_KEYBOARD_INTERRUPT_IN_INTERVAL (0x04U) - #define USB_KEYBOARD_REPORT_LENGTH (0x08U) #define USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH (63U) #define USB_KEYBOARD_STRING_DESCRIPTOR_LENGTH (40U) diff --git a/right/usb_mouse_descriptors.h b/right/usb_mouse_descriptors.h index 61392d1..9d0fa4f 100644 --- a/right/usb_mouse_descriptors.h +++ b/right/usb_mouse_descriptors.h @@ -17,7 +17,6 @@ #define USB_MOUSE_INTERRUPT_IN_PACKET_SIZE (8U) #define USB_MOUSE_INTERRUPT_IN_INTERVAL (0x04U) - #define USB_MOUSE_REPORT_LENGTH (0x04U) #define USB_MOUSE_REPORT_DESCRIPTOR_LENGTH (52U) #define USB_MOUSE_STRING_DESCRIPTOR_LENGTH (34U)