FIX: old bug back, and now fixed again. @marshmellow42

[proxmark3-svn] / armsrc / util.c

diff --git a/armsrc/util.c b/armsrc/util.c
index b1ef6ea084c57e855922a9ca214bfc2fe5b949bf..74fba94b764db748cf6a377ba23b96f5d06bc304 100644 (file)
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -8,10 +8,11 @@
 // Utility functions used in many places, not specific to any piece of code.
 //-----------------------------------------------------------------------------
 
-#include "../include/proxmark3.h"
+#include "proxmark3.h"
 #include "util.h"
 #include "string.h"
 #include "apps.h"
+#include "BigBuf.h"
 
 
 
@@ -34,7 +35,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 }
 
 size_t nbytes(size_t nbits) {
-       return (nbits/8)+((nbits%8)>0);
+       return (nbits >> 3)+((nbits % 8) > 0);
 }
 
 uint32_t SwapBits(uint32_t value, int nrbits) {
@@ -85,15 +86,6 @@ int32_t le24toh (uint8_t data[3])
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
 
-//added here for parity calulations
-uint8_t oddparity(uint8_t bt)
-{
-   uint16_t v = bt;
-   v ^= v >> 4;
-   v &= 0xF;
-   return ((0x9669 >> v) & 1);
-}
-
 void LEDsoff()
 {
        LED_A_OFF();
@@ -437,4 +429,3 @@ uint32_t RAMFUNC GetCountSspClk(){
        }
 }
 
-