Merge branch 'master' into fix_iso15693_fpga

[proxmark3-svn] / common / iso15693tools.c

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 0769eefb90eb7d80d05c6b6ee0684c329a408e9d..56b2fdb0af9f329daf59dfe1b802208bc9f5058d 100644 (file)
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -70,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;
@@ -79,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;