change usb_cmd struct to be more sane

[proxmark3-svn] / client / prox.cpp

diff --git a/client/prox.cpp b/client/prox.cpp
index 4b80e3cc98895785987ff8065b07bcfa698f9ebc..86a0ff4537de886216c6efbb496ac8a4c4f4df8c 100644 (file)
--- a/client/prox.cpp
+++ b/client/prox.cpp
@@ -253,16 +253,16 @@ static void FlushPrevious(int translate)
        for(i = 0; i < 240; i += 48) {\r
                c.cmd = CMD_SETUP_WRITE;\r
                memcpy(c.d.asBytes, QueuedToSend+i, 48);\r
-               c.ext1 = (i/4);\r
+               c.arg[0] = (i/4);\r
                SendCommand(&c, TRUE);\r
        }\r
 \r
        c.cmd = CMD_FINISH_WRITE;\r
-       c.ext1 = (ExpectedAddr-1) & (~255);\r
+       c.arg[0] = (ExpectedAddr-1) & (~255);\r
        if(translate) {\r
-               c.ext1 -= PHYSICAL_FLASH_START;\r
+               c.arg[0] -= PHYSICAL_FLASH_START;\r
        }\r
-       printf("Flashing address: %08x\r", c.ext1);\r
+       printf("Flashing address: %08x\r", c.arg[0]);\r
        memcpy(c.d.asBytes, QueuedToSend+240, 16);\r
        SendCommand(&c, TRUE);\r
 \r
@@ -362,14 +362,14 @@ static int PrepareFlash(struct partition *p, const char *filename, unsigned int
        if(state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {\r
                UsbCommand c;\r
                c.cmd = CMD_START_FLASH;\r
-               c.ext1 = p->start;\r
-               c.ext2 = p->end;\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.ext3 = START_FLASH_MAGIC;\r
+                       c.arg[2] = START_FLASH_MAGIC;\r
                } else {\r
-                       c.ext3 = 0;\r
+                       c.arg[2] = 0;\r
                }\r
                SendCommand(&c, TRUE);\r
                translate = 0;\r
@@ -407,7 +407,7 @@ static unsigned int GetProxmarkState(void)
                state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;\r
                break;\r
        case CMD_DEVICE_INFO:\r
-               state = resp.ext1;\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