FIX: comment out a #include to reveng (my experiment)

ADD: Started to add a NTAG203 identification.   Its a hard tag to pinpoint. Doesn't have GET_VERSION,

diff --git a/client/cmdcrc.c b/client/cmdcrc.c
index 895f360c77bdd767d43a927b86950f3192239226..6191027f0b4177117027ec48f7d2223a1a056719 100644 (file)
--- a/client/cmdcrc.c
+++ b/client/cmdcrc.c
@@ -13,7 +13,7 @@
 #include "cmdparser.h"
 #include "cmdcrc.h"
 //#include "reveng/reveng.h"
-#include "reveng/cli.h"
+//#include "reveng/cli.h"
 static int CmdHelp(const char *Cmd);
 
 int CmdCrcCalc(const char *Cmd)

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index efeda8b9d999f50398735f4e91ed7cfa8b3433e3..69f2fe44c7c739dba37ee23a9a3c1d8b9080fcce 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -331,12 +331,14 @@ int ul_print_type(uint16_t tagtype, uint8_t spaces){
                PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
        else if ( tagtype & UL_EV1_128) 
                PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+       else if ( tagtype & NTAG_203 )
+               PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301G0DU)", spacer);
        else if ( tagtype & NTAG_213 )
-               PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+               PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
        else if ( tagtype & NTAG_215 )
-               PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+               PrintAndLog("%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
        else if ( tagtype & NTAG_216 )
-               PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+               PrintAndLog("%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
        else if ( tagtype & MY_D )
                PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
        else if ( tagtype & MY_D_NFC )
@@ -559,6 +561,9 @@ uint16_t GetHF14AMfU_Type(void){
 
                        ul_switch_off_field();
                }
+               
+               //NTAG203 detection here.
+               
        } else {
                // Infinition MY-D tests   Exam high nibble 
                uint8_t nib = (card.uid[1] & 0xf0) >> 4;

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 9773b246713f44273b8bcd7a45a2cf057c207cca..23bc950a78997c153a370ba3f22bcaf355e65a14 100644 (file)
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -34,14 +34,15 @@ typedef enum TAGTYPE_UL {
        UL_EV1_48     = 0x0004,
        UL_EV1_128    = 0x0008,
        NTAG          = 0x0010,
+       NTAG_203          = 0x0020,
        NTAG_213      = 0x0020,
-       NTAG_215      = 0x0040,
-       NTAG_216      = 0x0080,
-       MY_D          = 0x0100,
-       MY_D_NFC      = 0x0200,
-       MY_D_MOVE     = 0x0400,
-       MY_D_MOVE_NFC = 0x0800,
-       MAGIC         = 0x1000,
+       NTAG_215      = 0x0080,
+       NTAG_216      = 0x0100,
+       MY_D          = 0x0200,
+       MY_D_NFC      = 0x0400,
+       MY_D_MOVE     = 0x0800,
+       MY_D_MOVE_NFC = 0x1000,
+       MAGIC         = 0x2000,
        UL_MAGIC      = UL | MAGIC,
        UL_C_MAGIC    = UL_C | MAGIC,
        UL_ERROR      = 0xFFFF,