compile clean and flasher targets

diff --git a/armsrc/Makefile.linux b/armsrc/Makefile.linux
index baf4adb18b6af25b9275792e1465c1fda306ff9e..897a6b121cfed1c07a5adc0442f2440dbcaa06ca 100644 (file)
--- a/armsrc/Makefile.linux
+++ b/armsrc/Makefile.linux
@@ -74,13 +74,15 @@ $(OBJFAST): $(OBJDIR)/%.o : %.c
 $(OBJCOMMON): $(OBJDIR)/%.o : ../common/%.c
        $(CC) $(CFLAGS) $< -o $@
 
 $(OBJCOMMON): $(OBJDIR)/%.o : ../common/%.c
        $(CC) $(CFLAGS) $< -o $@
 

-# Those do not work on the current firmware !
+flash-both: flash flash-fpga
+

 flash-fpga: fpgaimage.s19
        ../linux/flasher fpga fpgaimage.s19
 
 flash: osimage.s19
        ../linux/flasher os osimage.s19
 
 flash-fpga: fpgaimage.s19
        ../linux/flasher fpga fpgaimage.s19
 
 flash: osimage.s19
        ../linux/flasher os osimage.s19
 

+# Those do not work on the current firmware !

 jtag-flash-full: fullimage.s19
        ../../OpenOCD/openocd -c "halt; flash write_image fullimage.s19 0x00100000; halt; reset; resume; poll; exit"
 
 jtag-flash-full: fullimage.s19
        ../../OpenOCD/openocd -c "halt; flash write_image fullimage.s19 0x00100000; halt; reset; resume; poll; exit"
 

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index c8462649697f54a827adeb43d40ce35fc47bdbfe..77bbbbc4daec6a54b0c46ed95b1276e5db998223 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -144,7 +144,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
        BOOL at134khz;
 
        // see if 'h' was specified
        BOOL at134khz;
 
        // see if 'h' was specified

-       if(command[strlen(command) - 1] == 'h')
+       if(command[strlen((char *) command) - 1] == 'h')

                at134khz= TRUE;
        else
                at134khz= FALSE;
                at134khz= TRUE;
        else
                at134khz= FALSE;


@@ -241,7 +241,7 @@ static int AvgAdc(int ch)
 void SweepLFrange()
 {
        BYTE *dest = (BYTE *)BigBuf;
 void SweepLFrange()
 {
        BYTE *dest = (BYTE *)BigBuf;

-       BYTE dummy[12];
+       char dummy[12];

        int i, peak= 0, ptr= 0;
        double freq;
 
        int i, peak= 0, ptr= 0;
        double freq;
 


@@ -939,8 +939,8 @@ void SpinDelay(int ms)
 // listen for external reader 
 void ListenReaderField(int limit)
 {
 // listen for external reader 
 void ListenReaderField(int limit)
 {

-       int lf_av, lf_av_new, lf_baseline= -1, lf_count= 0;
-       int hf_av, hf_av_new,  hf_baseline= -1, hf_count= 0;
+       int lf_av, lf_av_new, lf_baseline= 0, lf_count= 0;
+       int hf_av, hf_av_new,  hf_baseline= 0, hf_count= 0;

 
 #define LF_ONLY                1
 #define HF_ONLY                2
 
 #define LF_ONLY                1
 #define HF_ONLY                2


@@ -952,7 +952,7 @@ void ListenReaderField(int limit)
 
        lf_av= ReadAdc(ADC_CHAN_LF);
 
 
        lf_av= ReadAdc(ADC_CHAN_LF);
 

-       if(limit != HF_ONLY && lf_baseline ==  -1) 
+       if(limit != HF_ONLY) 

                {
                DbpString("LF 125/134 Baseline:");
                DbpIntegers(lf_av,0,0);
                {
                DbpString("LF 125/134 Baseline:");
                DbpIntegers(lf_av,0,0);


@@ -962,7 +962,7 @@ void ListenReaderField(int limit)
        hf_av= ReadAdc(ADC_CHAN_HF);
 
 
        hf_av= ReadAdc(ADC_CHAN_HF);
 
 

-       if (limit != LF_ONLY && hf_baseline == -1) 
+       if (limit != LF_ONLY) 

                {
                DbpString("HF 13.56 Baseline:");
                DbpIntegers(hf_av,0,0);
                {
                DbpString("HF 13.56 Baseline:");
                DbpIntegers(hf_av,0,0);

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index b5d3e3d7d69f2abc0fd652d92c8610594ce6c07c..349ede695886c17c79dad93cf893e9854efb3be0 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -701,7 +701,7 @@ static void CmdLoCommandRead(char *str)
        \r
        UsbCommand c;\r
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        \r
        UsbCommand c;\r
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r

-       sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, &c.d.asBytes,&dummy+1);\r
+       sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, (char *) &c.d.asBytes,(char *) &dummy+1);\r

        // in case they specified 'h'\r
        strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);\r
        SendCommand(&c, FALSE);\r
        // in case they specified 'h'\r
        strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);\r
        SendCommand(&c, FALSE);\r


@@ -2580,71 +2580,71 @@ static struct {
        int             offline;  // 1 if the command can be used when in offline mode\r
        char            *docString;\r
 } CommandTable[] = {\r
        int             offline;  // 1 if the command can be used when in offline mode\r
        char            *docString;\r
 } CommandTable[] = {\r

-       "askdemod",                     Cmdaskdemod,1,          "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags",\r
-       "autocorr",                     CmdAutoCorr,1,          "<window length> -- Autocorrelation over window",\r
-       "bitsamples",           CmdBitsamples,0,        "    Get raw samples as bitstring",\r
-       "bitstream",            Cmdbitstream,1,         "[clock rate] -- Convert waveform into a bitstream",\r
-       "buffclear",            CmdBuffClear,0,         "    Clear sample buffer and graph window",\r
-       "dec",                          CmdDec,1,               "    Decimate samples",\r
-       "detectclock",          Cmddetectclockrate,1, "    Detect clock rate",\r
-       "detectreader",         CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)",\r
-       "em410xsim",            CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag",\r
-       "em410xread",           CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag",\r
-       "em410xwatch",          CmdEM410xwatch,0,       "    Watches for EM410x tags",\r
-       "em4x50read",           CmdEM4x50read,1,        "    Extract data from EM4x50 tag",\r
-       "exit",                         CmdQuit,1,                      "    Exit program",\r
-       "flexdemod",            CmdFlexdemod,1,         "    Demodulate samples for FlexPass",\r
-       "fpgaoff",                      CmdFPGAOff,0,           "    Set FPGA off",                                                     // ## FPGA Control\r
-       "hexsamples",           CmdHexsamples,0,        "<blocks> -- Dump big buffer as hex bytes",\r
-       "hi14alist",            CmdHi14alist,0,         "    List ISO 14443a history",                          // ## New list command\r
-       "hi14areader",          CmdHi14areader,0,       "    Act like an ISO14443 Type A reader",       // ## New reader command\r
-       "hi14asim",                     CmdHi14asim,0,          "<UID> -- Fake ISO 14443a tag",                                 // ## Simulate 14443a tag\r
-       "hi14asnoop",           CmdHi14asnoop,0,        "    Eavesdrop ISO 14443 Type A",                       // ## New snoop command\r
-       "hi14bdemod",           CmdHi14bdemod,1,        "    Demodulate ISO14443 Type B from tag",\r
-       "hi14list",                     CmdHi14list,0,          "    List ISO 14443 history",\r
-       "hi14read",                     CmdHi14read,0,          "    Read HF tag (ISO 14443)",\r
-       "hi14sim",                      CmdHi14sim,0,           "    Fake ISO 14443 tag",\r
-       "hi14snoop",            CmdHi14snoop,0,         "    Eavesdrop ISO 14443",\r
-       "hi15demod",            CmdHi15demod,1,         "    Demodulate ISO15693 from tag",\r
-       "hi15read",                     CmdHi15read,0,          "    Read HF tag (ISO 15693)",\r
-       "hi15reader",           CmdHi15reader,0,        "    Act like an ISO15693 reader", // new command greg\r
-       "hi15sim",                      CmdHi15tag,0,           "    Fake an ISO15693 tag", // new command greg\r
-       "hiddemod",                     CmdHiddemod,1,          "    Demodulate HID Prox Card II (not optimal)",\r
-       "hide",                         CmdHide,1,              "    Hide graph window",\r
-       "hidfskdemod",          CmdHIDdemodFSK,0,       "    Realtime HID FSK demodulator",\r
-       "hidsimtag",            CmdHIDsimTAG,0,         "<ID> -- HID tag simulator",\r
-       "higet",                        CmdHi14read_sim,0,      "<samples> -- Get samples HF, 'analog'",\r
-       "hisamples",            CmdHisamples,0,         "    Get raw samples for HF tag",\r
-       "hisampless",           CmdHisampless,0,        "<samples> -- Get signed raw samples, HF tag",\r
-       "hisamplest",           CmdHi14readt,0,         "    Get samples HF, for testing",\r
-       "hisimlisten",          CmdHisimlisten,0,       "    Get HF samples as fake tag",\r
-       "hpf",                          CmdHpf,1,               "    Remove DC offset from trace",\r
-       "indalademod",          CmdIndalademod,0,         "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)",\r
-       "lcd",                          CmdLcd,0,                       "<HEX command> <count> -- Send command/data to LCD",\r
-       "lcdreset",                     CmdLcdReset,0,          "    Hardware reset LCD",\r
-       "load",                         CmdLoad,1,              "<filename> -- Load trace (to graph window",\r
-       "locomread",                    CmdLoCommandRead,0,             "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)",\r
-       "loread",                       CmdLoread,0,            "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)",\r
-       "losamples",            CmdLosamples,0,         "[128 - 16000] -- Get raw samples for LF tag",\r
-       "losim",                        CmdLosim,0,             "    Simulate LF tag",\r
-       "ltrim",                        CmdLtrim,1,             "<samples> -- Trim samples from left of trace",\r
-       "mandemod",                     Cmdmanchesterdemod,1,   "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)",\r
-       "manmod",                       Cmdmanchestermod,1,     "[clock rate] -- Manchester modulate a binary stream",\r
-       "norm",                         CmdNorm,1,              "    Normalize max/min to +/-500",\r
-       "plot",                         CmdPlot,1,              "    Show graph window",\r
-       "quit",                         CmdQuit,1,                      "    Quit program",\r
-       "reset",                        CmdReset,0,                     "    Reset the Proxmark3",\r
-       "save",                         CmdSave,1,              "<filename> -- Save trace (from graph window)",\r
-       "scale",                        CmdScale,1,             "<int> -- Set cursor display scale",\r
-       "setlfdivisor",         CmdSetDivisor,0,        "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)",\r
-       "sri512read",           CmdSri512read,0,        "<int> -- Read contents of a SRI512 tag",\r
-       "sweeplf",                      CmdSweepLF,0,           "    Sweep through LF freq range and store results in buffer",\r
-       "tibits",                       CmdTibits,0,            "    Get raw bits for TI-type LF tag",\r
-       "tidemod",                      CmdTidemod,0,           "    Demodulate raw bits for TI-type LF tag",\r
-       "tiread",                       CmdTiread,0,            "    Read a TI-type 134 kHz tag",\r
-       "tune",                         CmdTune,0,              "    Measure antenna tuning",\r
-       "vchdemod",                     CmdVchdemod,0,          "['clone'] -- Demodulate samples for VeriChip",\r
-       "zerocrossings",        CmdZerocrossings,1,     "    Count time between zero-crossings",\r
+       {"askdemod",                    Cmdaskdemod,1,          "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"},\r
+       {"autocorr",                    CmdAutoCorr,1,          "<window length> -- Autocorrelation over window"},\r
+       {"bitsamples",          CmdBitsamples,0,        "    Get raw samples as bitstring"},\r
+       {"bitstream",           Cmdbitstream,1,         "[clock rate] -- Convert waveform into a bitstream"},\r
+       {"buffclear",           CmdBuffClear,0,         "    Clear sample buffer and graph window"},\r
+       {"dec",                         CmdDec,1,               "    Decimate samples"},\r
+       {"detectclock",         Cmddetectclockrate,1, "    Detect clock rate"},\r
+       {"detectreader",                CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},\r
+       {"em410xsim",           CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag"},\r
+       {"em410xread",          CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag"},\r
+       {"em410xwatch",         CmdEM410xwatch,0,       "    Watches for EM410x tags"},\r
+       {"em4x50read",          CmdEM4x50read,1,        "    Extract data from EM4x50 tag"},\r
+       {"exit",                                CmdQuit,1,                      "    Exit program"},\r
+       {"flexdemod",           CmdFlexdemod,1,         "    Demodulate samples for FlexPass"},\r
+       {"fpgaoff",                     CmdFPGAOff,0,           "    Set FPGA off"},                                                    // ## FPGA Control\r
+       {"hexsamples",          CmdHexsamples,0,        "<blocks> -- Dump big buffer as hex bytes"},\r
+       {"hi14alist",           CmdHi14alist,0,         "    List ISO 14443a history"},                         // ## New list command\r
+       {"hi14areader",         CmdHi14areader,0,       "    Act like an ISO14443 Type A reader"},      // ## New reader command\r
+       {"hi14asim",                    CmdHi14asim,0,          "<UID> -- Fake ISO 14443a tag"},                                        // ## Simulate 14443a tag\r
+       {"hi14asnoop",          CmdHi14asnoop,0,        "    Eavesdrop ISO 14443 Type A"},                      // ## New snoop command\r
+       {"hi14bdemod",          CmdHi14bdemod,1,        "    Demodulate ISO14443 Type B from tag"},\r
+       {"hi14list",                    CmdHi14list,0,          "    List ISO 14443 history"},\r
+       {"hi14read",                    CmdHi14read,0,          "    Read HF tag (ISO 14443)"},\r
+       {"hi14sim",                     CmdHi14sim,0,           "    Fake ISO 14443 tag"},\r
+       {"hi14snoop",           CmdHi14snoop,0,         "    Eavesdrop ISO 14443"},\r
+       {"hi15demod",           CmdHi15demod,1,         "    Demodulate ISO15693 from tag"},\r
+       {"hi15read",                    CmdHi15read,0,          "    Read HF tag (ISO 15693)"},\r
+       {"hi15reader",          CmdHi15reader,0,        "    Act like an ISO15693 reader"}, // new command greg\r
+       {"hi15sim",                     CmdHi15tag,0,           "    Fake an ISO15693 tag"}, // new command greg\r
+       {"hiddemod",                    CmdHiddemod,1,          "    Demodulate HID Prox Card II (not optimal)"},\r
+       {"hide",                                CmdHide,1,              "    Hide graph window"},\r
+       {"hidfskdemod",         CmdHIDdemodFSK,0,       "    Realtime HID FSK demodulator"},\r
+       {"hidsimtag",           CmdHIDsimTAG,0,         "<ID> -- HID tag simulator"},\r
+       {"higet",                       CmdHi14read_sim,0,      "<samples> -- Get samples HF, 'analog'"},\r
+       {"hisamples",           CmdHisamples,0,         "    Get raw samples for HF tag"},\r
+       {"hisampless",          CmdHisampless,0,        "<samples> -- Get signed raw samples, HF tag"},\r
+       {"hisamplest",          CmdHi14readt,0,         "    Get samples HF, for testing"},\r
+       {"hisimlisten",         CmdHisimlisten,0,       "    Get HF samples as fake tag"},\r
+       {"hpf",                         CmdHpf,1,               "    Remove DC offset from trace"},\r
+       {"indalademod",         CmdIndalademod,0,         "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r
+       {"lcd",                         CmdLcd,0,                       "<HEX command> <count> -- Send command/data to LCD"},\r
+       {"lcdreset",                    CmdLcdReset,0,          "    Hardware reset LCD"},\r
+       {"load",                                CmdLoad,1,              "<filename> -- Load trace (to graph window"},\r
+       {"locomread",                   CmdLoCommandRead,0,             "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r
+       {"loread",                      CmdLoread,0,            "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},\r
+       {"losamples",           CmdLosamples,0,         "[128 - 16000] -- Get raw samples for LF tag"},\r
+       {"losim",                       CmdLosim,0,             "    Simulate LF tag"},\r
+       {"ltrim",                       CmdLtrim,1,             "<samples> -- Trim samples from left of trace"},\r
+       {"mandemod",                    Cmdmanchesterdemod,1,   "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},\r
+       {"manmod",                      Cmdmanchestermod,1,     "[clock rate] -- Manchester modulate a binary stream"},\r
+       {"norm",                                CmdNorm,1,              "    Normalize max/min to +/-500"},\r
+       {"plot",                                CmdPlot,1,              "    Show graph window"},\r
+       {"quit",                                CmdQuit,1,                      "    Quit program"},\r
+       {"reset",                       CmdReset,0,                     "    Reset the Proxmark3"},\r
+       {"save",                                CmdSave,1,              "<filename> -- Save trace (from graph window)"},\r
+       {"scale",                       CmdScale,1,             "<int> -- Set cursor display scale"},\r
+       {"setlfdivisor",                CmdSetDivisor,0,        "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r
+       {"sri512read",          CmdSri512read,0,        "<int> -- Read contents of a SRI512 tag"},\r
+       {"sweeplf",                     CmdSweepLF,0,           "    Sweep through LF freq range and store results in buffer"},\r
+       {"tibits",                      CmdTibits,0,            "    Get raw bits for TI-type LF tag"},\r
+       {"tidemod",                     CmdTidemod,0,           "    Demodulate raw bits for TI-type LF tag"},\r
+       {"tiread",                      CmdTiread,0,            "    Read a TI-type 134 kHz tag"},\r
+       {"tune",                                CmdTune,0,              "    Measure antenna tuning"},\r
+       {"vchdemod",                    CmdVchdemod,0,          "['clone'] -- Demodulate samples for VeriChip"},\r
+       {"zerocrossings",       CmdZerocrossings,1,     "    Count time between zero-crossings"},\r

 };\r
 \r
 \r
 };\r
 \r
 \r