CHG: had to move the SwapBits method.

diff --git a/client/util.c b/client/util.c
index 9d4c83ee2b975e997a6db42e1b3eb8c9e9061b48..fcda9bde0ae7815bf46d1e2c0567c564f43cb526 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -503,10 +503,18 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00
 
 // RotateLeft - Ultralight, Desfire, works on byte level
 // 00-01-02  >> 01-02-00

-void rol(uint8_t *data, const size_t len){
+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;
     uint8_t first = data[0];
     for (size_t i = 0; i < len-1; i++) {
         data[i] = data[i+1];
     }
     data[len-1] = first;

+}
+
+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;

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/client/util.h b/client/util.h
index 39ed51b4c9a4f53dd012804d3bd091c205503015..ce3bc24701a28d2288ef2ce19abce7df53c38b32 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -78,4 +78,5 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);
 void xor(unsigned char * dst, unsigned char * src, size_t len);
 int32_t le24toh (uint8_t data[3]);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
 void xor(unsigned char * dst, unsigned char * src, size_t len);
 int32_t le24toh (uint8_t data[3]);
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);

-void rol(uint8_t *data, const size_t len);
\ No newline at end of file
+void rol(uint8_t *data, const size_t len);
+uint32_t SwapBits(uint32_t value, int nrbits);
\ No newline at end of file

diff --git a/common/crc.c b/common/crc.c
index 21019da9c0b97891d8717779e0bf7d5538924f7b..8e9f39962a3b0b415b17b8ffbd49d878a037704c 100644 (file)
--- a/common/crc.c
+++ b/common/crc.c
@@ -7,7 +7,6 @@
 //-----------------------------------------------------------------------------
 #include "crc.h"
 #include "util.h"
 //-----------------------------------------------------------------------------
 #include "crc.h"
 #include "util.h"

-#include <stdio.h>

 #include <stdint.h>
 #include <stddef.h>
 
 #include <stdint.h>
 #include <stddef.h>
 


@@ -44,8 +43,7 @@ uint32_t crc_finish(crc_t *crc)
 }
 
 //credits to iceman
 }
 
 //credits to iceman

-uint32_t CRC8Maxim(uint8_t *buff, size_t size) 
-{
+uint32_t CRC8Maxim(uint8_t *buff, size_t size) {

        crc_t crc;
        crc_init(&crc, 9, 0x8c, 0x00, 0x00);
        crc_clear(&crc);
        crc_t crc;
        crc_init(&crc, 9, 0x8c, 0x00, 0x00);
        crc_clear(&crc);


@@ -68,10 +66,4 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) {
        return SwapBits(crc_finish(&crc), 8);
 }
 
        return SwapBits(crc_finish(&crc), 8);
 }
 

-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;
-}
+

diff --git a/common/crc.h b/common/crc.h
index 0c0770a47d9ea81820dcc40606f3e3d0ae15ca85..fc76dc48d6a80bd694a381517e5349a6cad079df 100644 (file)
--- a/common/crc.h
+++ b/common/crc.h
@@ -42,7 +42,6 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size);
 
 // Calculate CRC-8/Legic checksum
 uint32_t CRC8Legic(uint8_t *buff, size_t size);
 
 // Calculate CRC-8/Legic checksum
 uint32_t CRC8Legic(uint8_t *buff, size_t size);

-uint32_t SwapBits(uint32_t value, int nrbits);

 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \