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

Clean up composite.c

Browse Source
This commit is contained in:
László Monda
2017-04-12 23:46:18 +02:00
parent d9252f4ff4
commit 8920a208dd
2 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
right/src/buspal/bm_usb/bootloader_hid_report_ids.h
View File

@@ -5,9 +5,9 @@
enum _hid_report_ids {
kBootloaderReportID_CommandOut = 1,
kBootloaderReportID_DataOut = 2,
kBootloaderReportID_CommandIn = 3,
kBootloaderReportID_DataIn = 4
kBootloaderReportID_DataOut = 2,
kBootloaderReportID_CommandIn = 3,
kBootloaderReportID_DataIn = 4,
};
typedef struct _bl_hid_header {

34
right/src/buspal/bm_usb/composite.c
View File

@@ -1,37 +1,9 @@
#include "usb_device_config.h"
#include "usb.h"
#include "usb_device.h"
#include "usb_device_class.h"
#include "usb_device_hid.h"
#include "usb_device_ch9.h"
#include "usb_descriptor.h"
#include "composite.h"
#include "fsl_device_registers.h"
#include <stdio.h>
#include <stdlib.h>
usb_device_class_config_struct_t g_composite_device[USB_COMPOSITE_INTERFACE_COUNT] = {
#if ((USB_DEVICE_CONFIG_HID) && (USB_DEVICE_CONFIG_HID > 0U))
{
usb_device_hid_generic_callback, (class_handle_t)NULL, &g_hid_generic_class,
},
#endif
#if USB_DEVICE_CONFIG_MSC
{
usb_device_msc_callback, (class_handle_t)NULL, &g_msc_class,
}
#endif
#if ((USB_DEVICE_CONFIG_HID == 0) && (USB_DEVICE_CONFIG_MSC == 0))
{
NULL, NULL, NULL,
}
#endif
};
usb_device_class_config_struct_t g_composite_device[USB_COMPOSITE_INTERFACE_COUNT] = {{
usb_device_hid_generic_callback, (class_handle_t)NULL, &g_hid_generic_class,
}};
usb_device_class_config_list_struct_t g_composite_device_config_list = {
g_composite_device, usb_device_callback, USB_COMPOSITE_INTERFACE_COUNT,