From 08d9d9daf905d06a08444324e74c33ab883b4a86 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 29 Jul 2018 18:20:56 +0200 Subject: [PATCH] cleaning --- armsrc/fpgaloader.c | 2 +- armsrc/iclass.c | 11 +++++++---- armsrc/iso15693.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c index 611308563..058250cc7 100644 --- a/armsrc/fpgaloader.c +++ b/armsrc/fpgaloader.c @@ -145,7 +145,7 @@ void FpgaSetupSscExt(uint8_t clearPCER) { // clock comes from TK pin, no clock output, outputs change on falling // edge of TK, sample on rising edge of TK, start on positive-going edge of sync - AT91C_BASE_SSC->SSC_TCMR = SSC_CLOCK_MODE_SELECT(2) | SSC_CLOCK_MODE_START(5); + AT91C_BASE_SSC->SSC_TCMR = SSC_CLOCK_MODE_SELECT(2) | SSC_CLOCK_MODE_START(5); // tx framing is the same as the rx framing AT91C_BASE_SSC->SSC_TFMR = AT91C_BASE_SSC->SSC_RFMR; diff --git a/armsrc/iclass.c b/armsrc/iclass.c index 1ee283d59..bea998415 100644 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@ -1127,11 +1127,14 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain LEDsoff(); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); + // this will clear out bigbuf memory, the eload command must select this before! FpgaDownloadAndGo(FPGA_BITSTREAM_HF); - FpgaSetupSsc(); + SetAdcMuxFor(GPIO_MUXSEL_HIPKD); - + + FpgaSetupSsc(); + // Enable and clear the trace clear_trace(); set_tracing(true); @@ -1799,9 +1802,9 @@ void setupIclassReader() { FpgaDownloadAndGo(FPGA_BITSTREAM_HF); - FpgaSetupSsc(); - SetAdcMuxFor(GPIO_MUXSEL_HIPKD); + + FpgaSetupSsc(); // Reset trace buffer clear_trace(); diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c index c96633cc8..450341703 100644 --- a/armsrc/iso15693.c +++ b/armsrc/iso15693.c @@ -950,7 +950,7 @@ void ReaderIso15693(uint32_t parameter) { // all demodulation performed in arm rather than host. - greg void SimTagIso15693(uint32_t parameter, uint8_t *uid) { - FpgaDownloadAndGo(FPGA_BITSTREAM_HF); + FpgaDownloadAndGo(FPGA_BITSTREAM_HF); SetAdcMuxFor(GPIO_MUXSEL_HIPKD); FpgaSetupSsc(); // Start from off (no field generated)