update travis config (#662)

[proxmark3-svn] / common / iso15693tools.c

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 0f7a250bf94c54651ec048474c3ced3d2b56c0f9..f121445862ceccf8c5d048cd41b2960840521d2f 100644 (file)
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -11,6 +11,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 //#include "iso15693tools.h"
 #include <stdint.h>
 #include <stdlib.h>
 //#include "iso15693tools.h"

+#ifdef ON_DEVICE
+#include "printf.h"
+#else
+#include <stdio.h>
+#endif
+

 
 #define POLY 0x8408
 
 
 #define POLY 0x8408
 


@@ -51,8 +57,6 @@ int Iso15693AddCrc(uint8_t *req, int n) {
 }
 
 
 }
 
 

-int sprintf(char *str, const char *format, ...);
-

 // returns a string representation of the UID
 // UID is transmitted and stored LSB first, displayed MSB first
 //             target    char* buffer, where to put the UID, if NULL a static buffer is returned
 // returns a string representation of the UID
 // UID is transmitted and stored LSB first, displayed MSB first
 //             target    char* buffer, where to put the UID, if NULL a static buffer is returned


@@ -66,11 +70,11 @@ char* Iso15693sprintUID(char *target,uint8_t *uid) {
   return target;
 }
 
   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 char i;
       unsigned int data;

-      unsigned int crc = 0xffff;
+         uint16_t crc = 0xffff;

 
       if (length == 0)
             return (~crc);
 
       if (length == 0)
             return (~crc);