CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 4129daaf785953d8495eedc89338163c8018eeed..c5c7d7fe2f2fc3d019507426581c84bf43cdea64 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -221,7 +221,7 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){

-       uint8_t buf[64];
+       static uint8_t buf[64];

        memset(buf, 0x00, 64);
        uint8_t *tmp = buf;
        for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
        memset(buf, 0x00, 64);
        uint8_t *tmp = buf;
        for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){


@@ -229,7 +229,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
                        tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
                }
        }
                        tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
                }
        }

-       return tmp;
+       return buf;

 }
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
 }
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 


@@ -280,7 +280,6 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
        return 0;
 }
 

-

 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;


@@ -352,8 +351,6 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
                return strtoull(&line[bg], NULL, base);
        else
                return deflt;
                return strtoull(&line[bg], NULL, base);
        else
                return deflt;

-
-       return 0;

 }
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 }
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)


@@ -568,3 +565,12 @@ uint32_t reflect(uint32_t v, int b) {
        }
        return v;
 }
        }
        return v;
 }

+
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
+   uint64_t remainder=0, quotient=0, result=0;
+   remainder = num % divider;
+   quotient = num / divider;
+   if(!(quotient == 0 && remainder == 0))
+   result += HornerScheme(quotient, divider, factor) * factor + remainder;
+   return result;
+}
\ No newline at end of file