RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-10 14:30:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg:'i2c' timeouts..

Browse source
This commit is contained in:
Chris 2018-07-06 16:01:23 +02:00
parent 5dbebb3dc8
commit a5d1ec0b22
1 changed files with 10 additions and 8 deletions

18
common/i2c.c
View file

@ -111,12 +111,8 @@ void I2C_Reset_EnterBootloader(void) {
// 等待时钟变高 // 等待时钟变高
// Wait for the clock to go High. // Wait for the clock to go High.
bool WaitSCL_H(void) { bool WaitSCL_H_delay(uint32_t delay) {
volatile uint16_t delay = 5000;
while (delay--) { while (delay--) {
if (SCL_read) { if (SCL_read) {
return true; return true;
} }
@ -125,6 +121,9 @@ bool WaitSCL_H(void) {
return false; return false;
} }
bool WaitSCL_H(void) {
return WaitSCL_H_delay(5000);
}
// Wait max 300ms or until SCL goes LOW. // Wait max 300ms or until SCL goes LOW.
// Which ever comes first // Which ever comes first
bool WaitSCL_300ms(void){ bool WaitSCL_300ms(void){
@ -514,7 +513,6 @@ void I2C_print_status(void) {
DbpString(" FW version................FAILED"); DbpString(" FW version................FAILED");
} }
#define WAIT_UNTIL_SCL_GOES_HIGH { while (!SCL_read) { SpinDelay(1); } }
bool GetATR(smart_card_atr_t *card_ptr) { bool GetATR(smart_card_atr_t *card_ptr) {
if ( card_ptr ) { if ( card_ptr ) {
@ -530,12 +528,16 @@ bool GetATR(smart_card_atr_t *card_ptr) {
// variable delay here. // variable delay here.
if (!WaitSCL_300ms()) { if (!WaitSCL_300ms()) {
if ( MF_DBGLEVEL > 3 ) DbpString(" 300ms SCL delay failed"); if ( MF_DBGLEVEL > 3 ) DbpString(" 300ms SCL delay - timed out");
return false; return false;
} }
// 8051 speaks with smart card. // 8051 speaks with smart card.
WAIT_UNTIL_SCL_GOES_HIGH; // 50ms timeout?
if (!WaitSCL_H_delay(1500*50) ) {
if ( MF_DBGLEVEL > 3 ) DbpString("wait for SCL HIGH - timed out");
return false;
}
if ( MF_DBGLEVEL > 3 ) DbpString("before reading"); if ( MF_DBGLEVEL > 3 ) DbpString("before reading");