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 2200531eb99408e8f5df5780815e8a1ed97821ef..0527ad4d7bcee4eaa846d8961f08492d273f430c 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -177,7 +177,7 @@ int CmdHF14AReader(const char *Cmd)
                        //***************************************test****************
                        ul_switch_off_field();
                        
                        //***************************************test****************
                        ul_switch_off_field();
                        

-                       uint16_t tagT = GetHF14AMfU_Type();
+                       uint32_t tagT = GetHF14AMfU_Type();

                        ul_print_type(tagT, 0);
 
                        //reconnect for further tests
                        ul_print_type(tagT, 0);
 
                        //reconnect for further tests

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 9d35db71994797224c40754000625c65a168a64a..139289156adda9ed649c55d780c3ab4eb1e9d340 100644 (file)
--- 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
        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;
 }
 
        return 0;
 }
 


@@ -509,7 +509,7 @@ static int ul_magic_test(){
        return UNKNOWN;
 }
 
        return UNKNOWN;
 }
 

-uint16_t GetHF14AMfU_Type(void){
+uint32_t GetHF14AMfU_Type(void){

 
        TagTypeUL_t tagtype = UNKNOWN;
        iso14a_card_select_t card;
 
        TagTypeUL_t tagtype = UNKNOWN;
        iso14a_card_select_t card;

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index c20aecf10dc8ec148a5a413f008ea5fe82ea3ed2..27f9f9ca076da49a0bc0c5744ec8f73769ae10b0 100644 (file)
--- 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);
 //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);
 
 int ul_print_type(uint16_t tagtype, uint8_t spacer);
 void ul_switch_off_field(void);