ARM code cleanup (lfops)

[proxmark3-svn] / armsrc / lfops.c

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index c2d908dfebb55cf06b8b14cfec36c4f3496d7741..eeaa5782948173f2cf6af575551d4915e1dc2b11 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -9,15 +9,16 @@
 #include "hitag2.h"\r
 #include "../common/crc16.c"\r
 \r
+int sprintf(char *dest, const char *fmt, ...);\r
+\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
@@ -29,36 +30,37 @@ 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
-\r
-       memset(dest,0,n);\r
+       char output_string[64];\r
+       \r
+       memset(dest, 0, n);\r
        i = 0;\r
        for(;;) {\r
-               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {\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) {\r
-                               break;\r
-                       }\r
+                       if (i >= n) break;\r
                }\r
        }\r
-       DbpIntegers(dest[0], dest[1], at134khz);\r
+       sprintf(output_string, "read samples, dest[0]=%x dest[1]=%x",\r
+               dest[0], dest[1]);\r
+       DbpString(output_string);\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
@@ -67,18 +69,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
@@ -89,38 +90,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
@@ -132,7 +129,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
@@ -254,11 +251,13 @@ void ReadTItag()
                crc = update_crc16(crc, (shift1>>16)&0xff);\r
                crc = update_crc16(crc, (shift1>>24)&0xff);\r
 \r
-               DbpString("Info: Tag data_hi, data_lo, crc = ");\r
-               DbpIntegers(shift1, shift0, shift2&0xffff);\r
+               char output_string[64];\r
+               sprintf(output_string, "Info: Tag data_hi=%x, data_lo=%x, crc=%x",\r
+                       (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);\r
+               DbpString(output_string);\r
                if (crc != (shift2&0xffff)) {\r
-                       DbpString("Error: CRC mismatch, expected");\r
-                       DbpIntegers(0, 0, crc);\r
+                       sprintf(output_string, "Error: CRC mismatch, expected %x", (unsigned int)crc);\r
+                       DbpString(output_string);\r
                } else {\r
                        DbpString("Info: CRC is good");\r
                }\r
@@ -306,7 +305,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
@@ -381,8 +380,10 @@ 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
-       DbpString("Writing the following data to tag:");\r
-       DbpIntegers(idhi, idlo, crc);\r
+       char output_string[64];\r
+       sprintf(output_string, "Writing the following data to tag: %x, %x, %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
@@ -395,7 +396,7 @@ void WriteTItag(DWORD idhi, DWORD idlo, WORD crc)
 \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
        // writing algorithm:\r
        // a high bit consists of a field off for 1ms and field on for 1ms\r
@@ -926,8 +927,10 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                found=1;\r
                                idx+=6;\r
                                if (found && (hi|lo)) {\r
-                                       DbpString("TAG ID");\r
-                                       DbpIntegers(hi, lo, (lo>>1)&0xffff);\r
+                                       char output_string[64];\r
+                                       sprintf(output_string, "TAG ID: %x %x %x", \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
@@ -959,8 +962,10 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                                found=1;\r
                                idx+=6;\r
                                if (found && (hi|lo)) {\r
-                                       DbpString("TAG ID");\r
-                                       DbpIntegers(hi, lo, (lo>>1)&0xffff);\r
+                                       char output_string[64];\r
+                                       sprintf(output_string, "TAG ID: %x %x %x", \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