X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f2d46122d30004b152f9c581a438b9939707bab9..3f267966732831e7567dc7c013fb878dd2333779:/client/cmdhf15.c

diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index 1263329e..caf0799e 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -175,9 +175,9 @@ const productName uidmapping[] = {
 	{ 0xE02E000000000000LL, 16, "Broadcom Corporation USA" },
 	{ 0xE02F000000000000LL, 16, "MStar Semiconductor, Inc Taiwan, ROC" },
 	{ 0xE030000000000000LL, 16, "BeeDar Technology Inc. USA" },
-	{ 0xE031000000000000LL, 16, " RFIDsec Denmark" },
-	{ 0xE032000000000000LL, 16, " Schweizer Electronic AG Germany" },
-	{ 0xE033000000000000LL, 16, " AMIC Technology Corp Taiwan" }, 
+	{ 0xE031000000000000LL, 16, "RFIDsec Denmark" },
+	{ 0xE032000000000000LL, 16, "Schweizer Electronic AG Germany" },
+	{ 0xE033000000000000LL, 16, "AMIC Technology Corp Taiwan" }, 
 	{ 0xE034000000000000LL, 16, "Mikron JSC Russia" },
 	{ 0xE035000000000000LL, 16, "Fraunhofer Institute for Photonic Microsystems Germany" },
 	{ 0xE036000000000000LL, 16, "IDS Microchip AG Switzerland" },
@@ -374,6 +374,20 @@ int CmdHF15Record(const char *Cmd)
 	return 0;
 }
 
+int HF15Reader(const char *Cmd, bool verbose)
+{
+	uint8_t uid[8];
+
+	if (!getUID(uid)) {
+		if (verbose) PrintAndLog("No Tag found.");
+		return 0;
+	}
+
+	PrintAndLog("Tag UID : %s",sprintUID(NULL,uid));
+	PrintAndLog("Tag Info: %s",getTagInfo(uid));
+	return 1;
+}
+
 int CmdHF15Reader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_15693, {strtol(Cmd, NULL, 0), 0, 0}};
@@ -469,7 +483,7 @@ int CmdHF15DumpMem(const char*Cmd) {
 					// PrintAndLog("bn=%i",blocknum);
 				} else {
 					PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-					return 0;
+					return 1;
 				}
 			} // else PrintAndLog("crc");
 		} // else PrintAndLog("r null");
@@ -481,7 +495,7 @@ int CmdHF15DumpMem(const char*Cmd) {
 //		PrintAndLog("CRC Failed");
 //	else 
 //		PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1])); 
-	return 0;
+	return 1;
 }
 
 
@@ -782,6 +796,8 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
 		PrintAndLog("               s         selected tag");
 		PrintAndLog("               u         unaddressed mode");
 		PrintAndLog("               *         scan for tag");
+		PrintAndLog("           start#:       page number to start 0-255");  
+		PrintAndLog("           count#:       number of pages");  
 		return 0;
 	}