mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-19 15:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

house keeping: make tu_print_mem format easier to compare with hex2dump

Browse Source
This commit is contained in:
hathach 2020-11-01 13:37:56 +07:00
parent 8f0f2d1863
commit 67ac40b98d
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/device/audio_test/src/tusb_config.h
View File

@ -47,6 +47,10 @@ extern "C" {
#define CFG_TUSB_OS OPT_OS_NONE #define CFG_TUSB_OS OPT_OS_NONE
#ifndef CFG_TUSB_DEBUG
#define CFG_TUSB_DEBUG 0
#endif
// CFG_TUSB_DEBUG is defined by compiler in DEBUG build // CFG_TUSB_DEBUG is defined by compiler in DEBUG build
// #define CFG_TUSB_DEBUG 0 // #define CFG_TUSB_DEBUG 0
@ -105,8 +109,6 @@ extern "C" {
// Size of control request buffer // Size of control request buffer
#define CFG_TUD_AUDIO_CTRL_BUF_SIZE 64 #define CFG_TUD_AUDIO_CTRL_BUF_SIZE 64
#define CFG_TUSB_DEBUG 0
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
src/common/tusb_common.h
View File

@ -213,7 +213,7 @@ static inline bool tu_bit_test (uint32_t value, uint8_t pos) { return (value
// 2 : print out log // 2 : print out log
#if CFG_TUSB_DEBUG #if CFG_TUSB_DEBUG
void tu_print_mem(void const *buf, uint16_t count, uint8_t indent); void tu_print_mem(void const *buf, uint32_t count, uint8_t indent);
#ifdef CFG_TUSB_DEBUG_PRINTF #ifdef CFG_TUSB_DEBUG_PRINTF
extern int CFG_TUSB_DEBUG_PRINTF(const char *format, ...); extern int CFG_TUSB_DEBUG_PRINTF(const char *format, ...);

24
src/tusb.c
View File

@ -70,20 +70,24 @@ char const* const tusb_strerr[TUSB_ERROR_COUNT] = { ERROR_TABLE(ERROR_STRING) };
static void dump_str_line(uint8_t const* buf, uint16_t count) static void dump_str_line(uint8_t const* buf, uint16_t count)
{ {
tu_printf(" |");
// each line is 16 bytes // each line is 16 bytes
for(uint16_t i=0; i<count; i++) for(uint16_t i=0; i<count; i++)
{ {
const char ch = buf[i]; const char ch = buf[i];
tu_printf("%c", isprint(ch) ? ch : '.'); tu_printf("%c", isprint(ch) ? ch : '.');
} }
tu_printf("|\r\n");
} }
/* Print out memory contents /* Print out memory contents
* - size : item size in bytes * - buf : buffer
* - count : number of item * - count : number of item
* - indent: prefix spaces on every line * - indent: prefix spaces on every line
*/ */
void tu_print_mem(void const *buf, uint16_t count, uint8_t indent) void tu_print_mem(void const *buf, uint32_t count, uint8_t indent)
{ {
uint8_t const size = 1; // fixed 1 byte for now uint8_t const size = 1; // fixed 1 byte for now
@ -95,29 +99,27 @@ void tu_print_mem(void const *buf, uint16_t count, uint8_t indent)
uint8_t const *buf8 = (uint8_t const *) buf; uint8_t const *buf8 = (uint8_t const *) buf;
char format[] = "%00lX"; char format[] = "%00X";
format[2] += 2*size; format[2] += 2*size;
const uint8_t item_per_line = 16 / size; const uint8_t item_per_line = 16 / size;
for(uint16_t i=0; i<count; i++) for(unsigned int i=0; i<count; i++)
{ {
uint32_t value=0; unsigned int value=0;
if ( i%item_per_line == 0 ) if ( i%item_per_line == 0 )
{ {
// Print Ascii // Print Ascii
if ( i != 0 ) if ( i != 0 )
{ {
tu_printf(" | ");
dump_str_line(buf8-16, 16); dump_str_line(buf8-16, 16);
tu_printf("\r\n");
} }
for(uint8_t s=0; s < indent; s++) tu_printf(" "); for(uint8_t s=0; s < indent; s++) tu_printf(" ");
// print offset or absolute address // print offset or absolute address
tu_printf("%03X: ", 16*i/item_per_line); tu_printf("%04X: ", 16*i/item_per_line);
} }
memcpy(&value, buf8, size); memcpy(&value, buf8, size);
@ -128,21 +130,19 @@ void tu_print_mem(void const *buf, uint16_t count, uint8_t indent)
} }
// fill up last row to 16 for printing ascii // fill up last row to 16 for printing ascii
const uint16_t remain = count%16; const uint32_t remain = count%16;
uint8_t nback = (remain ? remain : 16); uint8_t nback = (remain ? remain : 16);
if ( remain ) if ( remain )
{ {
for(uint16_t i=0; i< 16-remain; i++) for(uint32_t i=0; i< 16-remain; i++)
{ {
tu_printf(" "); tu_printf(" ");
for(int j=0; j<2*size; j++) tu_printf(" "); for(int j=0; j<2*size; j++) tu_printf(" ");
} }
} }
tu_printf(" | ");
dump_str_line(buf8-nback, nback); dump_str_line(buf8-nback, nback);
tu_printf("\r\n");
} }
#endif #endif