X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/76c7e6c36368c3fc23dc4fab1fe5852023c78fac..78f59945a725db88acacc772a37f32ff6debea56:/common/iso15693tools.c?ds=sidebyside

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 964059ce..01fe4889 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -6,14 +6,7 @@
 // ISO15693 CRC & other commons
 //-----------------------------------------------------------------------------
 
-
-#include "../include/proxmark3.h"
-#include <stdint.h>
-#include <stdlib.h>
-//#include "iso15693tools.h"
-
-#define POLY 0x8408
-
+#include "iso15693tools.h"
 
 // The CRC as described in ISO 15693-Part 3-Annex C
 // 	v	buffer with data
@@ -59,18 +52,18 @@ int sprintf(char *str, const char *format, ...);
 //		uid[]		the UID in transmission order
 //	return: ptr to string
 char* Iso15693sprintUID(char *target,uint8_t *uid) {
-  static char tempbuf[2*8+1]="";
-  if (target==NULL) target=tempbuf;
-  sprintf(target,"%02X%02X%02X%02X%02X%02X%02X%02X",
-  				uid[7],uid[6],uid[5],uid[4],uid[3],uid[2],uid[1],uid[0]);
-  return target;
+	static char tempbuf[2*8+1] = "";
+	if (target==NULL) target=tempbuf;
+	sprintf(target,"%02X%02X%02X%02X%02X%02X%02X%02X",
+				uid[7],uid[6],uid[5],uid[4],uid[3],uid[2],uid[1],uid[0]);
+	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);