github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 04:49:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed another redundant function to compose reader short frame

Browse source
This commit is contained in:
roel@libnfc.org 2013-04-03 11:18:01 +00:00
commit dfc3c5053c
3 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
armsrc/iso14443a.c
View file

@ -1547,44 +1547,33 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, int maxLen, int
} }
} }
void ReaderTransmitShort(const uint8_t* bt) void ReaderTransmitBitsPar(uint8_t* frame, int bits, uint32_t par)
{ {
int wait = 0; int wait = 0;
int samples = 0; int samples = 0;
// ShortFrameFromReader(*bt);
CodeIso14443aBitsAsReaderPar(bt,7,0);
// Select the card
TransmitFor14443a(ToSend, ToSendMax, &samples, &wait);
// Store reader command in buffer
if (tracing) LogTrace(bt,1,0,GetParity(bt,1),TRUE);
}
void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par)
{
int wait = 0;
int samples = 0;
// This is tied to other size changes // This is tied to other size changes
// uint8_t* frame_addr = ((uint8_t*)BigBuf) + 2024; // uint8_t* frame_addr = ((uint8_t*)BigBuf) + 2024;
CodeIso14443aAsReaderPar(frame,len,par); CodeIso14443aBitsAsReaderPar(frame,bits,par);
// Select the card // Select the card
TransmitFor14443a(ToSend, ToSendMax, &samples, &wait); TransmitFor14443a(ToSend, ToSendMax, &samples, &wait);
if(trigger) if(trigger)
LED_A_ON(); LED_A_ON();
// Store reader command in buffer // Store reader command in buffer
if (tracing) LogTrace(frame,len,0,par,TRUE); if (tracing) LogTrace(frame,nbytes(bits),0,par,TRUE);
} }
void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par)
{
ReaderTransmitBitsPar(frame,len*8,par);
}
void ReaderTransmit(uint8_t* frame, int len) void ReaderTransmit(uint8_t* frame, int len)
{ {
// Generate parity and redirect // Generate parity and redirect
ReaderTransmitPar(frame,len,GetParity(frame,len)); ReaderTransmitBitsPar(frame,len*8,GetParity(frame,len));
} }
int ReaderReceive(uint8_t* receivedAnswer) int ReaderReceive(uint8_t* receivedAnswer)
@ -1623,7 +1612,7 @@ int iso14443a_select_card(byte_t* uid_ptr, iso14a_card_select_t* p_hi14a_card, u
int len; int len;
// Broadcast for a card, WUPA (0x52) will force response from all cards in the field // Broadcast for a card, WUPA (0x52) will force response from all cards in the field
ReaderTransmitShort(wupa); ReaderTransmitBitsPar(wupa,7,0);
// Receive the ATQA // Receive the ATQA
if(!ReaderReceive(resp)) return 0; if(!ReaderReceive(resp)) return 0;
// Dbprintf("atqa: %02x %02x",resp[0],resp[1]); // Dbprintf("atqa: %02x %02x",resp[0],resp[1]);

2
armsrc/iso14443a.h
View file

@ -82,8 +82,8 @@ extern byte_t oddparity (const byte_t bt);
extern uint32_t GetParity(const uint8_t * pbtCmd, int iLen); extern uint32_t GetParity(const uint8_t * pbtCmd, int iLen);
extern void AppendCrc14443a(uint8_t* data, int len); extern void AppendCrc14443a(uint8_t* data, int len);
extern void ReaderTransmitShort(const uint8_t* bt);
extern void ReaderTransmit(uint8_t* frame, int len); extern void ReaderTransmit(uint8_t* frame, int len);
extern void ReaderTransmitBitsPar(uint8_t* frame, int bits, uint32_t par);
extern void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par); extern void ReaderTransmitPar(uint8_t* frame, int len, uint32_t par);
extern int ReaderReceive(uint8_t* receivedAnswer); extern int ReaderReceive(uint8_t* receivedAnswer);
extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr); extern int ReaderReceivePar(uint8_t* receivedAnswer, uint32_t * parptr);

6
armsrc/mifarecmd.c
View file

@ -801,7 +801,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// reset chip // reset chip
if (needWipe){ if (needWipe){
ReaderTransmitShort(wupC1); ReaderTransmitBitsPar(wupC1,7,0);
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) { if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");
break; break;
@ -821,7 +821,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// write block // write block
if (workFlags & 0x02) { if (workFlags & 0x02) {
ReaderTransmitShort(wupC1); ReaderTransmitBitsPar(wupC1,7,0);
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) { if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");
break; break;
@ -919,7 +919,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
while (true) { while (true) {
if (workFlags & 0x02) { if (workFlags & 0x02) {
ReaderTransmitShort(wupC1); ReaderTransmitBitsPar(wupC1,7,0);
if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) { if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error"); if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");
break; break;