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

Remove Usb{Keyboard,Mouse}Init()

Browse Source
This commit is contained in:
László Monda
2016-02-26 11:18:07 +01:00
parent 1ffb45795a
commit af46f730a4
4 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/composite.c
+9 -11
View File
@@ -20,7 +20,7 @@
#include "usb_mouse_descriptors.h" #include "usb_mouse_descriptors.h"
static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param); 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] = { usb_device_class_config_struct_t UsbDeviceCompositeClassConfig[USB_COMPOSITE_INTERFACE_COUNT] = {
{UsbKeyboardCallback, (class_handle_t)NULL, &UsbKeyboardClass}, {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: case kUSB_DeviceEventSetConfiguration:
UsbCompositeDevice.attach = 1U; UsbCompositeDevice.attach = 1U;
UsbCompositeDevice.currentConfiguration = *temp8; UsbCompositeDevice.currentConfiguration = *temp8;
UsbMouseSetConfigure(UsbCompositeDevice.hidMouseHandle, *temp8); UsbMouseSetConfigure(UsbCompositeDevice.mouseHandle, *temp8);
UsbKeyboardSetConfigure(UsbCompositeDevice.hidKeyboardHandle, *temp8); UsbKeyboardSetConfigure(UsbCompositeDevice.keyboardHandle, *temp8);
error = kStatus_USB_Success; error = kStatus_USB_Success;
break; break;
case kUSB_DeviceEventGetConfiguration: 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); uint8_t alternateSetting = (uint8_t)(*temp16 & 0x00FFU);
if (interface < USB_COMPOSITE_INTERFACE_COUNT) { if (interface < USB_COMPOSITE_INTERFACE_COUNT) {
UsbCompositeDevice.currentInterfaceAlternateSetting[interface] = alternateSetting; UsbCompositeDevice.currentInterfaceAlternateSetting[interface] = alternateSetting;
UsbMouseSetInterface(UsbCompositeDevice.hidMouseHandle, interface, alternateSetting); UsbMouseSetInterface(UsbCompositeDevice.mouseHandle, interface, alternateSetting);
UsbKeyboardSetInterface(UsbCompositeDevice.hidKeyboardHandle, interface, UsbKeyboardSetInterface(UsbCompositeDevice.keyboardHandle, interface,
alternateSetting); alternateSetting);
error = kStatus_USB_Success; error = kStatus_USB_Success;
} }
@@ -121,8 +121,8 @@ static void USB_DeviceApplicationInit(void)
// Set composite device to default state. // Set composite device to default state.
UsbCompositeDevice.speed = USB_SPEED_FULL; UsbCompositeDevice.speed = USB_SPEED_FULL;
UsbCompositeDevice.attach = 0U; UsbCompositeDevice.attach = 0U;
UsbCompositeDevice.hidMouseHandle = (class_handle_t)NULL; UsbCompositeDevice.mouseHandle = (class_handle_t)NULL;
UsbCompositeDevice.hidKeyboardHandle = (class_handle_t)NULL; UsbCompositeDevice.keyboardHandle = (class_handle_t)NULL;
UsbCompositeDevice.deviceHandle = NULL; UsbCompositeDevice.deviceHandle = NULL;
usb_status_t deviceStatus = USB_DeviceClassInit( usb_status_t deviceStatus = USB_DeviceClassInit(
@@ -133,10 +133,8 @@ static void USB_DeviceApplicationInit(void)
return; return;
} else { } else {
usb_echo("USB device composite demo\r\n"); usb_echo("USB device composite demo\r\n");
UsbCompositeDevice.hidKeyboardHandle = UsbDeviceCompositeConfigList.config[0].classHandle; UsbCompositeDevice.keyboardHandle = UsbDeviceCompositeConfigList.config[0].classHandle;
UsbCompositeDevice.hidMouseHandle = UsbDeviceCompositeConfigList.config[1].classHandle; UsbCompositeDevice.mouseHandle = UsbDeviceCompositeConfigList.config[1].classHandle;
UsbKeyboardInit(&UsbCompositeDevice);
UsbMouseInit(&UsbCompositeDevice);
} }
// Install ISR, set priority, and enable IRQ. // Install ISR, set priority, and enable IRQ.
right/composite.h
+6 -2
View File
@@ -10,12 +10,16 @@
typedef struct _usb_device_composite_struct { typedef struct _usb_device_composite_struct {
usb_device_handle deviceHandle; usb_device_handle deviceHandle;
class_handle_t hidMouseHandle; class_handle_t mouseHandle;
class_handle_t hidKeyboardHandle; class_handle_t keyboardHandle;
uint8_t speed; uint8_t speed;
uint8_t attach; uint8_t attach;
uint8_t currentConfiguration; uint8_t currentConfiguration;
uint8_t currentInterfaceAlternateSetting[USB_COMPOSITE_INTERFACE_COUNT]; uint8_t currentInterfaceAlternateSetting[USB_COMPOSITE_INTERFACE_COUNT];
} usb_device_composite_struct_t; } usb_device_composite_struct_t;
// Variables:
extern usb_device_composite_struct_t UsbCompositeDevice;
#endif #endif
right/hid_keyboard.c
+2 -9
View File
@@ -9,7 +9,6 @@
#include "scancodes.h" #include "scancodes.h"
#include "hid_keyboard.h" #include "hid_keyboard.h"
static usb_device_composite_struct_t *UsbCompositeDevice;
static usb_device_hid_keyboard_struct_t UsbKeyboardDevice; static usb_device_hid_keyboard_struct_t UsbKeyboardDevice;
static usb_status_t UsbKeyboardAction(void) static usb_status_t UsbKeyboardAction(void)
@@ -40,7 +39,7 @@ static usb_status_t UsbKeyboardAction(void)
default: default:
break; 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); 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) { switch (event) {
case kUSB_DeviceHidEventSendResponse: case kUSB_DeviceHidEventSendResponse:
if (UsbCompositeDevice->attach) { if (UsbCompositeDevice.attach) {
return UsbKeyboardAction(); return UsbKeyboardAction();
} }
break; break;
@@ -86,9 +85,3 @@ usb_status_t UsbKeyboardSetInterface(class_handle_t handle, uint8_t interface, u
} }
return kStatus_USB_Error; return kStatus_USB_Error;
} }
usb_status_t UsbKeyboardInit(usb_device_composite_struct_t *compositeDevice)
{
UsbCompositeDevice = compositeDevice;
return kStatus_USB_Success;
}
right/hid_mouse.c
+4 -11
View File
@@ -8,7 +8,6 @@
#include "composite.h" #include "composite.h"
#include "hid_mouse.h" #include "hid_mouse.h"
static usb_device_composite_struct_t *UsbCompositeDevice;
static usb_device_hid_mouse_struct_t UsbMouseDevice; static usb_device_hid_mouse_struct_t UsbMouseDevice;
/* Update mouse pointer location: draw a rectangular rotation. */ /* Update mouse pointer location: draw a rectangular rotation. */
@@ -65,7 +64,7 @@ static usb_status_t UsbMouseAction(void)
break; 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); 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) switch (event)
{ {
case kUSB_DeviceHidEventSendResponse: case kUSB_DeviceHidEventSendResponse:
if (UsbCompositeDevice->attach) { if (UsbCompositeDevice.attach) {
return UsbMouseAction(); return UsbMouseAction();
} }
break; break;
@@ -97,9 +96,9 @@ usb_status_t UsbMouseCallback(class_handle_t handle, uint32_t event, void *param
return error; 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 UsbMouseAction();
} }
return kStatus_USB_Error; return kStatus_USB_Error;
@@ -112,9 +111,3 @@ usb_status_t UsbMouseSetInterface(class_handle_t handle, uint8_t interface, uint
} }
return kStatus_USB_Error; return kStatus_USB_Error;
} }
usb_status_t UsbMouseInit(usb_device_composite_struct_t *compositeDevice)
{
UsbCompositeDevice = compositeDevice;
return kStatus_USB_Success;
}