X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1e3a799d47fc551bb9c1611c6d7db47844dd03b7..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/common/iso15693tools.c?ds=sidebyside diff --git a/common/iso15693tools.c b/common/iso15693tools.c index 0ec5492b..985e4949 100644 --- a/common/iso15693tools.c +++ b/common/iso15693tools.c @@ -6,14 +6,7 @@ // ISO15693 CRC & other commons //----------------------------------------------------------------------------- - -#include "../include/proxmark3.h" -#include -#include -//#include "iso15693tools.h" - -#define POLY 0x8408 - +#include "iso15693tools.h" // The CRC as described in ISO 15693-Part 3-Annex C // v buffer with data @@ -58,12 +51,12 @@ int sprintf(char *str, const char *format, ...); // target char* buffer, where to put the UID, if NULL a static buffer is returned // 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; +char* Iso15693sprintUID(char *target, uint8_t *uid) { + static char tempbuf[2*8+1] = {0}; + 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; } uint16_t iclass_crc16(char *data_p, unsigned short length)