More en masse cleanup (whitespace/newlines/headers/etc)

[proxmark3-svn] / client / prox.c

diff --git a/client/prox.c b/client/prox.c
index 94343ff0222841c5d95f1b4787941466bc2fcf6e..d619c821c2d54a0b3251a76be2aadf5fdc430910 100644 (file)
--- a/client/prox.c
+++ b/client/prox.c
@@ -9,7 +9,9 @@
 #include "include/hidsdi.h"\r
 //}\r
 \r
 #include "include/hidsdi.h"\r
 //}\r
 \r

-#include "prox.h"\r
+#include "flash.h"\r
+#include "usb_cmd.h"\r
+#include "ui.h"\r

 \r
 #define OUR_VID 0x9ac4\r
 #define OUR_PID 0x4b8f\r
 \r
 #define OUR_VID 0x9ac4\r
 #define OUR_PID 0x4b8f\r


@@ -18,6 +20,7 @@
 int offline = 0;\r
 HANDLE UsbHandle;\r
 extern unsigned int current_command;\r
 int offline = 0;\r
 HANDLE UsbHandle;\r
 extern unsigned int current_command;\r

+extern struct partition partitions[];\r

 \r
 static void ShowError(void)\r
 {\r
 \r
 static void ShowError(void)\r
 {\r


@@ -27,7 +30,7 @@ static void ShowError(void)
        printf("ERROR: %s", buf);\r
 }\r
 \r
        printf("ERROR: %s", buf);\r
 }\r
 \r

-static BOOL UsbConnect(void)\r
+BOOL UsbConnect(void)\r

 {\r
        typedef void (__stdcall *GetGuidProc)(GUID *);\r
        typedef BOOLEAN (__stdcall *GetAttrProc)(HANDLE, HIDD_ATTRIBUTES *);\r
 {\r
        typedef void (__stdcall *GetGuidProc)(GUID *);\r
        typedef BOOLEAN (__stdcall *GetAttrProc)(HANDLE, HIDD_ATTRIBUTES *);\r


@@ -216,293 +219,20 @@ void SendCommand(UsbCommand *c)
        current_command = c->cmd;\r
 }\r
 \r
        current_command = c->cmd;\r
 }\r
 \r

-void WaitForAck(void) {\r
-       UsbCommand ack;\r
-       ReceiveCommand(&ack);\r
-       if(ack.cmd != CMD_ACK) {\r
-               printf("bad ACK\n");\r
-               exit(-1);\r
-       }\r
-}\r
-\r
-static unsigned int ExpectedAddr;\r
-static BYTE QueuedToSend[256];\r
-static BOOL AllWritten;\r
-#define PHYSICAL_FLASH_START 0x100000\r
-\r
-struct partition {\r
-       int start;\r
-       int end;\r
-       int precious;\r
-       const char *name;\r
-};\r
-struct partition partitions[] = {\r
-               {0x100000, 0x102000, 1, "bootrom"},\r
-               {0x102000, 0x110000, 0, "fpga"},\r
-               {0x110000, 0x140000, 0, "os"},\r
-};\r
-\r
-/* If translate is set, subtract PHYSICAL_FLASH_START to translate for old\r
- * bootroms.\r
- */\r
-static void FlushPrevious(int translate)\r
-{\r
-       UsbCommand c;\r
-       memset(&c, 0, sizeof(c));\r
-\r
-//     printf("expected = %08x flush, ", ExpectedAddr);\r
-\r
-       int i;\r
-       for(i = 0; i < 240; i += 48) {\r
-               c.cmd = CMD_SETUP_WRITE;\r
-               memcpy(c.d.asBytes, QueuedToSend+i, 48);\r
-               c.arg[0] = (i/4);\r
-               SendCommand(&c);\r
-               WaitForAck();\r
-       }\r
-\r
-       c.cmd = CMD_FINISH_WRITE;\r
-       c.arg[0] = (ExpectedAddr-1) & (~255);\r
-       if(translate) {\r
-               c.arg[0] -= PHYSICAL_FLASH_START;\r
-       }\r
-       printf("Flashing address: %08x\r", c.arg[0]);\r
-       memcpy(c.d.asBytes, QueuedToSend+240, 16);\r
-       SendCommand(&c);\r
-       WaitForAck();\r
-       \r
-       AllWritten = TRUE;\r
-}\r
-\r
-/* Where must be between start_addr (inclusive) and end_addr (exclusive).\r
- */\r
-static void GotByte(int where, BYTE which, int start_addr, int end_addr, int translate)\r
-{\r
-       AllWritten = FALSE;\r
-\r
-       if(where < start_addr || where >= end_addr) {\r
-               printf("bad: got byte at %08x, outside of range %08x-%08x\n", where, start_addr, end_addr);\r
-               exit(-1);\r
-       }\r
-\r
-       if(where != ExpectedAddr) {\r
-               printf("bad: got at %08x, expected at %08x\n", where, ExpectedAddr);\r
-               exit(-1);\r
-       }\r
-       QueuedToSend[where & 255] = which;\r
-       ExpectedAddr++;\r
-\r
-       if((where & 255) == 255) {\r
-               // we have completed a full page\r
-               FlushPrevious(translate);\r
-       }\r
-}\r
-\r
-static int HexVal(int c)\r
-{\r
-       c = tolower(c);\r
-       if(c >= '0' && c <= '9') {\r
-               return c - '0';\r
-       } else if(c >= 'a' && c <= 'f') {\r
-               return (c - 'a') + 10;\r
-       } else {\r
-               printf("bad hex digit '%c'\n", c);\r
-               exit(-1);\r
-       }\r
-}\r
-\r
-static BYTE HexByte(char *s)\r
-{\r
-       return (HexVal(s[0]) << 4) | HexVal(s[1]);\r
-}\r
-\r
-static void LoadFlashFromSRecords(const char *file, int start_addr, int end_addr, int translate)\r
-{\r
-       ExpectedAddr = start_addr;\r
-\r
-       FILE *f = fopen(file, "r");\r
-       if(!f) {\r
-               printf("couldn't open file\n");\r
-               exit(-1);\r
-       }\r
-\r
-       char line[512];\r
-       while(fgets(line, sizeof(line), f)) {\r
-               if(memcmp(line, "S3", 2)==0) {\r
-                       char *s = line + 2;\r
-                       int len = HexByte(s) - 5;\r
-                       s += 2;\r
-\r
-                       char addrStr[9];\r
-                       memcpy(addrStr, s, 8);\r
-                       addrStr[8] = '\0';\r
-                       unsigned int addr;\r
-                       sscanf(addrStr, "%x", &addr);\r
-                       s += 8;\r
-\r
-                       /* Accept files that are located at PHYSICAL_FLASH_START, and files that are located at 0 */\r
-                       if(addr < PHYSICAL_FLASH_START)\r
-                               addr += PHYSICAL_FLASH_START;\r
-\r
-                       int i;\r
-                       for(i = 0; i < len; i++) {\r
-                               while((addr+i) > ExpectedAddr) {\r
-                                       GotByte(ExpectedAddr, 0xff, start_addr, end_addr, translate);\r
-                               }\r
-                               GotByte(addr+i, HexByte(s), start_addr, end_addr, translate);\r
-                               s += 2;\r
-                       }\r
-               }\r
-       }\r
-\r
-       if(!AllWritten) FlushPrevious(translate);\r
-\r
-       fclose(f);\r
-       printf("\ndone.\n");\r
-}\r
-\r
-static int PrepareFlash(struct partition *p, const char *filename, unsigned int state)\r
-{\r
-       int translate = 0;\r
-       if(state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {\r
-               UsbCommand c;\r
-               c.cmd = CMD_START_FLASH;\r
-               c.arg[0] = p->start;\r
-               c.arg[1] = p->end;\r
-\r
-               /* Only send magic when flashing bootrom */\r
-               if(p->precious) {\r
-                       c.arg[2] = START_FLASH_MAGIC;\r
-               } else {\r
-                       c.arg[2] = 0;\r
-               }\r
-               SendCommand(&c);\r
-               WaitForAck();\r
-               translate = 0;\r
-       } else {\r
-               fprintf(stderr, "Warning: Your bootloader does not understand the new START_FLASH command\n");\r
-               fprintf(stderr, "         It is recommended that you update your bootloader\n\n");\r
-               translate = 1;\r
-       }\r
-\r
-       LoadFlashFromSRecords(filename, p->start, p->end, translate);\r
-       return 1;\r
-}\r
-\r
-static unsigned int GetProxmarkState(void)\r
-{\r
-       unsigned int state = 0;\r
-\r
-       UsbCommand c;\r
-       c.cmd = CMD_DEVICE_INFO;\r
-       SendCommand(&c);\r
-\r
-       UsbCommand resp;\r
-       ReceiveCommand(&resp);\r
-       /* Three cases:\r
-        * 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK\r
-        * 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"\r
-        * 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags\r
-        */\r
-\r
-       switch(resp.cmd) {\r
-       case CMD_ACK:\r
-               state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;\r
-               break;\r
-       case CMD_DEBUG_PRINT_STRING:\r
-               state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;\r
-               break;\r
-       case CMD_DEVICE_INFO:\r
-               state = resp.arg[0];\r
-               break;\r
-       default:\r
-               fprintf(stderr, "Couldn't get proxmark state, bad response type: 0x%04X\n", resp.cmd);\r
-               exit(-1);\r
-               break;\r
-       }\r
-\r
-#if 0\r
-       if(state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) printf("New bootrom present\n");\r
-       if(state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) printf("New osimage present\n");\r
-       if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) printf("Currently in bootrom\n");\r
-       if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) printf("Currently in OS\n");\r
-#endif\r
-\r
-       return state;\r
-}\r
-\r
-static unsigned int EnterFlashState(void)\r
-{\r
-       unsigned int state = GetProxmarkState();\r
-\r
-       if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {\r
-               /* Already in flash state, we're done. */\r
-               return state;\r
-       }\r
-\r
-       if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {\r
-               fprintf(stderr,"Entering flash-mode...\n");\r
-               UsbCommand c;\r
-               bzero(&c, sizeof(c));\r
-\r
-               if( (state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) ) {\r
-                       /* New style handover: Send CMD_START_FLASH, which will reset the board and\r
-                        * enter the bootrom on the next boot.\r
-                        */\r
-                       c.cmd = CMD_START_FLASH;\r
-                       SendCommand(&c);\r
-                       fprintf(stderr,"(You don't have to do anything. Press and release the button only if you want to abort)\n");\r
-                       fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");\r
-               } else {\r
-                       /* Old style handover: Ask the user to press the button, then reset the board */\r
-                       c.cmd = CMD_HARDWARE_RESET;\r
-                       SendCommand(&c);\r
-                       fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");\r
-                       fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");\r
-               }\r
-\r
-\r
-               Sleep(1000);\r
-\r
-               while(!UsbConnect()) { Sleep(1000); }\r
-               fprintf(stderr,"Found.\n");\r
-\r
-               return GetProxmarkState();\r
-       }\r
-\r
-       return 0;\r
-}\r
-\r

 static void usage(char **argv)\r
 {\r
        int i;\r
                printf("Usage: %s gui\n", argv[0]);\r
                printf("       %s offline\n", argv[0]);\r
 static void usage(char **argv)\r
 {\r
        int i;\r
                printf("Usage: %s gui\n", argv[0]);\r
                printf("       %s offline\n", argv[0]);\r

-               printf("       %s areas file.s19\n", argv[0]);\r
+               printf("       %s areas file.elf\n", argv[0]);\r

                printf("               Known areas are:");\r
                printf("               Known areas are:");\r

-               for(i=0; i<(sizeof(partitions)/sizeof(partitions[0])); i++) {\r
+               for(i=0; partitions[i].name != NULL; i++) {\r

                        fprintf(stderr, " %s", partitions[i].name);\r
                }\r
 \r
                printf("\n");\r
 }\r
 \r
                        fprintf(stderr, " %s", partitions[i].name);\r
                }\r
 \r
                printf("\n");\r
 }\r
 \r

-/* On first call, have *offset = -1, *length = 0; */\r
-static int find_next_area(char *str, int *offset, int *length)\r
-{\r
-       if(*str == '\0') return 0;\r
-       if((*offset >= 0) && str[*offset + *length] == '\0') return 0;\r
-       *offset += 1 + *length;\r
-\r
-       char *next_comma = strchr(str + *offset, ',');\r
-       if(next_comma == NULL) {\r
-               *length = strlen(str) - *offset;\r
-       } else {\r
-               *length = next_comma-(str+*offset);\r
-       }\r
-       return 1;\r
-}\r
-\r

 int main(int argc, char **argv)\r
 {\r
        int i = 0;\r
 int main(int argc, char **argv)\r
 {\r
        int i = 0;\r


@@ -547,40 +277,6 @@ int main(int argc, char **argv)
                exit(-1);\r
        }\r
 \r
                exit(-1);\r
        }\r
 \r

-       unsigned int state = EnterFlashState();\r
-\r
-       if( !(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) ) {\r
-               fprintf(stderr, "Proxmark would not enter flash state, abort\n");\r
-               exit(-1);\r
-       }\r
-\r
-       offset=-1; length=0;\r
-       int current_area = 0;\r
-       while(find_next_area(argv[1], &offset, &length)) {\r
-               int i;\r
-               struct partition *p = NULL;\r
-               for(i=0; i<sizeof(partitions)/sizeof(partitions[0]); i++) {\r
-                       if(strncmp(partitions[i].name, argv[1] + offset, length) == 0) {\r
-                               /* Check if the name matches the bootrom partition, and if so, require "bootrom" to\r
-                                * be written in full. The other names may be abbreviated.\r
-                                */\r
-                               if(!partitions[i].precious || (strlen(partitions[i].name) == length)) {\r
-                                       p = &partitions[i];\r
-                               }\r
-                               break;\r
-                       }\r
-               }\r
-\r
-               if(p == NULL) {\r
-                       fprintf(stderr, "Warning: area name '");\r
-                       fwrite(argv[1]+offset, length, 1, stderr);\r
-                       fprintf(stderr, "' unknown, ignored\n");\r
-               } else {\r
-                       fprintf(stderr, "Flashing %s from %s\n", p->name, argv[2+current_area]);\r
-                       PrepareFlash(p, argv[2+current_area], state);\r
-               }\r
-               current_area++;\r
-       }\r
-\r
+       do_flash(argv);\r

        return 0;\r
 }\r
        return 0;\r
 }\r