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

Expand UsbDeviceCompositeClassConfig and UsbDeviceCompositeConfigList using structure member names.

Browse Source
This commit is contained in:
László Monda
2017-12-04 20:05:28 +01:00
parent 8cb8654459
commit e9bf3dc355
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
right/src/usb_composite_device.c
View File

@@ -9,17 +9,37 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
usb_composite_device_t UsbCompositeDevice; usb_composite_device_t UsbCompositeDevice;
usb_device_class_config_struct_t UsbDeviceCompositeClassConfig[USB_DEVICE_CONFIG_HID] = { usb_device_class_config_struct_t UsbDeviceCompositeClassConfig[USB_DEVICE_CONFIG_HID] = {
{UsbGenericHidCallback, (class_handle_t)NULL, &UsbGenericHidClass}, {
{UsbBasicKeyboardCallback, (class_handle_t)NULL, &UsbBasicKeyboardClass}, .classCallback = UsbGenericHidCallback,
{UsbMediaKeyboardCallback, (class_handle_t)NULL, &UsbMediaKeyboardClass}, .classHandle = (class_handle_t)NULL,
{UsbSystemKeyboardCallback, (class_handle_t)NULL, &UsbSystemKeyboardClass}, .classInfomation = &UsbGenericHidClass
{UsbMouseCallback, (class_handle_t)NULL, &UsbMouseClass}, },
{
.classCallback = UsbBasicKeyboardCallback,
.classHandle = (class_handle_t)NULL,
.classInfomation = &UsbBasicKeyboardClass
},
{
.classCallback = UsbMediaKeyboardCallback,
.classHandle = (class_handle_t)NULL,
.classInfomation = &UsbMediaKeyboardClass
},
{
.classCallback = UsbSystemKeyboardCallback,
.classHandle = (class_handle_t)NULL,
.classInfomation = &UsbSystemKeyboardClass
},
{
.classCallback = UsbMouseCallback,
.classHandle = (class_handle_t)NULL,
.classInfomation = &UsbMouseClass
},
}; };
usb_device_class_config_list_struct_t UsbDeviceCompositeConfigList = { usb_device_class_config_list_struct_t UsbDeviceCompositeConfigList = {
UsbDeviceCompositeClassConfig, .deviceCallback = UsbDeviceCallback,
UsbDeviceCallback, .count = USB_DEVICE_CONFIG_HID,
USB_DEVICE_CONFIG_HID .config = UsbDeviceCompositeClassConfig,
}; };
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)