From af46f730a4afad12d4385e504e5618fa5407a123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 26 Feb 2016 11:18:07 +0100 Subject: [PATCH] Remove Usb{Keyboard,Mouse}Init() --- right/composite.c | 20 +++++++++----------- right/composite.h | 8 ++++++-- right/hid_keyboard.c | 11 ++--------- right/hid_mouse.c | 15 ++++----------- 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/right/composite.c b/right/composite.c index 0b43668..c1cc41f 100644 --- a/right/composite.c +++ b/right/composite.c @@ -20,7 +20,7 @@ #include "usb_mouse_descriptors.h" static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param); -static usb_device_composite_struct_t UsbCompositeDevice; +usb_device_composite_struct_t UsbCompositeDevice; usb_device_class_config_struct_t UsbDeviceCompositeClassConfig[USB_COMPOSITE_INTERFACE_COUNT] = { {UsbKeyboardCallback, (class_handle_t)NULL, &UsbKeyboardClass}, @@ -51,8 +51,8 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, case kUSB_DeviceEventSetConfiguration: UsbCompositeDevice.attach = 1U; UsbCompositeDevice.currentConfiguration = *temp8; - UsbMouseSetConfigure(UsbCompositeDevice.hidMouseHandle, *temp8); - UsbKeyboardSetConfigure(UsbCompositeDevice.hidKeyboardHandle, *temp8); + UsbMouseSetConfigure(UsbCompositeDevice.mouseHandle, *temp8); + UsbKeyboardSetConfigure(UsbCompositeDevice.keyboardHandle, *temp8); error = kStatus_USB_Success; break; case kUSB_DeviceEventGetConfiguration: @@ -65,8 +65,8 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, uint8_t alternateSetting = (uint8_t)(*temp16 & 0x00FFU); if (interface < USB_COMPOSITE_INTERFACE_COUNT) { UsbCompositeDevice.currentInterfaceAlternateSetting[interface] = alternateSetting; - UsbMouseSetInterface(UsbCompositeDevice.hidMouseHandle, interface, alternateSetting); - UsbKeyboardSetInterface(UsbCompositeDevice.hidKeyboardHandle, interface, + UsbMouseSetInterface(UsbCompositeDevice.mouseHandle, interface, alternateSetting); + UsbKeyboardSetInterface(UsbCompositeDevice.keyboardHandle, interface, alternateSetting); error = kStatus_USB_Success; } @@ -121,8 +121,8 @@ static void USB_DeviceApplicationInit(void) // Set composite device to default state. UsbCompositeDevice.speed = USB_SPEED_FULL; UsbCompositeDevice.attach = 0U; - UsbCompositeDevice.hidMouseHandle = (class_handle_t)NULL; - UsbCompositeDevice.hidKeyboardHandle = (class_handle_t)NULL; + UsbCompositeDevice.mouseHandle = (class_handle_t)NULL; + UsbCompositeDevice.keyboardHandle = (class_handle_t)NULL; UsbCompositeDevice.deviceHandle = NULL; usb_status_t deviceStatus = USB_DeviceClassInit( @@ -133,10 +133,8 @@ static void USB_DeviceApplicationInit(void) return; } else { usb_echo("USB device composite demo\r\n"); - UsbCompositeDevice.hidKeyboardHandle = UsbDeviceCompositeConfigList.config[0].classHandle; - UsbCompositeDevice.hidMouseHandle = UsbDeviceCompositeConfigList.config[1].classHandle; - UsbKeyboardInit(&UsbCompositeDevice); - UsbMouseInit(&UsbCompositeDevice); + UsbCompositeDevice.keyboardHandle = UsbDeviceCompositeConfigList.config[0].classHandle; + UsbCompositeDevice.mouseHandle = UsbDeviceCompositeConfigList.config[1].classHandle; } // Install ISR, set priority, and enable IRQ. diff --git a/right/composite.h b/right/composite.h index a85b2d7..cde8130 100644 --- a/right/composite.h +++ b/right/composite.h @@ -10,12 +10,16 @@ typedef struct _usb_device_composite_struct { usb_device_handle deviceHandle; - class_handle_t hidMouseHandle; - class_handle_t hidKeyboardHandle; + class_handle_t mouseHandle; + class_handle_t keyboardHandle; uint8_t speed; uint8_t attach; uint8_t currentConfiguration; uint8_t currentInterfaceAlternateSetting[USB_COMPOSITE_INTERFACE_COUNT]; } usb_device_composite_struct_t; +// Variables: + + extern usb_device_composite_struct_t UsbCompositeDevice; + #endif diff --git a/right/hid_keyboard.c b/right/hid_keyboard.c index 0e2c209..2404bbe 100644 --- a/right/hid_keyboard.c +++ b/right/hid_keyboard.c @@ -9,7 +9,6 @@ #include "scancodes.h" #include "hid_keyboard.h" -static usb_device_composite_struct_t *UsbCompositeDevice; static usb_device_hid_keyboard_struct_t UsbKeyboardDevice; static usb_status_t UsbKeyboardAction(void) @@ -40,7 +39,7 @@ static usb_status_t UsbKeyboardAction(void) default: break; } - return USB_DeviceHidSend(UsbCompositeDevice->hidKeyboardHandle, USB_KEYBOARD_ENDPOINT_ID, + return USB_DeviceHidSend(UsbCompositeDevice.keyboardHandle, USB_KEYBOARD_ENDPOINT_ID, UsbKeyboardDevice.buffer, USB_KEYBOARD_REPORT_LENGTH); } @@ -50,7 +49,7 @@ usb_status_t UsbKeyboardCallback(class_handle_t handle, uint32_t event, void *pa switch (event) { case kUSB_DeviceHidEventSendResponse: - if (UsbCompositeDevice->attach) { + if (UsbCompositeDevice.attach) { return UsbKeyboardAction(); } break; @@ -86,9 +85,3 @@ usb_status_t UsbKeyboardSetInterface(class_handle_t handle, uint8_t interface, u } return kStatus_USB_Error; } - -usb_status_t UsbKeyboardInit(usb_device_composite_struct_t *compositeDevice) -{ - UsbCompositeDevice = compositeDevice; - return kStatus_USB_Success; -} diff --git a/right/hid_mouse.c b/right/hid_mouse.c index cf576eb..1959036 100644 --- a/right/hid_mouse.c +++ b/right/hid_mouse.c @@ -8,7 +8,6 @@ #include "composite.h" #include "hid_mouse.h" -static usb_device_composite_struct_t *UsbCompositeDevice; static usb_device_hid_mouse_struct_t UsbMouseDevice; /* Update mouse pointer location: draw a rectangular rotation. */ @@ -65,7 +64,7 @@ static usb_status_t UsbMouseAction(void) break; } - return USB_DeviceHidSend(UsbCompositeDevice->hidMouseHandle, USB_MOUSE_ENDPOINT_ID, + return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_ID, UsbMouseDevice.buffer, USB_MOUSE_REPORT_LENGTH); } @@ -76,7 +75,7 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param switch (event) { case kUSB_DeviceHidEventSendResponse: - if (UsbCompositeDevice->attach) { + if (UsbCompositeDevice.attach) { return UsbMouseAction(); } break; @@ -97,9 +96,9 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param return error; } -usb_status_t UsbMouseSetConfigure(class_handle_t handle, uint8_t configure) +usb_status_t UsbMouseSetConfigure(class_handle_t handle, uint8_t configuration) { - if (USB_COMPOSITE_CONFIGURATION_INDEX == configure) { + if (USB_COMPOSITE_CONFIGURATION_INDEX == configuration) { return UsbMouseAction(); } return kStatus_USB_Error; @@ -112,9 +111,3 @@ usb_status_t UsbMouseSetInterface(class_handle_t handle, uint8_t interface, uint } return kStatus_USB_Error; } - -usb_status_t UsbMouseInit(usb_device_composite_struct_t *compositeDevice) -{ - UsbCompositeDevice = compositeDevice; - return kStatus_USB_Success; -}