Fixed so correct sizes are used across different architectures in the binlib

[proxmark3-svn] / armsrc / util.h

diff --git a/armsrc/util.h b/armsrc/util.h
index b68c511c7c5007a52c8f721bb3c26e2eb355285a..135468aeee7e4b3954fa50d9c146221c2ed6e6ac 100644 (file)
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -13,12 +13,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <stddef.h>
 #include <stdint.h>

-
-#define RAMFUNC __attribute((long_call, section(".ramfunc")))
+#include <common.h>

 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )
 
 #define BYTEx(x, n) (((x) >> (n * 8)) & 0xff )

-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))

 
 #define LED_RED 1
 #define LED_ORANGE 2
 
 #define LED_RED 1
 #define LED_ORANGE 2


@@ -30,6 +27,7 @@
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 
 #define BUTTON_DOUBLE_CLICK -2
 #define BUTTON_ERROR -99
 

+size_t nbytes(size_t nbits);

 uint32_t SwapBits(uint32_t value, int nrbits);
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 uint32_t SwapBits(uint32_t value, int nrbits);
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);