arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-18 10:32:02 +00:00
Code Issues Releases Wiki Activity

debug: Improve debugging API (#134)

Browse Source 
* Allow DEBUG_LOG without DEBUG_LINK
* Move debugInt() to debug.c
This commit is contained in:
Saleem Rashid 2016-12-04 22:24:01 +00:00 committed by Pavol Rusnak
parent 5c00b24307
commit 5f203d0a0c
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/debug.c
View File

@ -20,6 +20,7 @@
#include "trezor.h" #include "trezor.h"
#include "debug.h" #include "debug.h"
#include "oled.h" #include "oled.h"
#include "util.h"
#if DEBUG_LOG #if DEBUG_LOG
@ -50,4 +51,15 @@ void debugLog(int level, const char *bucket, const char *text)
oledDebug(text); oledDebug(text);
} }
char *debugInt(const uint32_t i)
{
static uint8_t n = 0;
static char id[8][9];
uint32hex(i, id[n]);
debugLog(0, "", id[n]);
char *ret = (char *)id[n];
n = (n + 1) % 8;
return ret;
}
#endif #endif

3
firmware/debug.h
View File

@ -21,14 +21,17 @@
#define __DEBUG_H__ #define __DEBUG_H__
#include "trezor.h" #include "trezor.h"
#include <stdint.h>
#if DEBUG_LOG #if DEBUG_LOG
void debugLog(int level, const char *bucket, const char *text); void debugLog(int level, const char *bucket, const char *text);
char *debugInt(const uint32_t i);
#else #else
#define debugLog(L, B, T) do{}while(0) #define debugLog(L, B, T) do{}while(0)
#define debugInt(I) do{}while(0)
#endif #endif

5
firmware/trezor.c
View File

@ -99,8 +99,11 @@ int main(void)
timer_init(); timer_init();
#if DEBUG_LINK #if DEBUG_LOG
oledSetDebug(1); oledSetDebug(1);
#endif
#if DEBUG_LINK
storage_reset(); // wipe storage if debug link storage_reset(); // wipe storage if debug link
storage_reset_uuid(); storage_reset_uuid();
storage_commit(); storage_commit();

16
firmware/u2f.c
View File

@ -92,22 +92,6 @@ typedef struct {
uint8_t chal[U2F_CHAL_SIZE]; uint8_t chal[U2F_CHAL_SIZE];
} U2F_AUTHENTICATE_SIG_STR; } U2F_AUTHENTICATE_SIG_STR;
#if DEBUG_LOG
char *debugInt(const uint32_t i)
{
static uint8_t n = 0;
static char id[8][9];
uint32hex(i, id[n]);
debugLog(0, "", id[n]);
char *ret = (char *)id[n];
n = (n + 1) % 8;
return ret;
}
#else
#define debugInt(I) do{}while(0)
#endif
static uint32_t dialog_timeout = 0; static uint32_t dialog_timeout = 0;
uint32_t next_cid(void) uint32_t next_cid(void)