From 8920a208ddef5f555142cc420288dd8495d6da43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Wed, 12 Apr 2017 23:46:18 +0200 Subject: [PATCH] Clean up composite.c --- .../buspal/bm_usb/bootloader_hid_report_ids.h | 6 ++-- right/src/buspal/bm_usb/composite.c | 34 ++----------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/right/src/buspal/bm_usb/bootloader_hid_report_ids.h b/right/src/buspal/bm_usb/bootloader_hid_report_ids.h index 7128e91..f80a822 100644 --- a/right/src/buspal/bm_usb/bootloader_hid_report_ids.h +++ b/right/src/buspal/bm_usb/bootloader_hid_report_ids.h @@ -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 { diff --git a/right/src/buspal/bm_usb/composite.c b/right/src/buspal/bm_usb/composite.c index aa60964..ae99fa6 100644 --- a/right/src/buspal/bm_usb/composite.c +++ b/right/src/buspal/bm_usb/composite.c @@ -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 -#include - -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,