FIX: 'LF IO FSKDEMOD' - no call to turn of the antenna when exit

[proxmark3-svn] / armsrc / util.c

diff --git a/armsrc/util.c b/armsrc/util.c
index ae2e724738d64f470c966a58dd34322dcaf3f64b..1716a1134ba9b266e69b5bef660bb3d15979a4e2 100644 (file)
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -1,90 +1,103 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// Utility functions used in many places, not specific to any piece of code.

 // Jonathan Westhues, Sept 2005
 // Jonathan Westhues, Sept 2005

+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Utility functions used in many places, not specific to any piece of code.

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-#include "proxmark3.h"
-#include "apps.h"
-
-void *memcpy(void *dest, const void *src, int len)
-{
-       BYTE *d = dest;
-       const BYTE *s = src;
-       while((len--) > 0) {
-               *d = *s;
-               d++;
-               s++;
-       }
-       return dest;
-}

 
 

-void *memset(void *dest, int c, int len)
-{
-       BYTE *d = dest;
-       while((len--) > 0) {
-               *d = c;
-               d++;
-       }
-       return dest;
-}
+#include "util.h"

 
 

-int memcmp(const void *av, const void *bv, int len)
-{
-       const BYTE *a = av;
-       const BYTE *b = bv;
+void print_result(char *name, uint8_t *buf, size_t len) {
+       uint8_t *p = buf;

 
 

-       while((len--) > 0) {
-               if(*a != *b) {
-                       return *a - *b;
-               }
-               a++;
-               b++;
+       if ( len % 16 == 0 ) {
+               for(; p-buf < len; p += 16)
+                       Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                               name,
+                               p-buf,
+                               len,
+                               p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
+                       );

        }
        }

-       return 0;
-}
-
-int strlen(char *str)
-{
-       int l = 0;
-       while(*str) {
-               l++;
-               str++;
+       else {
+               for(; p-buf < len; p += 8)
+                       Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x",
+                               name,
+                               p-buf,
+                               len,
+                               p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);

        }
        }

-       return l;

 }
 
 }
 

-char* strncat(char *dest, const char *src, unsigned int n)
-{
-       unsigned int dest_len = strlen(dest);
-       unsigned int i;
+size_t nbytes(size_t nbits) {
+       return (nbits >> 3)+((nbits % 8) > 0);
+}

 
 

-       for (i = 0 ; i < n && src[i] != '\0' ; i++)
-               dest[dest_len + i] = src[i];
-       dest[dest_len + i] = '\0';
+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;
+}

 
 

-       return dest;
+/*
+ ref  http://www.csm.ornl.gov/~dunigan/crc.html
+ Returns the value v with the bottom b [0,32] bits reflected. 
+ Example: reflect(0x3e23L,3) == 0x3e26
+*/
+uint32_t reflect(uint32_t v, int b) {
+       uint32_t t = v;
+       for ( int i = 0; i < b; ++i) {
+               if (t & 1)
+                       v |=  BITMASK((b-1)-i);
+               else
+                       v &= ~BITMASK((b-1)-i);
+               t >>= 1;
+       }
+       return v;

 }
 
 }
 

-void num_to_bytes(uint64_t n, size_t len, byte_t* dest)
-{
+void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {

        while (len--) {
        while (len--) {

-               dest[len] = (byte_t) n;
+               dest[len] = (uint8_t) n;

                n >>= 8;
        }
 }
 
                n >>= 8;
        }
 }
 

-uint64_t bytes_to_num(byte_t* src, size_t len)
-{
+uint64_t bytes_to_num(uint8_t* src, size_t len) {

        uint64_t num = 0;
        uint64_t num = 0;

-       while (len--)
-       {
+       while (len--) {

                num = (num << 8) | (*src);
                src++;
        }
        return num;
 }
 
                num = (num << 8) | (*src);
                src++;
        }
        return num;
 }
 

-void LEDsoff()
-{
+// RotateLeft - Ultralight, Desfire
+void rol(uint8_t *data, const size_t len) {
+    uint8_t first = data[0];
+    for (size_t i = 0; i < len-1; i++) {
+        data[i] = data[i+1];
+    }
+    data[len-1] = first;
+}
+
+void lsl (uint8_t *data, size_t len) {
+    for (size_t n = 0; n < len - 1; n++) {
+        data[n] = (data[n] << 1) | (data[n+1] >> 7);
+    }
+    data[len - 1] <<= 1;
+}
+
+int32_t le24toh (uint8_t data[3]) {
+    return (data[2] << 16) | (data[1] << 8) | data[0];
+}
+
+void LEDsoff() {

        LED_A_OFF();
        LED_B_OFF();
        LED_C_OFF();
        LED_A_OFF();
        LED_B_OFF();
        LED_C_OFF();


@@ -92,8 +105,7 @@ void LEDsoff()
 }
 
 // LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]
 }
 
 // LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]

-void LED(int led, int ms)
-{
+void LED(int led, int ms) {

        if (led & LED_RED)
                LED_C_ON();
        if (led & LED_ORANGE)
        if (led & LED_RED)
                LED_C_ON();
        if (led & LED_ORANGE)


@@ -118,13 +130,11 @@ void LED(int led, int ms)
                LED_D_OFF();
 }
 
                LED_D_OFF();
 }
 

-

 // Determine if a button is double clicked, single clicked,
 // not clicked, or held down (for ms || 1sec)
 // In general, don't use this function unless you expect a
 // double click, otherwise it will waste 500ms -- use BUTTON_HELD instead
 // Determine if a button is double clicked, single clicked,
 // not clicked, or held down (for ms || 1sec)
 // In general, don't use this function unless you expect a
 // double click, otherwise it will waste 500ms -- use BUTTON_HELD instead

-int BUTTON_CLICKED(int ms)
-{
+int BUTTON_CLICKED(int ms) {

        // Up to 500ms in between clicks to mean a double click
        int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
        // Up to 500ms in between clicks to mean a double click
        int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 


@@ -139,12 +149,12 @@ int BUTTON_CLICKED(int ms)
        AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
        AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 
        AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
        AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 

-       WORD start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+       uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;

 
        int letoff = 0;
        for(;;)
        {
 
        int letoff = 0;
        for(;;)
        {

-               WORD now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+               uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;

 
                // We haven't let off the button yet
                if (!letoff)
 
                // We haven't let off the button yet
                if (!letoff)


@@ -162,7 +172,7 @@ int BUTTON_CLICKED(int ms)
                        // Still haven't let it off
                        else
                                // Have we held down a full second?
                        // Still haven't let it off
                        else
                                // Have we held down a full second?

-                               if (now == (WORD)(start + ticks))
+                               if (now == (uint16_t)(start + ticks))

                                        return BUTTON_HOLD;
                }
 
                                        return BUTTON_HOLD;
                }
 


@@ -174,7 +184,7 @@ int BUTTON_CLICKED(int ms)
 
                        // Have we ran out of time to double click?
                        else
 
                        // Have we ran out of time to double click?
                        else

-                               if (now == (WORD)(start + ticks))
+                               if (now == (uint16_t)(start + ticks))

                                        // At least we did a single click
                                        return BUTTON_SINGLE_CLICK;
 
                                        // At least we did a single click
                                        return BUTTON_SINGLE_CLICK;
 


@@ -186,8 +196,7 @@ int BUTTON_CLICKED(int ms)
 }
 
 // Determine if a button is held down
 }
 
 // Determine if a button is held down

-int BUTTON_HELD(int ms)
-{
+int BUTTON_HELD(int ms) {

        // If button is held for one second
        int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 
        // If button is held for one second
        int ticks = (48000 * (ms ? ms : 1000)) >> 10;
 


@@ -202,11 +211,11 @@ int BUTTON_HELD(int ms)
        AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
        AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 
        AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
        AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
 

-       WORD start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+       uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;

 
        for(;;)
        {
 
        for(;;)
        {

-               WORD now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
+               uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;

 
                // As soon as our button let go, we didn't hold long enough
                if (!BUTTON_PRESS())
 
                // As soon as our button let go, we didn't hold long enough
                if (!BUTTON_PRESS())


@@ -214,7 +223,7 @@ int BUTTON_HELD(int ms)
 
                // Have we waited the full second?
                else
 
                // Have we waited the full second?
                else

-                       if (now == (WORD)(start + ticks))
+                       if (now == (uint16_t)(start + ticks))

                                return BUTTON_HOLD;
 
                WDT_HIT();
                                return BUTTON_HOLD;
 
                WDT_HIT();


@@ -224,66 +233,36 @@ int BUTTON_HELD(int ms)
        return BUTTON_ERROR;
 }
 
        return BUTTON_ERROR;
 }
 

-// attempt at high resolution microsecond timer
-// beware: timer counts in 21.3uS increments (1024/48Mhz)
-void SpinDelayUs(int us)
-{
-       int ticks = (48*us) >> 10;
-
-       // Borrow a PWM unit for my real-time clock
-       AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);
-       // 48 MHz / 1024 gives 46.875 kHz
-       AT91C_BASE_PWMC_CH0->PWMC_CMR = PWM_CH_MODE_PRESCALER(10);
-       AT91C_BASE_PWMC_CH0->PWMC_CDTYR = 0;
-       AT91C_BASE_PWMC_CH0->PWMC_CPRDR = 0xffff;
-
-       WORD start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-
-       for(;;) {
-               WORD now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
-               if (now == (WORD)(start + ticks))
-                       return;
-
-               WDT_HIT();
-       }
-}
-
-void SpinDelay(int ms)
-{
-  // convert to uS and call microsecond delay function
-       SpinDelayUs(ms*1000);
-}
-

 /* Similar to FpgaGatherVersion this formats stored version information
  * into a string representation. It takes a pointer to the struct version_information,
  * verifies the magic properties, then stores a formatted string, prefixed by
  * prefix in dst.
  */
 /* Similar to FpgaGatherVersion this formats stored version information
  * into a string representation. It takes a pointer to the struct version_information,
  * verifies the magic properties, then stores a formatted string, prefixed by
  * prefix in dst.
  */

-void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information)
-{
+void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information) {

        struct version_information *v = (struct version_information*)version_information;
        dst[0] = 0;
        struct version_information *v = (struct version_information*)version_information;
        dst[0] = 0;

-       strncat(dst, prefix, len);
+       strncat(dst, prefix, len-1);

        if(v->magic != VERSION_INFORMATION_MAGIC) {
        if(v->magic != VERSION_INFORMATION_MAGIC) {

-               strncat(dst, "Missing/Invalid version information", len);
+               strncat(dst, "Missing/Invalid version information\n", len - strlen(dst) - 1);

                return;
        }
        if(v->versionversion != 1) {
                return;
        }
        if(v->versionversion != 1) {

-               strncat(dst, "Version information not understood", len);
+               strncat(dst, "Version information not understood\n", len - strlen(dst) - 1);

                return;
        }
        if(!v->present) {
                return;
        }
        if(!v->present) {

-               strncat(dst, "Version information not available", len);
+               strncat(dst, "Version information not available\n", len - strlen(dst) - 1);

                return;
        }
 
                return;
        }
 

-       strncat(dst, v->svnversion, len);
+       strncat(dst, v->gitversion, len - strlen(dst) - 1);

        if(v->clean == 0) {
        if(v->clean == 0) {

-               strncat(dst, "-unclean", len);
+               strncat(dst, "-unclean", len - strlen(dst) - 1);

        } else if(v->clean == 2) {
        } else if(v->clean == 2) {

-               strncat(dst, "-suspect", len);
+               strncat(dst, "-suspect", len - strlen(dst) - 1);

        }
 
        }
 

-       strncat(dst, " ", len);
-       strncat(dst, v->buildtime, len);
+       strncat(dst, " ", len - strlen(dst) - 1);
+       strncat(dst, v->buildtime, len - strlen(dst) - 1);
+       strncat(dst, "\n", len - strlen(dst) - 1);

 }
 }