fix 'hf iclass writebl' and 'hf iclass clone' (#896)

[proxmark3-svn] / common / iso15693tools.c

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 2da6c7f9f3e312cce39cdeacb95d1780c12157fa..56b2fdb0af9f329daf59dfe1b802208bc9f5058d 100644 (file)
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -9,9 +9,8 @@
 
 #include "iso15693tools.h"
 
-#include "proxmark3.h"
+#include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #ifdef ON_DEVICE
 #include "printf.h"
 #else
@@ -71,7 +70,7 @@ char* Iso15693sprintUID(char *target, uint8_t *uid) {
 }
 
 
-uint16_t iclass_crc16(char *data_p, unsigned short length) {
+uint16_t iclass_crc16(uint8_t *data_p, unsigned short length) {
        unsigned char i;
        unsigned int data;
        uint16_t crc = ISO15693_CRC_PRESET;
@@ -80,7 +79,7 @@ uint16_t iclass_crc16(char *data_p, unsigned short length) {
                return (~crc);
 
        do {
-               for (i = 0, data = (unsigned int)0xff & *data_p++; i < 8; i++, data >>= 1) {
+               for (i = 0, data = 0xff & *data_p++; i < 8; i++, data >>= 1) {
                        if ((crc & 0x0001) ^ (data & 0x0001))
                                crc = (crc >> 1) ^ ISO15693_CRC_POLY;
                        else  crc >>= 1;
@@ -90,7 +89,7 @@ uint16_t iclass_crc16(char *data_p, unsigned short length) {
        crc = ~crc;
        data = crc;
        crc = (crc << 8) | (data >> 8 & 0xff);
-       crc = crc ^ 0xBC3;
+       crc = crc ^ 0x0BC3;
        return (crc);
 }