Skip to content

Commit b8881a3

Browse files
author
IngHK
committed
fixed compile errors due to untreated CFG_TUH_LOG_LEVEL
1 parent a973887 commit b8881a3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/common/tusb_debug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#if CFG_TUSB_DEBUG
4444

4545
// Enum to String for debugging purposes
46-
#if CFG_TUSB_DEBUG >= 2
46+
#if CFG_TUSB_DEBUG >= CFG_TUH_LOG_LEVEL
4747
extern char const* const tu_str_speed[];
4848
extern char const* const tu_str_std_request[];
4949
extern char const* const tu_str_xfer_result[];

src/host/usbh.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ typedef struct {
113113
// MACRO CONSTANT TYPEDEF
114114
//--------------------------------------------------------------------+
115115

116-
#if CFG_TUSB_DEBUG >= 2
116+
#if CFG_TUSB_DEBUG >= CFG_TUH_LOG_LEVEL
117117
#define DRIVER_NAME(_name) .name = _name,
118118
#else
119119
#define DRIVER_NAME(_name)
@@ -1233,7 +1233,7 @@ static void process_removing_device(uint8_t rhport, uint8_t hub_addr, uint8_t hu
12331233
TU_LOG_USBH("Device unplugged address = %u\r\n", daddr);
12341234

12351235
if (is_hub_addr(daddr)) {
1236-
TU_LOG(CFG_TUH_LOG_LEVEL, " is a HUB device %u\r\n", daddr);
1236+
TU_LOG_USBH(" is a HUB device %u\r\n", daddr);
12371237

12381238
// Submit removed event If the device itself is a hub (un-rolled recursive)
12391239
// TODO a better to unroll recursrive is using array of removing_hubs and mark it here
@@ -1708,7 +1708,7 @@ static bool _parse_configuration_descriptor(uint8_t dev_addr, tusb_desc_configur
17081708

17091709
if ( drv_id == TOTAL_DRIVER_COUNT - 1 )
17101710
{
1711-
TU_LOG(CFG_TUH_LOG_LEVEL, "[%u:%u] Interface %u: class = %u subclass = %u protocol = %u is not supported\r\n",
1711+
TU_LOG_USBH("[%u:%u] Interface %u: class = %u subclass = %u protocol = %u is not supported\r\n",
17121712
dev->rhport, dev_addr, desc_itf->bInterfaceNumber, desc_itf->bInterfaceClass, desc_itf->bInterfaceSubClass, desc_itf->bInterfaceProtocol);
17131713
}
17141714
}
@@ -1741,7 +1741,7 @@ void usbh_driver_set_config_complete(uint8_t dev_addr, uint8_t itf_num) {
17411741
enum_full_complete();
17421742

17431743
if (is_hub_addr(dev_addr)) {
1744-
TU_LOG(CFG_TUH_LOG_LEVEL, "HUB address = %u is mounted\r\n", dev_addr);
1744+
TU_LOG_USBH("HUB address = %u is mounted\r\n", dev_addr);
17451745
}else {
17461746
// Invoke callback if available
17471747
if (tuh_mount_cb) tuh_mount_cb(dev_addr);

src/host/usbh_pvt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ enum {
5151
//--------------------------------------------------------------------+
5252

5353
typedef struct {
54-
#if CFG_TUSB_DEBUG >= 2
54+
#if CFG_TUSB_DEBUG >= CFG_TUH_LOG_LEVEL
5555
char const* name;
5656
#endif
5757

src/tusb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ uint32_t tu_edpt_stream_read(tu_edpt_stream_t* s, void* buffer, uint32_t bufsize
419419
#if CFG_TUSB_DEBUG
420420
#include <ctype.h>
421421

422-
#if CFG_TUSB_DEBUG >= 2
422+
#if CFG_TUSB_DEBUG >= CFG_TUH_LOG_LEVEL
423423

424424
char const* const tu_str_speed[] = { "Full", "Low", "High" };
425425
char const* const tu_str_std_request[] =

0 commit comments

Comments
 (0)