RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-05 23:52:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes in iclass.c

Browse source
This commit is contained in:
Martin Holst Swende 2014-06-07 21:49:56 +02:00
parent 94090295a7
commit e3dc1e4cf5
1 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
armsrc/iclass.c
View file

@ -1075,6 +1075,12 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
CodeIClassTagAnswer(response4, sizeof(response4)); CodeIClassTagAnswer(response4, sizeof(response4));
memcpy(resp4, ToSend, ToSendMax); resp4Len = ToSendMax; memcpy(resp4, ToSend, ToSendMax); resp4Len = ToSendMax;
// Start from off (no field generated)
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
SpinDelay(200);
// We need to listen to the high-frequency, peak-detected path. // We need to listen to the high-frequency, peak-detected path.
SetAdcMuxFor(GPIO_MUXSEL_HIPKD); SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
FpgaSetupSsc(); FpgaSetupSsc();
@ -1085,10 +1091,17 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
LED_A_ON(); LED_A_ON();
for(;;) { for(;;) {
LED_B_OFF(); LED_B_OFF();
//Signal tracer
// Can be used to get a trigger for an oscilloscope..
LED_C_OFF();
if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) { if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) {
DbpString("button press"); DbpString("button press");
break; break;
} }
//Signal tracer
LED_C_ON();
// Okay, look at the command now. // Okay, look at the command now.
if(receivedCmd[0] == 0x0a) { if(receivedCmd[0] == 0x0a) {
@ -1188,41 +1201,34 @@ void SimulateIClass(uint8_t arg0, uint8_t *datain)
static int SendIClassAnswer(uint8_t *resp, int respLen, int delay) static int SendIClassAnswer(uint8_t *resp, int respLen, int delay)
{ {
int i = 0, u = 0, d = 0; int i = 0, d=0;//, u = 0, d = 0;
uint8_t b = 0; uint8_t b = 0;
// return 0;
// Modulate Manchester FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K);
// FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD424);
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_MOD);
AT91C_BASE_SSC->SSC_THR = 0x00; AT91C_BASE_SSC->SSC_THR = 0x00;
FpgaSetupSsc(); FpgaSetupSsc();
while(!BUTTON_PRESS()) {
// send cycle if((AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){
for(;;) { b = AT91C_BASE_SSC->SSC_RHR; (void) b;
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
volatile uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
(void)b;
} }
if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)){
b = 0x00;
if(d < delay) { if(d < delay) {
b = 0x00;
d++; d++;
} }
else if(i >= respLen) { else {
b = 0x00; if( i < respLen){
u++; b = resp[i];
} else { //Hack
b = resp[i]; //b = 0xAC;
u++; }
if(u > 1) { i++; u = 0; } i++;
} }
AT91C_BASE_SSC->SSC_THR = b; AT91C_BASE_SSC->SSC_THR = b;
}
if(u > 4) break; if (i > respLen +4) break;
}
if(BUTTON_PRESS()) {
break;
}
} }
return 0; return 0;
@ -1236,7 +1242,6 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, int delay)
static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait)
{ {
int c; int c;
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
AT91C_BASE_SSC->SSC_THR = 0x00; AT91C_BASE_SSC->SSC_THR = 0x00;
FpgaSetupSsc(); FpgaSetupSsc();
@ -1312,12 +1317,12 @@ void CodeIClassCommand(const uint8_t * cmd, int len)
b = cmd[i]; b = cmd[i];
for(j = 0; j < 4; j++) { for(j = 0; j < 4; j++) {
for(k = 0; k < 4; k++) { for(k = 0; k < 4; k++) {
if(k == (b & 3)) { if(k == (b & 3)) {
ToSend[++ToSendMax] = 0x0f; ToSend[++ToSendMax] = 0x0f;
} }
else { else {
ToSend[++ToSendMax] = 0x00; ToSend[++ToSendMax] = 0x00;
} }
} }
b >>= 2; b >>= 2;
} }