github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

text

Browse source
This commit is contained in:
iceman1001 2022-03-31 23:33:20 +02:00
commit 247790b833
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
armsrc/iso14443a.c
View file

@ -166,7 +166,7 @@ void printHf14aConfig(void) {
Dbprintf(" [r] RATS override....... %s%s%s", Dbprintf(" [r] RATS override....... %s%s%s",
(hf14aconfig.forcerats == 0) ? _GREEN_("std") " ( follow standard )" : "", (hf14aconfig.forcerats == 0) ? _GREEN_("std") " ( follow standard )" : "",
(hf14aconfig.forcerats == 1) ? _RED_("force") " ( always do RATS )" : "", (hf14aconfig.forcerats == 1) ? _RED_("force") " ( always do RATS )" : "",
(hf14aconfig.forcerats == 2) ? _RED_("skip") " () always skip RATS )" : "" (hf14aconfig.forcerats == 2) ? _RED_("skip") " ( always skip RATS )" : ""
); );
} }
@ -678,7 +678,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
uint8_t *data = dma->buf; uint8_t *data = dma->buf;
// Setup and start DMA. // Setup and start DMA.
if (!FpgaSetupSscDma((uint8_t *) dma->buf, DMA_BUFFER_SIZE)) { if (FpgaSetupSscDma((uint8_t *) dma->buf, DMA_BUFFER_SIZE) == false) {
if (g_dbglevel > 1) Dbprintf("FpgaSetupSscDma failed. Exiting"); if (g_dbglevel > 1) Dbprintf("FpgaSetupSscDma failed. Exiting");
return; return;
} }
@ -730,7 +730,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
// Need two samples to feed Miller and Manchester-Decoder // Need two samples to feed Miller and Manchester-Decoder
if (rx_samples & 0x01) { if (rx_samples & 0x01) {
if (!TagIsActive) { // no need to try decoding reader data if the tag is sending if (TagIsActive == false) { // no need to try decoding reader data if the tag is sending
uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4); uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
if (MillerDecoding(readerdata, (rx_samples - 1) * 4)) { if (MillerDecoding(readerdata, (rx_samples - 1) * 4)) {
LED_C_ON(); LED_C_ON();
@ -757,7 +757,7 @@ void RAMFUNC SniffIso14443a(uint8_t param) {
} }
// no need to try decoding tag data if the reader is sending - and we cannot afford the time // no need to try decoding tag data if the reader is sending - and we cannot afford the time
if (!ReaderIsActive) { if (ReaderIsActive == false) {
uint8_t tagdata = (previous_data << 4) | (*data & 0x0F); uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
if (ManchesterDecoding(tagdata, 0, (rx_samples - 1) * 4)) { if (ManchesterDecoding(tagdata, 0, (rx_samples - 1) * 4)) {
LED_B_ON(); LED_B_ON();