X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9b255608898be5d43e958c8041127dfc399538c7..3210b50ec6b8f7f2cded84b19133988a091983ec:/client/command.c

diff --git a/client/command.c b/client/command.c
index 3370748e..ac116ea0 100644
--- a/client/command.c
+++ b/client/command.c
@@ -132,6 +132,12 @@ static void CmdHi14areader(char *str)
 	SendCommand(&c);
 }
 
+static void CmdHi14amifare(char *str)
+{
+	UsbCommand c={CMD_READER_MIFARE, {strtol(str, NULL, 0), 0, 0}};
+	SendCommand(&c);
+}
+
 static void CmdHi15reader(char *str)
 {
 	UsbCommand c={CMD_READER_ISO_15693, {strtol(str, NULL, 0), 0, 0}};
@@ -202,12 +208,6 @@ static void CmdHi14asnoop(char *str)
 	SendCommand(&c);
 }
 
-static void CmdLegicRfSim(char *str)
-{
-	UsbCommand c={CMD_SIMULATE_TAG_LEGIC_RF};
-	SendCommand(&c);
-}
-
 static void CmdLegicRfRead(char *str)
 {
 	UsbCommand c={CMD_READER_LEGIC_RF};
@@ -2821,6 +2821,7 @@ static struct {
 	{"grid",		CmdGrid,		1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
 	{"hexsamples",		CmdHexsamples,		0, "<blocks> -- Dump big buffer as hex bytes"},
 	{"hi14alist",		CmdHi14alist,		0, "List ISO 14443a history"},
+	{"hi14amifare",		CmdHi14amifare,	0, "Read out sector 0 parity error messages"},
 	{"hi14areader",		CmdHi14areader,		0, "Act like an ISO14443 Type A reader"},
 	{"hi14asim",		CmdHi14asim,		0, "<UID> -- Fake ISO 14443a tag"},
 	{"hi14asnoop",		CmdHi14asnoop,		0, "Eavesdrop ISO 14443 Type A"},
@@ -2843,10 +2844,9 @@ static struct {
 	{"hisamplest",		CmdHi14readt,		0, "Get samples HF, for testing"},
 	{"hisimlisten",		CmdHisimlisten,		0, "Get HF samples as fake tag"},
 	{"hpf",			CmdHpf,			1, "Remove DC offset from trace"},
-	{"indalademod",		CmdIndalademod,		0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
+	{"indalademod",		CmdIndalademod,		1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
 	{"lcd",			CmdLcd,			0, "<HEX command> <count> -- Send command/data to LCD"},
 	{"lcdreset",		CmdLcdReset,		0, "Hardware reset LCD"},
-	{"legicrfsim",		CmdLegicRfSim,		0, "Start the LEGIC RF tag simulator"},
 	{"legicrfread",		CmdLegicRfRead,		0, "Start the LEGIC RF reader"},
 	{"load",		CmdLoad,		1, "<filename> -- Load trace (to graph window"},
 	{"locomread",		CmdLoCommandRead,	0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
@@ -2873,7 +2873,7 @@ static struct {
 	{"tiwrite",		CmdTIWrite,		0, "Write new data to a r/w TI 134 kHz tag"},
 	{"threshold",		CmdThreshold,		1, "Maximize/minimize every value in the graph window depending on threshold"},
 	{"tune",		CmdTune,		0, "Measure antenna tuning"},
-	{"vchdemod",		CmdVchdemod,		0, "['clone'] -- Demodulate samples for VeriChip"},
+	{"vchdemod",		CmdVchdemod,		1, "['clone'] -- Demodulate samples for VeriChip"},
 	{"version",		CmdVersion,		0, "Show version inforation about the connected Proxmark"},
 	{"zerocrossings",	CmdZerocrossings,	1, "Count time between zero-crossings"},
 };
@@ -3007,7 +3007,6 @@ void UsbCommandReceived(UsbCommand *c)
 		if (c->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) goto unexpected_response;
 		int i;
 		for(i=0; i<48; i++) sample_buf[i] = c->d.asBytes[i];
-		printf("stored 48 samples\n");
 		received_command = c->cmd;
 		return;
 	default: