client/elf.h: Add missing Elf32_Phdr struct to compile under Mac OS X. client/flash...

[proxmark3-svn] / armsrc / lfops.c

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 6c9a36f7e51f42019173256eef92c3001f1251a5..c94490892430c89703b7f95f1879d064520fbc17 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -13,13 +13,12 @@ int sprintf(char *dest, const char *fmt, ...);
 \r
 void AcquireRawAdcSamples125k(BOOL at134khz)\r
 {\r
-       if(at134khz) {\r
+       if (at134khz)\r
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-       } else {\r
+       else\r
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-       }\r
+\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
 \r
        // Connect the A/D to the peak-detected low-frequency path.\r
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);\r
@@ -31,37 +30,35 @@ void AcquireRawAdcSamples125k(BOOL at134khz)
        FpgaSetupSsc();\r
 \r
        // Now call the acquisition routine\r
-       DoAcquisition125k(at134khz);\r
+       DoAcquisition125k();\r
 }\r
 \r
 // split into two routines so we can avoid timing issues after sending commands //\r
-void DoAcquisition125k(BOOL at134khz)\r
+void DoAcquisition125k(void)\r
 {\r
        BYTE *dest = (BYTE *)BigBuf;\r
        int n = sizeof(BigBuf);\r
        int i;\r
-       char output_string[64];\r
        \r
-       memset(dest,0,n);\r
+       memset(dest, 0, n);\r
        i = 0;\r
        for(;;) {\r
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {\r
                        AT91C_BASE_SSC->SSC_THR = 0x43;\r
                        LED_D_ON();\r
                }\r
-               if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {\r
+               if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {\r
                        dest[i] = (BYTE)AT91C_BASE_SSC->SSC_RHR;\r
                        i++;\r
                        LED_D_OFF();\r
                        if (i >= n) break;\r
                }\r
        }\r
-       sprintf(output_string, "read samples, dest[0]=%x dest[1]=%x at134khz=%d",\r
-               dest[0], dest[1], at134khz);\r
-       DbpString(output_string);\r
+       Dbprintf("buffer samples: %02x %02x %02x %02x %02x %02x %02x %02x ...",\r
+                       dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]);\r
 }\r
 \r
-void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYTE *command)\r
+void ModThenAcquireRawAdcSamples125k(int delay_off, int period_0, int period_1, BYTE *command)\r
 {\r
        BOOL at134khz;\r
 \r
@@ -70,18 +67,17 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
        SpinDelay(2500);\r
        \r
        // see if 'h' was specified\r
-       if(command[strlen((char *) command) - 1] == 'h')\r
-               at134khz= TRUE;\r
+       if (command[strlen((char *) command) - 1] == 'h')\r
+               at134khz = TRUE;\r
        else\r
-               at134khz= FALSE;\r
+               at134khz = FALSE;\r
 \r
-       if(at134khz) {\r
+       if (at134khz)\r
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-       } else {\r
+       else\r
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-       }\r
+\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
 \r
        // Give it a bit of time for the resonant antenna to settle.\r
        SpinDelay(50);\r
@@ -92,38 +88,34 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
        FpgaSetupSsc();\r
 \r
        // now modulate the reader field\r
-       while(*command != '\0' && *command != ' ')\r
-               {\r
+       while(*command != '\0' && *command != ' ') {\r
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
                LED_D_OFF();\r
                SpinDelayUs(delay_off);\r
-               if(at134khz) {\r
+               if (at134khz)\r
                        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz\r
-                       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-               } else {\r
+               else\r
                        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz\r
-                       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-               }\r
+\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
                LED_D_ON();\r
-               if(*(command++) == '0') {\r
+               if(*(command++) == '0')\r
                        SpinDelayUs(period_0);\r
-               } else {\r
+               else\r
                        SpinDelayUs(period_1);\r
-               }\r
-               }\r
+       }\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LED_D_OFF();\r
        SpinDelayUs(delay_off);\r
-       if(at134khz) {\r
+       if (at134khz)\r
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-       } else {\r
+       else\r
                FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
-       }\r
+\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_READER);\r
 \r
        // now do the read\r
-       DoAcquisition125k(at134khz);\r
+       DoAcquisition125k();\r
 }\r
 \r
 /* blank r/w tag data stream\r
@@ -135,7 +127,7 @@ void ModThenAcquireRawAdcSamples125k(int delay_off,int period_0,int period_1,BYT
 \r
 [5555fe852c5555555555555555fe0000]\r
 */\r
-void ReadTItag()\r
+void ReadTItag(void)\r
 {\r
        // some hardcoded initial params\r
        // when we read a TI tag we sample the zerocross line at 2Mhz\r
@@ -257,13 +249,10 @@ void ReadTItag()
                crc = update_crc16(crc, (shift1>>16)&0xff);\r
                crc = update_crc16(crc, (shift1>>24)&0xff);\r
 \r
-               char output_string[64];\r
-               sprintf(output_string, "Info: Tag data_hi=%x, data_lo=%x, crc=%x",\r
+               Dbprintf("Info: Tag data: %x%08x, crc=%x",\r
                        (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);\r
-               DbpString(output_string);\r
                if (crc != (shift2&0xffff)) {\r
-                       sprintf(output_string, "Error: CRC mismatch, expected %x", (unsigned int)crc);\r
-                       DbpString(output_string);\r
+                       Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc);\r
                } else {\r
                        DbpString("Info: CRC is good");\r
                }\r
@@ -311,7 +300,7 @@ void AcquireTiType(void)
 \r
        // steal this pin from the SSP and use it to control the modulation\r
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;\r
-       AT91C_BASE_PIOA->PIO_OER        = GPIO_SSC_DOUT;\r
+       AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;\r
 \r
        AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;\r
        AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;\r
@@ -355,7 +344,6 @@ void AcquireTiType(void)
        n = TIBUFLEN*32;\r
        // unpack buffer\r
        for (i=TIBUFLEN-1; i>=0; i--) {\r
-//             DbpIntegers(0, 0, BigBuf[i]);\r
                for (j=0; j<32; j++) {\r
                        if(BigBuf[i] & (1 << j)) {\r
                                dest[--n] = 1;\r
@@ -371,11 +359,6 @@ void AcquireTiType(void)
 // if not provided a valid crc will be computed from the data and written.\r
 void WriteTItag(DWORD idhi, DWORD idlo, WORD crc)\r
 {\r
-\r
-       // WARNING the order of the bytes in which we calc crc below needs checking\r
-       // i'm 99% sure the crc algorithm is correct, but it may need to eat the\r
-       // bytes in reverse or something\r
-\r
        if(crc == 0) {\r
                crc = update_crc16(crc, (idlo)&0xff);\r
                crc = update_crc16(crc, (idlo>>8)&0xff);\r
@@ -386,10 +369,8 @@ void WriteTItag(DWORD idhi, DWORD idlo, WORD crc)
                crc = update_crc16(crc, (idhi>>16)&0xff);\r
                crc = update_crc16(crc, (idhi>>24)&0xff);\r
        }\r
-       char output_string[64];\r
-       sprintf(output_string, "Writing the following data to tag: %x, %x, %x",\r
+       Dbprintf("Writing to tag: %x%08x, crc=%x",\r
                (unsigned int) idhi, (unsigned int) idlo, crc);\r
-       DbpString(output_string);\r
 \r
        // TI tags charge at 134.2Khz\r
        FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 88); //134.8Khz\r
@@ -933,10 +914,8 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                found=1;\r
                                idx+=6;\r
                                if (found && (hi|lo)) {\r
-                                       char output_string[64];\r
-                                       sprintf(output_string, "TAG ID: %x %x %x", \r
+                                       Dbprintf("TAG ID: %x%08x (%d)",\r
                                                (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);\r
-                                       DbpString(output_string);\r
                                        /* if we're only looking for one tag */\r
                                        if (findone)\r
                                        {\r
@@ -968,10 +947,8 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                found=1;\r
                                idx+=6;\r
                                if (found && (hi|lo)) {\r
-                                       char output_string[64];\r
-                                       sprintf(output_string, "TAG ID: %x %x %x", \r
+                                       Dbprintf("TAG ID: %x%08x (%d)",\r
                                                (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);\r
-                                       DbpString(output_string);\r
                                        /* if we're only looking for one tag */\r
                                        if (findone)\r
                                        {\r