ADD: Binary Encoded Digit -> Decimal

ADD: Decimal -> Binary Encoded Digit

Ie
  decimal 2345 becomes 0x2345
  and
  hex 0x2345 becomes decimal 2345

diff --git a/client/util.c b/client/util.c
index a520245867a935abc1dc75f9acf2e35955bf8011..e81d760014ce107d6a2f09fa95aafe1a2179c20e 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -566,3 +566,12 @@ uint32_t reflect(uint32_t v, int b) {
        }
        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

diff --git a/client/util.h b/client/util.h
index 655f823b546d1adf224eb5ca577902188ab1752b..3acceafd69bab067c6fa9e3d05a7ae713e0524a5 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -9,12 +9,13 @@
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
-#include <stdint.h>  //included in data.h
+#include <stdint.h>            //included in data.h
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <time.h> 
-#include "data.h"    //for FILE_PATH_SIZE
+#include <time.h>
+#include <math.h>              // math.pow
+#include "data.h"              // for FILE_PATH_SIZE
 #include "proxmark3.h"
 
 #ifndef BITMASK
@@ -55,6 +56,14 @@
 #ifndef SWAP_NIBBLE
 # define SWAP_NIBBLE(b)  ( (NIBBLE_LOW(b)<< 4) | NIBBLE_HIGH(b))
 #endif
+
+#ifndef BCD2DEC
+# define BCD2DEC(bcd) HornerScheme(bcd, 0x10, 10)
+#endif
+#ifndef DEC2BCD
+# define DEC2BCD(dec) HornerScheme(dec, 10, 0x10)
+#endif
+
 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);
@@ -102,4 +111,5 @@ uint32_t le32toh (uint8_t *data);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
 void rol(uint8_t *data, const size_t len);
 uint32_t SwapBits(uint32_t value, int nrbits);
-uint32_t reflect(uint32_t v, int b);
\ No newline at end of file
+uint32_t reflect(uint32_t v, int b);
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
\ No newline at end of file