fixing iso14443b (issue #103):

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c226c726398dd822b85f287aadb8d47be421e7e3..9bfa5ea7a872f61f34f286eadd7a2dbde799ebab 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -263,7 +263,7 @@ void SimulateTagHfListen(void)
        // We're using this mode just so that I can test it out; the simulated
        // tag mode would work just as well and be simpler.
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_SNOOP);
 
        // We need to listen to the high-frequency, peak-detected path.
        SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
@@ -783,19 +783,19 @@ void UsbPacketReceived(uint8_t *packet, int len)
 
 #ifdef WITH_ISO14443b
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
-                       AcquireRawAdcSamplesIso14443(c->arg[0]);
+                       AcquireRawAdcSamplesIso14443b(c->arg[0]);
                        break;
                case CMD_READ_SRI512_TAG:
-                       ReadSTMemoryIso14443(0x0F);
+                       ReadSTMemoryIso14443b(0x0F);
                        break;
                case CMD_READ_SRIX4K_TAG:
-                       ReadSTMemoryIso14443(0x7F);
+                       ReadSTMemoryIso14443b(0x7F);
                        break;
                case CMD_SNOOP_ISO_14443:
-                       SnoopIso14443();
+                       SnoopIso14443b();
                        break;
                case CMD_SIMULATE_TAG_ISO_14443:
-                       SimulateIso14443Tag();
+                       SimulateIso14443bTag();
                        break;
                case CMD_ISO_14443B_COMMAND:
                        SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);