add bitswap option for lf em 4x05write

default read mode of this chip outputs in reverse order...  so offer the
option to program in reverse order

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index f9103126ea99863931b8b943e8ea0dbafef4acfd..f2c5d4f7e12d51b8985c7b1a30f9ce2561c73191 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -762,9 +762,10 @@ int CmdEM4x05dump(const char *Cmd) {
 int usage_lf_em_write(void) {
        PrintAndLog("Write EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");
 int usage_lf_em_write(void) {
        PrintAndLog("Write EM4x05/EM4x69.  Tag must be on antenna. ");
        PrintAndLog("");

-       PrintAndLog("Usage:  lf em 4x05writeword [h] <address> <data> <pwd>");
+       PrintAndLog("Usage:  lf em 4x05writeword [h] [s] <address> <data> <pwd>");

        PrintAndLog("Options:");
        PrintAndLog("       h         - this help");
        PrintAndLog("Options:");
        PrintAndLog("       h         - this help");

+       PrintAndLog("       s         - swap data bit order before write");

        PrintAndLog("       address   - memory address to write to. (0-15)");
        PrintAndLog("       data      - data to write (hex)");  
        PrintAndLog("       pwd       - password (hex) (optional)");
        PrintAndLog("       address   - memory address to write to. (0-15)");
        PrintAndLog("       data      - data to write (hex)");  
        PrintAndLog("       pwd       - password (hex) (optional)");


@@ -777,18 +778,23 @@ int usage_lf_em_write(void) {
 int CmdEM4x05WriteWord(const char *Cmd) {
        uint8_t ctmp = param_getchar(Cmd, 0);
        if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();
 int CmdEM4x05WriteWord(const char *Cmd) {
        uint8_t ctmp = param_getchar(Cmd, 0);
        if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();

-       
+

        bool usePwd = false;
        bool usePwd = false;

-               
+

        uint8_t addr = 16; // default to invalid address
        uint32_t data = 0xFFFFFFFF; // default to blank data
        uint32_t pwd = 0xFFFFFFFF; // default to blank password
        uint8_t addr = 16; // default to invalid address
        uint32_t data = 0xFFFFFFFF; // default to blank data
        uint32_t pwd = 0xFFFFFFFF; // default to blank password

-       
-       addr = param_get8ex(Cmd, 0, 16, 10);
-       data = param_get32ex(Cmd, 1, 0, 16);
-       pwd =  param_get32ex(Cmd, 2, 1, 16);
-       
-       
+       char swap = 0;
+
+       int p = 0;
+       swap = param_getchar(Cmd, 0);
+       if (swap == 's' || swap=='S') p++;
+       addr = param_get8ex(Cmd, p++, 16, 10);
+       data = param_get32ex(Cmd, p++, 0, 16);
+       pwd  = param_get32ex(Cmd, p++, 1, 16);
+
+       if (swap == 's' || swap=='S') data = SwapBits(data, 32);
+

        if ( (addr > 15) ) {
                PrintAndLog("Address must be between 0 and 15");
                return 1;
        if ( (addr > 15) ) {
                PrintAndLog("Address must be between 0 and 15");
                return 1;


@@ -797,15 +803,15 @@ int CmdEM4x05WriteWord(const char *Cmd) {
                PrintAndLog("Writing address %d data %08X", addr, data);        
        else {
                usePwd = true;
                PrintAndLog("Writing address %d data %08X", addr, data);        
        else {
                usePwd = true;

-               PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);               
+               PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);

        }
        }

-       
+

        uint16_t flag = (addr << 8 ) | usePwd;
        uint16_t flag = (addr << 8 ) | usePwd;

-       
+

        UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
        clearCommandBuffer();
        SendCommand(&c);
        UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
        clearCommandBuffer();
        SendCommand(&c);

-       UsbCommand resp;        
+       UsbCommand resp;

        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
                PrintAndLog("Error occurred, device did not respond during write operation.");
                return -1;
        if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
                PrintAndLog("Error occurred, device did not respond during write operation.");
                return -1;


@@ -813,7 +819,7 @@ int CmdEM4x05WriteWord(const char *Cmd) {
        if ( !downloadSamplesEM() ) {
                return -1;
        }
        if ( !downloadSamplesEM() ) {
                return -1;
        }

-       //check response for 00001010 for write confirmation!   
+       //check response for 00001010 for write confirmation!

        //attempt demod:
        uint32_t dummy = 0;
        int result = demodEM4x05resp(&dummy,false);
        //attempt demod:
        uint32_t dummy = 0;
        int result = demodEM4x05resp(&dummy,false);

diff --git a/client/util.c b/client/util.c
index e80f5cc9d59efeb7fe1cabee909db4bcb49ed1d5..60054b9410d9c310217eca720f460f45bc87b1f1 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -245,6 +245,15 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
        }
 }
 
        }
 }
 

+// Swap bit order on a uint32_t value.  Can be limited by nrbits just use say 8bits reversal
+// And clears the rest of the bits.
+uint32_t SwapBits(uint32_t value, int nrbits) {
+       uint32_t newvalue = 0;
+       for(int i = 0; i < nrbits; i++) {
+               newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i);
+       }
+       return newvalue;
+}

 
 // aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
 // to
 
 // aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
 // to

diff --git a/client/util.h b/client/util.h
index 7d9943f0616aa333ff0810ed0666219a74a1c710..c206fb0a28b33cacfcf5ac222244d46cf9bb9a70 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -48,6 +48,7 @@ uint64_t bytes_to_num(uint8_t* src, size_t len);
 void num_to_bytebits(uint64_t  n, size_t len, uint8_t *dest);
 void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
 char * printBits(size_t const size, void const * const ptr);
 void num_to_bytebits(uint64_t  n, size_t len, uint8_t *dest);
 void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest);
 char * printBits(size_t const size, void const * const ptr);

+uint32_t SwapBits(uint32_t value, int nrbits);

 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
 void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);
 
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
 void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest);