Merge branch 'master' into topaz

[proxmark3-svn] / common / iso15693tools.c

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 0f7a250bf94c54651ec048474c3ced3d2b56c0f9..26e636ca7b0c27d90dee14bf3f79d70168fd546c 100644 (file)
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -66,11 +66,11 @@ char* Iso15693sprintUID(char *target,uint8_t *uid) {
   return target;
 }
 
-unsigned short iclass_crc16(char *data_p, unsigned short length)
+uint16_t iclass_crc16(char *data_p, unsigned short length)
 {
       unsigned char i;
       unsigned int data;
-      unsigned int crc = 0xffff;
+         uint16_t crc = 0xffff;
 
       if (length == 0)
             return (~crc);