remove most of the references to translate.h

diff --git a/client/cli.c b/client/cli.c
index 3e8aab606fddf13c352e98c7dd3f1bc86e7ff662..9863b898cdfecd30c24f59bccbbc0f13f2021b03 100644 (file)
--- a/client/cli.c
+++ b/client/cli.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 

-#include "translate.h"

 #include "prox.h"
 #include "proxmark3.h"
 
 #include "prox.h"
 #include "proxmark3.h"
 

diff --git a/client/flasher.c b/client/flasher.c
index bcbe2d7773fe9bad8bc32ecd893dea2390055980..82810b0a676167a395e22aee31f6abc003a07c26 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -2,18 +2,19 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

+#include <stdint.h>
+#include <stdbool.h>

 #include <strings.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 
 #include <strings.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 

-#include "translate.h"

 #include "prox.h"
 #include "proxmark3.h"
 
 #include "prox.h"
 #include "proxmark3.h"
 

-static DWORD ExpectedAddr;
-static BYTE QueuedToSend[256];
-static BOOL AllWritten;
+static uint32_t ExpectedAddr;
+static uint8_t QueuedToSend[256];
+static bool AllWritten;

 #define PHYSICAL_FLASH_START 0x100000
 
 struct partition {
 #define PHYSICAL_FLASH_START 0x100000
 
 struct partition {


@@ -43,7 +44,7 @@ static void FlushPrevious(int translate)
                c.cmd = CMD_SETUP_WRITE;
                memcpy(c.d.asBytes, QueuedToSend+i, 48);
                c.arg[0] = (i/4);
                c.cmd = CMD_SETUP_WRITE;
                memcpy(c.d.asBytes, QueuedToSend+i, 48);
                c.arg[0] = (i/4);

-               SendCommand(&c, TRUE);
+               SendCommand(&c, true);

        }
 
        c.cmd = CMD_FINISH_WRITE;
        }
 
        c.cmd = CMD_FINISH_WRITE;


@@ -53,16 +54,16 @@ static void FlushPrevious(int translate)
        }
        printf("c.arg[0] = %08x\r", c.arg[0]);
        memcpy(c.d.asBytes, QueuedToSend+240, 16);
        }
        printf("c.arg[0] = %08x\r", c.arg[0]);
        memcpy(c.d.asBytes, QueuedToSend+240, 16);

-       SendCommand(&c, TRUE);
+       SendCommand(&c, true);

 
 

-       AllWritten = TRUE;
+       AllWritten = true;

 }
 
 /* Where must be between start_addr (inclusive) and end_addr (exclusive).
  */
 }
 
 /* Where must be between start_addr (inclusive) and end_addr (exclusive).
  */

-static void GotByte(DWORD where, BYTE which, int start_addr, int end_addr, int translate)
+static void GotByte(uint32_t where, uint8_t which, int start_addr, int end_addr, int translate)

 {
 {

-       AllWritten = FALSE;
+       AllWritten = false;

        
        if(where < start_addr || where >= end_addr) {
                printf("bad: got byte at %08x, outside of range %08x-%08x\n", where, start_addr, end_addr);
        
        if(where < start_addr || where >= end_addr) {
                printf("bad: got byte at %08x, outside of range %08x-%08x\n", where, start_addr, end_addr);


@@ -95,7 +96,7 @@ static int HexVal(int c)
        }
 }
 
        }
 }
 

-static BYTE HexByte(char *s)
+static uint8_t HexByte(char *s)

 {
        return (HexVal(s[0]) << 4) | HexVal(s[1]);
 }
 {
        return (HexVal(s[0]) << 4) | HexVal(s[1]);
 }


@@ -120,7 +121,7 @@ static void LoadFlashFromSRecords(const char *file, int start_addr, int end_addr
                        char addrStr[9];
                        memcpy(addrStr, s, 8);
                        addrStr[8] = '\0';
                        char addrStr[9];
                        memcpy(addrStr, s, 8);
                        addrStr[8] = '\0';

-                       DWORD addr;
+                       uint32_t addr;

                        sscanf(addrStr, "%x", &addr);
                        s += 8;
                        
                        sscanf(addrStr, "%x", &addr);
                        s += 8;
                        


@@ -160,7 +161,7 @@ static int PrepareFlash(struct partition *p, const char *filename, unsigned int
                } else {
                        c.arg[2] = 0;
                }
                } else {
                        c.arg[2] = 0;
                }

-               SendCommand(&c, TRUE);
+               SendCommand(&c, true);

                translate = 0;
        } else {
                fprintf(stderr, "Warning: Your bootloader does not understand the new START_FLASH command\n");
                translate = 0;
        } else {
                fprintf(stderr, "Warning: Your bootloader does not understand the new START_FLASH command\n");


@@ -178,7 +179,7 @@ static unsigned int GetProxmarkState(void)
        
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;
        
        UsbCommand c;
        c.cmd = CMD_DEVICE_INFO;

-       SendCommand(&c, FALSE);
+       SendCommand(&c, false);

        
        UsbCommand resp;
        ReceiveCommand(&resp);
        
        UsbCommand resp;
        ReceiveCommand(&resp);


@@ -233,13 +234,13 @@ static unsigned int EnterFlashState(void)
                         * enter the bootrom on the next boot.
                         */
                        c.cmd = CMD_START_FLASH;
                         * enter the bootrom on the next boot.
                         */
                        c.cmd = CMD_START_FLASH;

-                       SendCommand(&c, FALSE);
+                       SendCommand(&c, false);

                        fprintf(stderr,"(You don't have to do anything. Press and release the button only if you want to abort)\n");
                        fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
                } else {
                        /* Old style handover: Ask the user to press the button, then reset the board */
                        c.cmd = CMD_HARDWARE_RESET;
                        fprintf(stderr,"(You don't have to do anything. Press and release the button only if you want to abort)\n");
                        fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
                } else {
                        /* Old style handover: Ask the user to press the button, then reset the board */
                        c.cmd = CMD_HARDWARE_RESET;

-                       SendCommand(&c, FALSE);
+                       SendCommand(&c, false);

                        fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");
                        fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
                }
                        fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");
                        fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
                }


@@ -345,7 +346,7 @@ int main(int argc, char **argv) {
        UsbCommand c;
        bzero(&c, sizeof(c));
        c.cmd = CMD_HARDWARE_RESET;
        UsbCommand c;
        bzero(&c, sizeof(c));
        c.cmd = CMD_HARDWARE_RESET;

-       SendCommand(&c, FALSE);
+       SendCommand(&c, false);

 
        CloseProxmark();
 
 
        CloseProxmark();
 

diff --git a/client/gui.c b/client/gui.c
index c540f9e853dd9d63045043fe44b4b660f156eb2a..b8761d6d6c6d81f2ade200461aaa89adc8430ad1 100644 (file)
--- a/client/gui.c
+++ b/client/gui.c
@@ -3,7 +3,6 @@
 #include <time.h>
 
 #include "proxgui.h"
 #include <time.h>
 
 #include "proxgui.h"

-#include "translate.h"

 #include "prox.h"
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 #include "prox.h"
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 3c3b7927a7b11b9c608027baa63074e91c6c3643..4c6076bc83cbac16b52aecb65cc48a63e2d9f048 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -9,7 +9,6 @@
 #include <readline/history.h>
 #include <pthread.h>
 
 #include <readline/history.h>
 #include <pthread.h>
 

-#include "translate.h"

 #include "prox.h"
 #include "proxmark3.h"
 #include "proxgui.h"
 #include "prox.h"
 #include "proxmark3.h"
 #include "proxgui.h"

diff --git a/client/snooper.c b/client/snooper.c
index e382eddfef4219f1e37977ebf069ed0e163e26e8..a7a8894abfa85280baf0441dd3370b439e8f7445 100644 (file)
--- a/client/snooper.c
+++ b/client/snooper.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 

-//#include "translate.h"

 #include "prox.h"
 #include "proxmark3.h"
 
 #include "prox.h"
 #include "proxmark3.h"