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

replace pico_warn by log level 1

This commit is contained in:
hathach 2021-06-11 18:39:28 +07:00
parent 66c8a13f13
commit a6d22f5a68
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portable/raspberrypi/rp2040/rp2040_usb.c
View File

@ -189,7 +189,7 @@ void hw_endpoint_xfer_start(struct hw_endpoint *ep, uint8_t *buffer, uint16_t to
if ( ep->active ) if ( ep->active )
{ {
// TODO: Is this acceptable for interrupt packets? // TODO: Is this acceptable for interrupt packets?
pico_warn("WARN: starting new transfer on already active ep %d %s\n", tu_edpt_number(ep->ep_addr), TU_LOG(1, "WARN: starting new transfer on already active ep %d %s\n", tu_edpt_number(ep->ep_addr),
ep_dir_string[tu_edpt_dir(ep->ep_addr)]); ep_dir_string[tu_edpt_dir(ep->ep_addr)]);
hw_endpoint_reset_transfer(ep); hw_endpoint_reset_transfer(ep);

24
src/portable/raspberrypi/rp2040/rp2040_usb.h
View File

@ -29,12 +29,6 @@
#define pico_info(format,...) ((void)0) #define pico_info(format,...) ((void)0)
#endif #endif
#if false && !defined(NDEBUG)
#define pico_warn(format,args...) printf(format, ## args)
#else
#define pico_warn(format,...) ((void)0)
#endif
// Hardware information per endpoint // Hardware information per endpoint
struct hw_endpoint struct hw_endpoint
{ {
@ -127,13 +121,14 @@ typedef union TU_ATTR_PACKED
TU_VERIFY_STATIC(sizeof(rp2040_buffer_control_t) == 2, "size is not correct"); TU_VERIFY_STATIC(sizeof(rp2040_buffer_control_t) == 2, "size is not correct");
static inline void print_bufctrl16(uint32_t __unused u16) #if CFG_TUSB_DEBUG >= 3
static inline void print_bufctrl16(uint32_t u16)
{ {
rp2040_buffer_control_t __unused bufctrl = { rp2040_buffer_control_t bufctrl = {
.u16 = u16 .u16 = u16
}; };
TU_LOG(2, "len = %u, available = %u, stall = %u, reset = %u, toggle = %u, last = %u, full = %u\r\n", TU_LOG(3, "len = %u, available = %u, stall = %u, reset = %u, toggle = %u, last = %u, full = %u\r\n",
bufctrl.xfer_len, bufctrl.available, bufctrl.stall, bufctrl.reset_bufsel, bufctrl.data_toggle, bufctrl.last_buf, bufctrl.full); bufctrl.xfer_len, bufctrl.available, bufctrl.stall, bufctrl.reset_bufsel, bufctrl.data_toggle, bufctrl.last_buf, bufctrl.full);
} }
@ -142,12 +137,19 @@ static inline void print_bufctrl32(uint32_t u32)
uint16_t u16; uint16_t u16;
u16 = u32 >> 16; u16 = u32 >> 16;
TU_LOG(2, " Buffer Control 1 0x%x: ", u16); TU_LOG(3, " Buffer Control 1 0x%x: ", u16);
print_bufctrl16(u16); print_bufctrl16(u16);
u16 = u32 & 0x0000ffff; u16 = u32 & 0x0000ffff;
TU_LOG(2, " Buffer Control 0 0x%x: ", u16); TU_LOG(3, " Buffer Control 0 0x%x: ", u16);
print_bufctrl16(u16); print_bufctrl16(u16);
} }
#else
#define print_bufctrl16(u16)
#define print_bufctrl32(u32)
#endif
#endif #endif