From: iceman1001 Date: Wed, 20 May 2015 17:26:11 +0000 (+0200) Subject: CHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level. X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/623db3559bd3da895035f61cf1f1a7374f2365cf CHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level. --- diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 2200531e..0527ad4d 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -177,7 +177,7 @@ int CmdHF14AReader(const char *Cmd) //***************************************test**************** ul_switch_off_field(); - uint16_t tagT = GetHF14AMfU_Type(); + uint32_t tagT = GetHF14AMfU_Type(); ul_print_type(tagT, 0); //reconnect for further tests diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index 9d35db71..13928915 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -359,7 +359,7 @@ int ul_print_type(uint16_t tagtype, uint8_t spaces){ else if ( tagtype & MY_D_MOVE_NFC ) PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer); else - PrintAndLog("%sTYPE : Unknown %04x", spacer, tagtype); + PrintAndLog("%sTYPE : Unknown %06x", spacer, tagtype); return 0; } @@ -509,7 +509,7 @@ static int ul_magic_test(){ return UNKNOWN; } -uint16_t GetHF14AMfU_Type(void){ +uint32_t GetHF14AMfU_Type(void){ TagTypeUL_t tagtype = UNKNOWN; iso14a_card_select_t card; diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h index c20aecf1..27f9f9ca 100644 --- a/client/cmdhfmfu.h +++ b/client/cmdhfmfu.h @@ -16,7 +16,7 @@ int CmdHF14AMfucAuth(const char *Cmd); //general stuff int CmdHF14AMfUDump(const char *Cmd); int CmdHF14AMfUInfo(const char *Cmd); -uint16_t GetHF14AMfU_Type(void); +uint32_t GetHF14AMfU_Type(void); int ul_print_type(uint16_t tagtype, uint8_t spacer); void ul_switch_off_field(void);