From dae31af21e6ead8318e0dbe4933a9dce4c1a79e5 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 29 Jul 2016 23:29:37 +0200 Subject: [PATCH 1/1] ADD: Binary Encoded Digit -> Decimal ADD: Decimal -> Binary Encoded Digit Ie decimal 2345 becomes 0x2345 and hex 0x2345 becomes decimal 2345 --- client/util.c | 9 +++++++++ client/util.h | 18 ++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/client/util.c b/client/util.c index a5202458..e81d7600 100644 --- 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 655f823b..3acceafd 100644 --- a/client/util.h +++ b/client/util.h @@ -9,12 +9,13 @@ //----------------------------------------------------------------------------- #include -#include //included in data.h +#include //included in data.h #include #include #include -#include -#include "data.h" //for FILE_PATH_SIZE +#include +#include // 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 -- 2.39.5