From 180e3d4df95bce024e22608a5766bd31b1062466 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 21 Feb 2018 14:59:06 +0100 Subject: [PATCH] chg: adaptations for global debug var to be accessible --- client/cmddata.c | 4 ++-- client/cmddata.h | 3 ++- client/proxgui.h | 2 +- include/proxmark3.h | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index f3a2723ff..c456daa1a 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -12,7 +12,7 @@ uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; uint8_t g_debugMode = 0; size_t DemodBufferLen = 0; -int g_DemodStartIdx = 0; +size_t g_DemodStartIdx = 0; int g_DemodClock = 0; static int CmdHelp(const char *Cmd); @@ -339,7 +339,7 @@ void save_restoreDB(uint8_t saveOpt) { static uint8_t SavedDB[MAX_DEMOD_BUF_LEN]; static size_t SavedDBlen; static bool DB_Saved = false; - static int savedDemodStartIdx = 0; + static size_t savedDemodStartIdx = 0; static int savedDemodClock = 0; if (saveOpt == GRAPH_SAVE) { //save diff --git a/client/cmddata.h b/client/cmddata.h index 5cc21f2a8..ee39906fd 100644 --- a/client/cmddata.h +++ b/client/cmddata.h @@ -93,8 +93,9 @@ int CmdDataIIR(const char *Cmd); #define BIGBUF_SIZE 40000 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; extern size_t DemodBufferLen; -extern int g_DemodStartIdx; + extern int g_DemodClock; +extern size_t g_DemodStartIdx; extern uint8_t g_debugMode; #endif diff --git a/client/proxgui.h b/client/proxgui.h index cee7b931b..d5d90e8e1 100644 --- a/client/proxgui.h +++ b/client/proxgui.h @@ -46,7 +46,7 @@ extern void save_restoreGB(uint8_t saveOpt); #define MAX_DEMOD_BUF_LEN (1024*128) extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; extern size_t DemodBufferLen; -//extern size_t g_DemodStartIdx; +extern size_t g_DemodStartIdx; extern bool showDemod; extern uint8_t g_debugMode; diff --git a/include/proxmark3.h b/include/proxmark3.h index 9029ca865..002c7db36 100644 --- a/include/proxmark3.h +++ b/include/proxmark3.h @@ -98,7 +98,6 @@ #define NCS_1_LOW LOW(GPIO_NCS2) #define NCS_1_HIGH HIGH(GPIO_NCS2) - #define RELAY_ON() HIGH(GPIO_RELAY) #define RELAY_OFF() LOW(GPIO_RELAY) #define BUTTON_PRESS() !((AT91C_BASE_PIOA->PIO_PDSR & GPIO_BUTTON) == GPIO_BUTTON)