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

iclass sniff, still too slow

Browse source
This commit is contained in:
iceman1001 2020-08-08 11:41:26 +02:00
commit 93fc114dd3
1 changed files with 36 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

79
armsrc/iso15693.c
View file

@ -779,7 +779,9 @@ static void DecodeReaderReset(DecodeReader_t* reader) {
reader->state = STATE_READER_UNSYNCD; reader->state = STATE_READER_UNSYNCD;
} }
static RAMFUNC int Handle15693SampleFromReader(bool bit, DecodeReader_t *reader) { //int RAMFUNC
static inline __attribute__((always_inline))
int Handle15693SampleFromReader(bool bit, DecodeReader_t *reader) {
switch (reader->state) { switch (reader->state) {
case STATE_READER_UNSYNCD: case STATE_READER_UNSYNCD:
// wait for unmodulated carrier // wait for unmodulated carrier
@ -1205,27 +1207,22 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
DecodeTag_t dtag = {0}; DecodeTag_t dtag = {0};
uint8_t response[ISO15693_MAX_RESPONSE_LENGTH] = {0}; uint8_t response[ISO15693_MAX_RESPONSE_LENGTH] = {0};
DecodeTagInit(&dtag, response, sizeof(response)); DecodeTagInit(&dtag, response, sizeof(response));
// DecodeTag_t *dtag = (DecodeTag_t *)BigBuf_malloc(sizeof(DecodeTag_t));
// uint8_t *response = BigBuf_malloc(ISO15693_MAX_RESPONSE_LENGTH);
// DecodeTagInit(dtag, response, ISO15693_MAX_RESPONSE_LENGTH);
DecodeReader_t dreader = {0}; DecodeReader_t dreader = {0};
uint8_t cmd[ISO15693_MAX_COMMAND_LENGTH] = {0}; uint8_t cmd[ISO15693_MAX_COMMAND_LENGTH] = {0};
DecodeReaderInit(&dreader, cmd, sizeof(cmd), jam_search_len, jam_search_string); DecodeReaderInit(&dreader, cmd, sizeof(cmd), jam_search_len, jam_search_string);
// DecodeReader_t *dreader = (DecodeReader_t *)BigBuf_malloc(sizeof(DecodeReader_t));
// uint8_t *cmd = BigBuf_malloc(ISO15693_MAX_COMMAND_LENGTH);
// DecodeReaderInit(dreader, cmd, ISO15693_MAX_COMMAND_LENGTH, jam_search_len, jam_search_string);
// Print some debug information about the buffer sizes // Print some debug information about the buffer sizes
if (DBGLEVEL >= DBG_EXTENDED) { if (DBGLEVEL >= DBG_EXTENDED) {
Dbprintf("Sniffing buffers initialized:"); DbpString(_CYAN_("Sniff buffers initialized"));
Dbprintf(" Trace: %i bytes", BigBuf_max_traceLen()); DbpString("=====================================");
Dbprintf(" Reader -> tag: %i bytes", ISO15693_MAX_COMMAND_LENGTH); Dbprintf(" Trace..........%i bytes", BigBuf_max_traceLen());
Dbprintf(" Tag -> Reader: %i bytes", ISO15693_MAX_RESPONSE_LENGTH); Dbprintf(" Reader -> tag..%i bytes", ISO15693_MAX_COMMAND_LENGTH);
Dbprintf(" DMA: %i bytes", DMA_BUFFER_SIZE * sizeof(uint16_t)); Dbprintf(" Tag -> Reader..%i bytes", ISO15693_MAX_RESPONSE_LENGTH);
Dbprintf(" DMA............%i bytes", DMA_BUFFER_SIZE * sizeof(uint16_t));
Dbprintf(" Decoder Reader : %u bytes", (uint32_t)&dreader ); Dbprintf(" Decoder Reader.%u bytes", (uint32_t)&dreader );
Dbprintf(" Decode Tag : %u bytes", (uint32_t)&dtag); Dbprintf(" Decode Tag.....%u bytes", (uint32_t)&dtag);
} }
// The DMA buffer, used to stream samples from the FPGA // The DMA buffer, used to stream samples from the FPGA
@ -1245,8 +1242,6 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER); FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
StartCountSspClk(); StartCountSspClk();
// The DMA buffer, used to stream samples from the FPGA
//dmabuf16_t *dma = get_dma16();
uint16_t *upTo = dma->buf; uint16_t *upTo = dma->buf;
// Setup and start DMA. // Setup and start DMA.
@ -1261,11 +1256,21 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
bool expect_tag_answer = false; bool expect_tag_answer = false;
int dma_start_time = 0; int dma_start_time = 0;
uint16_t max_behind_by = 0;
// int max_data_len = 0, data_len; // int max_data_len = 0, data_len;
// And now we loop, receiving samples. // And now we loop, receiving samples.
for(;;) { for(;;) {
uint16_t behind_by = ((uint16_t*)AT91C_BASE_PDC_SSC->PDC_RPR - upTo) & (DMA_BUFFER_SIZE - 1);
if (behind_by > max_behind_by) {
max_behind_by = behind_by;
}
if (behind_by == 0) continue;
samples++; samples++;
if (samples == 1) { if (samples == 1) {
// DMA has transferred the very first data // DMA has transferred the very first data
@ -1309,15 +1314,11 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
} }
*/ */
uint16_t behindBy = ((uint16_t*)AT91C_BASE_PDC_SSC->PDC_RPR - upTo) & (DMA_BUFFER_SIZE - 1);
if (behindBy == 0) continue;
Dbprintf("behindBy %d", behindBy);
if (upTo >= dma->buf + DMA_BUFFER_SIZE) { // we have read all of the DMA buffer content. if (upTo >= dma->buf + DMA_BUFFER_SIZE) { // we have read all of the DMA buffer content.
upTo = dma->buf; // start reading the circular buffer from the beginning upTo = dma->buf; // start reading the circular buffer from the beginning
if (behindBy > (9 * DMA_BUFFER_SIZE / 10)) { if (behind_by > (9 * DMA_BUFFER_SIZE / 10)) {
Dbprintf("About to blow circular buffer - aborted! behindBy=%d, samples=%d", behindBy, samples); Dbprintf("About to blow circular buffer - aborted! behind_by=%d, samples=%d", behind_by, samples);
break; break;
} }
@ -1326,21 +1327,12 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE; // DMA Next Counter registers AT91C_BASE_PDC_SSC->PDC_RNCR = DMA_BUFFER_SIZE; // DMA Next Counter registers
WDT_HIT(); WDT_HIT();
if (BUTTON_PRESS()) { if (BUTTON_PRESS()) {
DbpString("Sniff stopped."); DbpString("Sniff stopped");
break; break;
} }
} }
} }
/*
WDT_HIT();
if (BUTTON_PRESS()) {
DbpString("Sniff stopped.");
break;
}
*/
// no need to try decoding reader data if the tag is sending // no need to try decoding reader data if the tag is sending
if (tag_is_active == false) { if (tag_is_active == false) {
@ -1411,20 +1403,21 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string) {
} }
} }
FpgaDisableTracing();
FpgaDisableTracing();
switch_off(); switch_off();
DbpString("Sniff statistics:"); DbpString(_CYAN_("Sniff statistics"));
Dbprintf(" ExpectTagAnswer: %d, TagIsActive: %d, ReaderIsActive: %d", expect_tag_answer, tag_is_active, reader_is_active); DbpString("=====================================");
Dbprintf(" DecodeTag State: %d", dtag.state); Dbprintf(" ExpectTagAnswer........%d, TagIsActive: %d, ReaderIsActive: %d", expect_tag_answer, tag_is_active, reader_is_active);
Dbprintf(" DecodeTag byteCnt: %d", dtag.len); Dbprintf(" DecodeTag State........%d", dtag.state);
Dbprintf(" DecodeTag posCount: %d", dtag.posCount); Dbprintf(" DecodeTag byteCnt......%d", dtag.len);
Dbprintf(" DecodeReader State: %d", dreader.state); Dbprintf(" DecodeTag posCount.....%d", dtag.posCount);
Dbprintf(" DecodeReader byteCnt: %d", dreader.byteCount); Dbprintf(" DecodeReader State.....%d", dreader.state);
Dbprintf(" DecodeReader posCount: %d", dreader.posCount); Dbprintf(" DecodeReader byteCnt...%d", dreader.byteCount);
Dbprintf(" Trace length: %d", BigBuf_get_traceLen()); Dbprintf(" DecodeReader posCount..%d", dreader.posCount);
// Dbprintf(" Max behindBy: %d", max_behindBy); Dbprintf(" Trace length...........%d", BigBuf_get_traceLen());
} }
// Initialize Proxmark3 as ISO15693 reader // Initialize Proxmark3 as ISO15693 reader