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: testing to switch from WaitXX calls to SpinDelay, they seem to mess up

Browse source
This commit is contained in:
Chris 2018-07-06 09:10:13 +02:00
commit fff2f51cfb
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/flashmem.c
View file

@ -154,7 +154,7 @@ bool Flash_CheckBusy(uint16_t times) {
while (times) { while (times) {
WDT_HIT(); WDT_HIT();
WaitMS(1); SpinDelay(1);
ret = (Flash_ReadStat1() & BUSY); ret = (Flash_ReadStat1() & BUSY);
if (!ret) if (!ret)
break; break;

23
common/i2c.c
View file

@ -92,10 +92,11 @@ void I2C_SetResetStatus(uint8_t LineRST, uint8_t LineSCK, uint8_t LineSDA) {
// Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter. // Note: the SIM_Adapter will not enter the main program after power up. Please run this function before use SIM_Adapter.
void I2C_Reset_EnterMainProgram(void) { void I2C_Reset_EnterMainProgram(void) {
I2C_SetResetStatus(0, 0, 0); // 拉低复位线 I2C_SetResetStatus(0, 0, 0); // 拉低复位线
SpinDelay(100); SpinDelay(30);
I2C_SetResetStatus(1, 0, 0); // 解除复位 I2C_SetResetStatus(1, 0, 0); // 解除复位
SpinDelay(100); SpinDelay(30);
I2C_SetResetStatus(1, 1, 1); // 拉高数据线 I2C_SetResetStatus(1, 1, 1); // 拉高数据线
SpinDelay(10);
} }
// 复位进入引导模式 // 复位进入引导模式
@ -105,6 +106,7 @@ void I2C_Reset_EnterBootloader(void) {
I2C_SetResetStatus(0, 1, 1); // 拉低复位线 I2C_SetResetStatus(0, 1, 1); // 拉低复位线
SpinDelay(100); SpinDelay(100);
I2C_SetResetStatus(1, 1, 1); // 解除复位 I2C_SetResetStatus(1, 1, 1); // 解除复位
SpinDelay(10);
} }
// 等待时钟变高 // 等待时钟变高
@ -499,7 +501,6 @@ void I2C_print_status(void) {
} }
void SmartCardAtr(void) { void SmartCardAtr(void) {
StartTicks();
I2C_Reset_EnterMainProgram(); I2C_Reset_EnterMainProgram();
uint8_t *resp = BigBuf_malloc( sizeof(smart_card_atr_t) ); uint8_t *resp = BigBuf_malloc( sizeof(smart_card_atr_t) );
@ -510,7 +511,7 @@ void SmartCardAtr(void) {
I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN); I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN);
// writing takes time. // writing takes time.
WaitMS(50); SpinDelay(50);
// start [C0 03 start C1 len aa bb cc stop] // start [C0 03 start C1 len aa bb cc stop]
uint8_t len = I2C_BufferRead(card->atr, sizeof(card->atr), I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN); uint8_t len = I2C_BufferRead(card->atr, sizeof(card->atr), I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
@ -521,13 +522,11 @@ void SmartCardAtr(void) {
// print ATR // print ATR
Dbhexdump(len, resp, false); Dbhexdump(len, resp, false);
StopTicks();
cmd_send(CMD_ACK, len, 0, 0, resp, sizeof(smart_card_atr_t)); cmd_send(CMD_ACK, len, 0, 0, resp, sizeof(smart_card_atr_t));
} }
void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) { void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
#define ISO7618_MAX_FRAME 255 #define ISO7618_MAX_FRAME 255
StartTicks();
I2C_Reset_EnterMainProgram(); I2C_Reset_EnterMainProgram();
uint8_t buf[30] = {0}; uint8_t buf[30] = {0};
@ -538,7 +537,7 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN); I2C_WriteCmd(I2C_DEVICE_CMD_GENERATE_ATR, I2C_DEVICE_ADDRESS_MAIN);
// writing takes time. // writing takes time.
WaitMS(50); SpinDelay(50);
// start [C0 03 start C1 len aa bb cc stop] (read ATR) // start [C0 03 start C1 len aa bb cc stop] (read ATR)
uint8_t len = I2C_BufferRead(buf, sizeof(buf), I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN); uint8_t len = I2C_BufferRead(buf, sizeof(buf), I2C_DEVICE_CMD_READ, I2C_DEVICE_ADDRESS_MAIN);
@ -557,7 +556,6 @@ void SmartCardRaw( uint64_t arg0, uint64_t arg1, uint8_t *data ) {
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);
out: out:
StopTicks();
cmd_send(CMD_ACK, len, 0, 0, resp, len); cmd_send(CMD_ACK, len, 0, 0, resp, len);
} }
@ -566,7 +564,6 @@ void SmartCardUpgrade(uint64_t arg0) {
// write. Sector0, with 11,22,33,44 // write. Sector0, with 11,22,33,44
// erase is 128bytes, and takes 50ms to execute // erase is 128bytes, and takes 50ms to execute
StartTicks();
I2C_Reset_EnterBootloader(); I2C_Reset_EnterBootloader();
bool isOK = true; bool isOK = true;
@ -594,7 +591,7 @@ void SmartCardUpgrade(uint64_t arg0) {
} }
// writing takes time. // writing takes time.
WaitMS(50); SpinDelay(50);
// read // read
res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT); res = I2C_ReadFW(verfiydata, size, msb, lsb, I2C_DEVICE_ADDRESS_BOOT);
@ -614,12 +611,10 @@ void SmartCardUpgrade(uint64_t arg0) {
length -= size; length -= size;
pos += size; pos += size;
} }
StopTicks();
cmd_send(CMD_ACK, isOK, pos, 0, 0, 0); cmd_send(CMD_ACK, isOK, pos, 0, 0, 0);
} }
void SmartCardSetBaud(uint64_t arg0) { void SmartCardSetBaud(uint64_t arg0) {
StartTicks();
I2C_Reset_EnterMainProgram(); I2C_Reset_EnterMainProgram();
bool isOK = true; bool isOK = true;
@ -628,12 +623,11 @@ void SmartCardSetBaud(uint64_t arg0) {
// start [C0 04] stop // start [C0 04] stop
//I2C_WriteByte(0x00, I2C_DEVICE_CMD_SETBAUD, I2C_DEVICE_ADDRESS_MAIN); //I2C_WriteByte(0x00, I2C_DEVICE_CMD_SETBAUD, I2C_DEVICE_ADDRESS_MAIN);
StopTicks();
cmd_send(CMD_ACK, isOK, 0, 0, 0, 0); cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
} }
void SmartCardSetClock(uint64_t arg0) { void SmartCardSetClock(uint64_t arg0) {
StartTicks();
I2C_Reset_EnterMainProgram(); I2C_Reset_EnterMainProgram();
bool isOK = true; bool isOK = true;
@ -642,6 +636,5 @@ void SmartCardSetClock(uint64_t arg0) {
// start [C0 04] stop // start [C0 04] stop
//I2C_WriteByte(0x00, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN); //I2C_WriteByte(0x00, I2C_DEVICE_CMD_SIM_CLC, I2C_DEVICE_ADDRESS_MAIN);
StopTicks();
cmd_send(CMD_ACK, isOK, 0, 0, 0, 0); cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
} }