X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c068ebb78f2e4070fcf1a604df0d7088374b60c6..a7474bb30acb4881fe57db4c8ce0778823efa501:/client/cmdhftopaz.c

diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 4b575b27..aab1d248 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -21,6 +21,7 @@
 #include "proxmark3.h"
 #include "iso14443crc.h"
 #include "protocols.h"
+#include "cmdhf.h"
 
 #define TOPAZ_MAX_MEMORY	2048
 
@@ -33,7 +34,6 @@ static struct {
 	uint8_t *dynamic_reserved_areas;
 } topaz_tag;
 
-
 static void topaz_switch_on_field(void)
 {
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_SELECT | ISO14A_NO_DISCONNECT | ISO14A_TOPAZMODE, 0, 0}};
@@ -252,8 +252,7 @@ static void topaz_print_NDEF(uint8_t *data)
 }
 
 	
-int CmdHFTopazReader(const char *Cmd)
-{
+int CmdHFTopazReader(const char *Cmd) {
 	int status;
 	uint8_t atqa[2];
 	uint8_t rid_response[8];
@@ -349,10 +348,16 @@ int CmdHFTopazReader(const char *Cmd)
 
 	PrintAndLog("");
 	bool lock_TLV_present = topaz_print_lock_control_TLVs(&topaz_tag.data_blocks[1][4]);
-
+	if ( lock_TLV_present ) {
+		PrintAndLog("");	
+	}
+	
 	PrintAndLog("");
 	bool reserved_mem_present = topaz_print_reserved_memory_control_TLVs(&topaz_tag.data_blocks[1][4]);
-
+	if (reserved_mem_present) {
+		PrintAndLog("");	
+	}
+	
 	topaz_print_lifecycle_state(&topaz_tag.data_blocks[1][0]);
 
 	topaz_print_NDEF(&topaz_tag.data_blocks[1][0]);
@@ -361,24 +366,23 @@ int CmdHFTopazReader(const char *Cmd)
 	return 0;
 }
 
-
-int CmdHFTopazSim(const char *Cmd)
-{
+int CmdHFTopazSim(const char *Cmd) {
 	PrintAndLog("not yet implemented");
 	return 0;
 }
 
-
-int CmdHFTopazCmdRaw(const char *Cmd)
-{
+int CmdHFTopazCmdRaw(const char *Cmd) {
 	PrintAndLog("not yet implemented");
 	return 0;
 }
 
+int CmdHFTopazList(const char *Cmd) {
+	CmdHFList("topaz");
+	return 0;
+}
 
 static int CmdHelp(const char *Cmd);
 
-
 static command_t CommandTable[] = 
 {
 	{"help",	CmdHelp,			1, "This help"},
@@ -386,10 +390,10 @@ static command_t CommandTable[] =
 	{"sim",		CmdHFTopazSim,		0, "<UID> -- Simulate Topaz tag"},
 	{"sniff",	CmdHF14ASniff,		0, "Sniff Topaz reader-tag communication"},
 	{"raw",		CmdHFTopazCmdRaw,	0, "Send raw hex data to tag"},
+	{"list",	CmdHFTopazList,		0, "[Deprecated] List Topaz history"},
 	{NULL,		NULL,				0, NULL}
 };
 
-
 int CmdHFTopaz(const char *Cmd) {
 	// flush
 	WaitForResponseTimeout(CMD_ACK,NULL,100);