Merge branch 'master' into fix_iso15693_fpga

[proxmark3-svn] / common / iso15693tools.h

diff --git a/common/iso15693tools.h b/common/iso15693tools.h
index ceb6393ecc079c797c7df77c63d70f1a3dae9653..9825eb04bad9cdcad665fd987295cb0cd0aa6c31 100644 (file)
--- a/common/iso15693tools.h
+++ b/common/iso15693tools.h
@@ -4,14 +4,13 @@
 #ifndef ISO15693TOOLS_H__
 #define ISO15693TOOLS_H__
 
 #ifndef ISO15693TOOLS_H__
 #define ISO15693TOOLS_H__
 

+#include <stdint.h>
+

 // ISO15693 CRC
 // ISO15693 CRC

-#define ISO15693_CRC_PRESET  (uint16_t)0xFFFF
-#define ISO15693_CRC_POLY    (uint16_t)0x8408

 #define ISO15693_CRC_CHECK   ((uint16_t)(~0xF0B8 & 0xFFFF))  // use this for checking of a correct crc
 #define ISO15693_CRC_CHECK   ((uint16_t)(~0xF0B8 & 0xFFFF))  // use this for checking of a correct crc

-

 uint16_t Iso15693Crc(uint8_t *v, int n);
 int Iso15693AddCrc(uint8_t *req, int n);
 char* Iso15693sprintUID(char *target, uint8_t *uid);
 uint16_t Iso15693Crc(uint8_t *v, int n);
 int Iso15693AddCrc(uint8_t *req, int n);
 char* Iso15693sprintUID(char *target, uint8_t *uid);

-unsigned short iclass_crc16(char *data_p, unsigned short length);
+unsigned short iclass_crc16(uint8_t *data_p, unsigned short length);

 
 #endif
 
 #endif