mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-08-18 11:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3753 from Old-Ding/codex/usbd-driver-count-warning

Browse Source 
Fix usbd empty builtin driver warning
This commit is contained in:
Zixun LI
2026-07-05 16:14:01 +02:00
committed by GitHub
parent be2218e3d8 073657a04e
commit 3579ea1888
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/device/usbd.c
View File

@ -361,13 +361,12 @@ static const usbd_class_driver_t _usbd_driver[] = {
#endif
};
enum { BUILTIN_DRIVER_COUNT = TU_ARRAY_SIZE(_usbd_driver) };
// Additional class drivers implemented by application
static const usbd_class_driver_t *_app_driver = NULL;
static uint8_t _app_driver_count = 0;
static const usbd_class_driver_t *_app_driver = NULL;
static const uint8_t _builtin_driver_count = TU_ARRAY_SIZE(_usbd_driver);
static uint8_t _app_driver_count = 0;
#define TOTAL_DRIVER_COUNT ((uint8_t) (_app_driver_count + BUILTIN_DRIVER_COUNT))
#define TOTAL_DRIVER_COUNT ((uint8_t) (_app_driver_count + _builtin_driver_count))
// virtually joins built-in and application drivers together.
// Application is positioned first to allow overwriting built-in ones.
@ -378,7 +377,7 @@ TU_ATTR_ALWAYS_INLINE static inline usbd_class_driver_t const * get_driver(uint8
driver = &_app_driver[drvid];
} else{
drvid -= _app_driver_count;
if (drvid < BUILTIN_DRIVER_COUNT) {
if (_builtin_driver_count > 0 && drvid < _builtin_driver_count) {
driver = &_usbd_driver[drvid];
}
}
@ -563,7 +562,7 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
// Get application driver if available
_app_driver = usbd_app_driver_get_cb(&_app_driver_count);
TU_ASSERT(_app_driver_count + BUILTIN_DRIVER_COUNT <= UINT8_MAX);
TU_ASSERT(_app_driver_count + _builtin_driver_count <= UINT8_MAX);
// Init class drivers
for (uint8_t i = 0; i < TOTAL_DRIVER_COUNT; i++) {

10
src/host/usbh.c
View File

@ -319,13 +319,12 @@ static usbh_class_driver_t const usbh_class_drivers[] = {
#endif
};
enum { BUILTIN_DRIVER_COUNT = TU_ARRAY_SIZE(usbh_class_drivers) };
// Additional class drivers implemented by application
static usbh_class_driver_t const * _app_driver = NULL;
static uint8_t _app_driver_count = 0;
static const uint8_t _builtin_driver_count = TU_ARRAY_SIZE(usbh_class_drivers);
static uint8_t _app_driver_count = 0;
#define TOTAL_DRIVER_COUNT (_app_driver_count + BUILTIN_DRIVER_COUNT)
#define TOTAL_DRIVER_COUNT (_app_driver_count + _builtin_driver_count)
// virtually joins built-in and application drivers together.
// Application is positioned first to allow overwriting built-in ones.
@ -335,7 +334,7 @@ TU_ATTR_ALWAYS_INLINE static inline usbh_class_driver_t const *get_driver(uint8_
driver = &_app_driver[drv_id];
} else {
drv_id -= _app_driver_count;
if (drv_id < BUILTIN_DRIVER_COUNT) {
if (_builtin_driver_count > 0 && drv_id < _builtin_driver_count) {
driver = &usbh_class_drivers[drv_id];
}
}
@ -547,6 +546,7 @@ bool tuh_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
// Get application driver if available
_app_driver = usbh_app_driver_get_cb(&_app_driver_count);
TU_ASSERT(_app_driver_count + _builtin_driver_count <= UINT8_MAX);
// Device
tu_memclr(_usbh_devices, sizeof(_usbh_devices));