From 5725eed2cd33ba28372927015f78c5dcdfc2ba46 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 3 Aug 2020 17:38:18 +0200 Subject: [PATCH] to log or not to log --- armsrc/i2c.c | 13 ++++++++----- armsrc/i2c.h | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/armsrc/i2c.c b/armsrc/i2c.c index c6d9c6fb3..27f1f3011 100644 --- a/armsrc/i2c.c +++ b/armsrc/i2c.c @@ -631,7 +631,7 @@ int I2C_get_version(uint8_t *maj, uint8_t *min) { } // Will read response from smart card module, retries 3 times to get the data. -static bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen) { +bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen) { uint8_t i = 3; int16_t len = 0; @@ -658,7 +658,7 @@ static bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen) { return true; } -bool GetATR(smart_card_atr_t *card_ptr) { +bool GetATR(smart_card_atr_t *card_ptr, bool verbose) { if (!card_ptr) return false; @@ -706,7 +706,10 @@ bool GetATR(smart_card_atr_t *card_ptr) { } card_ptr->atr_len = len; - LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false); + if (verbose) { + LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false); + } + return true; } @@ -715,7 +718,7 @@ void SmartCardAtr(void) { LED_D_ON(); set_tracing(true); I2C_Reset_EnterMainProgram(); - bool isOK = GetATR(&card); + bool isOK = GetATR(&card, true); reply_mix(CMD_ACK, isOK, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t)); set_tracing(false); LEDsoff(); @@ -743,7 +746,7 @@ void SmartCardRaw(uint64_t arg0, uint64_t arg1, uint8_t *data) { if ((flags & SC_SELECT)) { smart_card_atr_t card; - bool gotATR = GetATR(&card); + bool gotATR = GetATR(&card, true); //reply_old(CMD_ACK, gotATR, sizeof(smart_card_atr_t), 0, &card, sizeof(smart_card_atr_t)); if (!gotATR) goto OUT; diff --git a/armsrc/i2c.h b/armsrc/i2c.h index 7b1707502..5f0f6dd18 100644 --- a/armsrc/i2c.h +++ b/armsrc/i2c.h @@ -33,8 +33,9 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address); bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address); +bool sc_rx_bytes(uint8_t *dest, uint8_t *destlen); // -bool GetATR(smart_card_atr_t *card_ptr); +bool GetATR(smart_card_atr_t *card_ptr, bool verbose); // generice functions void SmartCardAtr(void);