kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert usbd driver name change to be backward compatible

This commit is contained in:
hathach 2024-04-08 22:56:22 +07:00
parent 4bc6a5feb7
commit be25a3fc20
No known key found for this signature in database
GPG Key ID: 26FAB84F615C3C52
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/device/usbd.c
View File

@ -90,16 +90,16 @@ tu_static usbd_device_t _usbd_dev;
// Class Driver // Class Driver
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
#if CFG_TUSB_DEBUG >= CFG_TUD_LOG_LEVEL #if CFG_TUSB_DEBUG >= CFG_TUD_LOG_LEVEL
#define DRIVER_NAME(_name) _name #define DRIVER_NAME(_name) .name = _name,
#else #else
#define DRIVER_NAME(_name) NULL #define DRIVER_NAME(_name)
#endif #endif
// Built-in class drivers // Built-in class drivers
tu_static usbd_class_driver_t const _usbd_driver[] = { tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_CDC #if CFG_TUD_CDC
{ {
.name = DRIVER_NAME("CDC"), DRIVER_NAME("CDC")
.init = cdcd_init, .init = cdcd_init,
.deinit = cdcd_deinit, .deinit = cdcd_deinit,
.reset = cdcd_reset, .reset = cdcd_reset,
@ -112,7 +112,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_MSC #if CFG_TUD_MSC
{ {
.name = DRIVER_NAME("MSC"), DRIVER_NAME("MSC")
.init = mscd_init, .init = mscd_init,
.deinit = NULL, .deinit = NULL,
.reset = mscd_reset, .reset = mscd_reset,
@ -125,7 +125,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_HID #if CFG_TUD_HID
{ {
.name = DRIVER_NAME("HID"), DRIVER_NAME("HID")
.init = hidd_init, .init = hidd_init,
.deinit = hidd_deinit, .deinit = hidd_deinit,
.reset = hidd_reset, .reset = hidd_reset,
@ -138,7 +138,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_AUDIO #if CFG_TUD_AUDIO
{ {
.name = DRIVER_NAME("AUDIO"), DRIVER_NAME("AUDIO")
.init = audiod_init, .init = audiod_init,
.deinit = audiod_deinit, .deinit = audiod_deinit,
.reset = audiod_reset, .reset = audiod_reset,
@ -151,7 +151,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_VIDEO #if CFG_TUD_VIDEO
{ {
.name = DRIVER_NAME("VIDEO"), DRIVER_NAME("VIDEO")
.init = videod_init, .init = videod_init,
.deinit = videod_deinit, .deinit = videod_deinit,
.reset = videod_reset, .reset = videod_reset,
@ -164,7 +164,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_MIDI #if CFG_TUD_MIDI
{ {
.name = DRIVER_NAME("MIDI"), DRIVER_NAME("MIDI")
.init = midid_init, .init = midid_init,
.deinit = midid_deinit, .deinit = midid_deinit,
.open = midid_open, .open = midid_open,
@ -177,7 +177,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_VENDOR #if CFG_TUD_VENDOR
{ {
.name = DRIVER_NAME("VENDOR"), DRIVER_NAME("VENDOR")
.init = vendord_init, .init = vendord_init,
.deinit = vendord_deinit, .deinit = vendord_deinit,
.reset = vendord_reset, .reset = vendord_reset,
@ -190,7 +190,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_USBTMC #if CFG_TUD_USBTMC
{ {
.name = DRIVER_NAME("TMC"), DRIVER_NAME("TMC")
.init = usbtmcd_init_cb, .init = usbtmcd_init_cb,
.deinit = usbtmcd_deinit, .deinit = usbtmcd_deinit,
.reset = usbtmcd_reset_cb, .reset = usbtmcd_reset_cb,
@ -203,7 +203,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_DFU_RUNTIME #if CFG_TUD_DFU_RUNTIME
{ {
.name = DRIVER_NAME("DFU-RUNTIME"), DRIVER_NAME("DFU-RUNTIME")
.init = dfu_rtd_init, .init = dfu_rtd_init,
.deinit = dfu_rtd_deinit, .deinit = dfu_rtd_deinit,
.reset = dfu_rtd_reset, .reset = dfu_rtd_reset,
@ -216,7 +216,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_DFU #if CFG_TUD_DFU
{ {
.name = DRIVER_NAME("DFU"), DRIVER_NAME("DFU")
.init = dfu_moded_init, .init = dfu_moded_init,
.deinit = dfu_moded_deinit, .deinit = dfu_moded_deinit,
.reset = dfu_moded_reset, .reset = dfu_moded_reset,
@ -229,7 +229,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_ECM_RNDIS || CFG_TUD_NCM #if CFG_TUD_ECM_RNDIS || CFG_TUD_NCM
{ {
.name = DRIVER_NAME("NET"), DRIVER_NAME("NET")
.init = netd_init, .init = netd_init,
.deinit = netd_deinit, .deinit = netd_deinit,
.reset = netd_reset, .reset = netd_reset,
@ -242,7 +242,7 @@ tu_static usbd_class_driver_t const _usbd_driver[] = {
#if CFG_TUD_BTH #if CFG_TUD_BTH
{ {
.name = DRIVER_NAME("BTH"), DRIVER_NAME("BTH")
.init = btd_init, .init = btd_init,
.deinit = btd_deinit, .deinit = btd_deinit,
.reset = btd_reset, .reset = btd_reset,

3
src/device/usbd_pvt.h
View File

@ -40,7 +40,10 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
typedef struct { typedef struct {
#if CFG_TUSB_DEBUG >= CFG_TUD_LOG_LEVEL
char const* name; char const* name;
#endif
void (* init ) (void); void (* init ) (void);
bool (* deinit ) (void); bool (* deinit ) (void);
void (* reset ) (uint8_t rhport); void (* reset ) (uint8_t rhport);