github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg: i2c more debugs

Browse source
This commit is contained in:
Chris 2018-07-08 20:01:34 +02:00
commit da52b71135
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
common/i2c.c
View file

@ -419,7 +419,7 @@ uint8_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
I2C_Stop(); I2C_Stop();
// return bytecount - first byte (which is length byte) // return bytecount - first byte (which is length byte)
return (readcount) ? readcount-- : 0; return (readcount) ? --readcount : 0;
} }
uint8_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) { uint8_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
@ -531,10 +531,13 @@ void I2C_print_status(void) {
uint8_t resp[] = {0,0,0}; uint8_t resp[] = {0,0,0};
I2C_init(); I2C_init();
I2C_Reset_EnterMainProgram(); I2C_Reset_EnterMainProgram();
if ( I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN) ) uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);
Dbprintf(" FW version................v%x.%02x", resp[0], resp[1]); if ( len > 0 ) {
else Dbprintf(" FW version..............v%x.%02x", resp[0], resp[1]);
DbpString(" FW version................FAILED"); LogTrace(resp, len, 0, 0, NULL, false);
} else {
DbpString(" FW version..............FAILED");
}
} }
bool GetATR(smart_card_atr_t *card_ptr) { bool GetATR(smart_card_atr_t *card_ptr) {
@ -559,6 +562,8 @@ bool GetATR(smart_card_atr_t *card_ptr) {
if ( len == 0 ) if ( len == 0 )
return false; return false;
if ( MF_DBGLEVEL > 3 ) Dbprintf("counter %d", len);
if ( card_ptr ) { if ( card_ptr ) {
card_ptr->atr_len = len; card_ptr->atr_len = len;
LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false); LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false);
@ -612,12 +617,16 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
// start [C0 03 start C1 len aa bb cc stop] // start [C0 03 start C1 len aa bb cc stop]
len = I2C_BufferRead(resp, ISO7618_MAX_FRAME, I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN); len = I2C_BufferRead(resp, ISO7618_MAX_FRAME, I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
if ( MF_DBGLEVEL > 3 ) Dbprintf("counter %d", len);
out:
cmd_send(CMD_ACK, isOK, len, 0, resp, len);
// log answer // log answer
if ( len ) if ( len )
LogTrace(resp, len, 0, 0, NULL, false); LogTrace(resp, len, 0, 0, NULL, false);
out:
cmd_send(CMD_ACK, isOK, len, 0, resp, len);
LED_D_OFF(); LED_D_OFF();
} }