github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 06:13:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor changes. Changed minor errors to warnings in compiler.

Browse source
This commit is contained in:
Dom 2018-04-05 09:22:54 +01:00
commit 675705ffcd
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View file

Binary file not shown.

28
armsrc/iso14443a.c
View file

@ -1297,7 +1297,7 @@ static void TransmitFor14443a(const uint8_t *cmd, uint16_t len, uint32_t *timing
// clear TXRDY // clear TXRDY
AT91C_BASE_SSC->SSC_THR = SEC_Y; AT91C_BASE_SSC->SSC_THR = SEC_Y;
Dbprintf("Sending bytes to the PICC."); //Dbprintf("Sending bytes to the PICC.");
uint16_t c = 0; uint16_t c = 0;
for(;;) { for(;;) {
@ -1589,7 +1589,7 @@ int EmSendPrecompiledCmd(tag_response_info_t *response_info) {
static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset) static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receivedResponsePar, uint16_t offset)
{ {
uint32_t c; uint32_t c;
uint32_t start_ts = GetCountSspClk(); //uint32_t start_ts = GetCountSspClk();
uint32_t end_ts = 0; uint32_t end_ts = 0;
manchester_recv_started = 0; manchester_recv_started = 0;
recorded = 0; recorded = 0;
@ -1618,21 +1618,21 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) { if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; //read in 4 bytes of data from the RHR b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; //read in 4 bytes of data from the RHR
if(manchester_recv_started){ // if(manchester_recv_started){
end_ts = GetCountSspClk(); // end_ts = GetCountSspClk();
manchester_recv_started = 0; // manchester_recv_started = 0;
recorded = 1; // recorded = 1;
} // }
//Perform the manchester decoding on the 4 bytes just received. //Perform the manchester decoding on the 4 bytes just received.
if(ManchesterDecoding(b, offset, 0)) { if(ManchesterDecoding(b, offset, 0)) {
NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD); NextTransferTime = MAX(NextTransferTime, Demod.endTime - (DELAY_AIR2ARM_AS_READER + DELAY_ARM2AIR_AS_READER)/16 + FRAME_DELAY_TIME_PICC_TO_PCD);
uint32_t cycle_count = end_ts - start_ts; //uint32_t cycle_count = end_ts - start_ts;
Dbprintf("Finished decoding (Manchester). Value of c=%d. Cycle count (for one bit) = %d", c, cycle_count); //Dbprintf("Finished decoding (Manchester). Value of c=%d. Cycle count (for one bit) = %d", c, cycle_count);
return true; return true;
} else if (c++ > iso14a_timeout && Demod.state == DEMOD_UNSYNCD) { } else if (c++ > iso14a_timeout && Demod.state == DEMOD_UNSYNCD) {
//we reach here only if we time out (i.e. receiving the data from the PICC takes too long) //we reach here only if we time out (i.e. receiving the data from the PICC takes too long)
Dbprintf("Timed out while waiting for PICC response (c = %d)!", c); //Dbprintf("Timed out while waiting for PICC response (c = %d)!", c);
return false; return false;
} }
} }
@ -2123,11 +2123,11 @@ void ReaderIso14443a(UsbCommand *c)
ReaderTransmit(cmd,len, NULL); // 8 bits, odd parity ReaderTransmit(cmd,len, NULL); // 8 bits, odd parity
} }
} }
start_ts = GetCountSspClk(); //started just after we send all our bytes to the PICC //start_ts = GetCountSspClk(); //started just after we send all our bytes to the PICC
arg0 = ReaderReceive(buf, par); arg0 = ReaderReceive(buf, par);
end_ts = GetCountSspClk(); //ended just after we have received all the response bytes from the PICC. //end_ts = GetCountSspClk(); //ended just after we have received all the response bytes from the PICC.
uint32_t cycle_count = end_ts - start_ts; //uint32_t cycle_count = end_ts - start_ts;
Dbprintf("Cycle count (all bytes) = %d", cycle_count); //Dbprintf("Cycle count (all bytes) = %d", cycle_count);
LED_B_ON(); LED_B_ON();
cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf)); cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));

2
common/Makefile.common
View file

@ -67,7 +67,7 @@ VPATH = . ../common ../common/crapto1 ../common/polarssl ../fpga ../zlib
INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES) INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
CFLAGS = -c $(INCLUDE) -Wall -Werror -pedantic -std=c99 -Os $(APP_CFLAGS) CFLAGS = -c $(INCLUDE) -Wall -pedantic -std=c99 -Os $(APP_CFLAGS)
LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
LIBS = -lgcc LIBS = -lgcc