X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ba52aac40e399e8ae7b0e4eadbafb19b5b2a5a0e..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/client/cmdlfpcf7931.c?ds=inline

diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index e1461122..5cc576fe 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -65,11 +65,11 @@ int usage_pcf7931_write(){
 	PrintAndLog("This command tries to write a PCF7931 tag.");
 	PrintAndLog("Options:");
 	PrintAndLog("       h 			   This help");
-	PrintAndLog("       blockaddress   Block to save");
-	PrintAndLog("       byteaddress    Index of byte inside block to overwrite");
-	PrintAndLog("       data           one byte of data");
+	PrintAndLog("       blockaddress   Block to save [0-7]");
+	PrintAndLog("       byteaddress    Index of byte inside block to write [0-15]");
+	PrintAndLog("       data           one byte of data (hex)");
 	PrintAndLog("Examples:");
-	PrintAndLog("      lf pcf7931 write 10 1 FF");
+	PrintAndLog("      lf pcf7931 write 2 1 FF");
 	return 0;
 }
 
@@ -131,22 +131,20 @@ int CmdLFPCF7931Write(const char *Cmd){
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();	
 
-	uint64_t blockaddress = param_get64ex(Cmd, 0, 0, 16);
-	uint64_t byteaddress =  param_get64ex(Cmd, 1, 0, 16);
-	uint8_t data = param_get8ex(Cmd,2,0,16);
-
-	if ( blockaddress == 0 ) {
-		PrintAndLog("Please specify the block address in hex");
-		return 1;
-	}
-
-	PrintAndLog("Please specify the byte address in hex");
-	PrintAndLog("Please specify the data in hex (1 byte)");
+	uint8_t block = 0, bytepos = 0, data = 0;
+	
+	if ( param_getdec(Cmd, 0, &block) ) return usage_pcf7931_write();
+	if ( param_getdec(Cmd, 1, &bytepos) ) return usage_pcf7931_write();
+	
+	if ( (block > 7) || (bytepos > 15) ) return usage_pcf7931_write();
 
-	PrintAndLog("", blockaddress, byteaddress, data);
-	return 3;
+	data 	= param_get8ex(Cmd, 2, 0, 16);
+	
+	PrintAndLog("Writing block: %d", block);
+	PrintAndLog("          pos: %d", bytepos);
+	PrintAndLog("         data: 0x%02X", data);
 
-	UsbCommand c = {CMD_PCF7931_WRITE, { blockaddress, byteaddress, data} };
+	UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data} };
 	memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd) );
     c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
     c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
@@ -161,20 +159,19 @@ int CmdLFPCF7931Write(const char *Cmd){
 static command_t CommandTable[] = 
 {
 	{"help", 	CmdHelp,			1, "This help"},
-	{"read", 	CmdLFPCF7931Read,	1, "Read content of a PCF7931 transponder"},
-	{"write",	CmdLFPCF7931Write,	1, "Write data on a PCF7931 transponder."},
+	{"read",   CmdLFPCF7931Read,   0, "Read content of a PCF7931 transponder"},
+	{"write",  CmdLFPCF7931Write,  0, "Write data on a PCF7931 transponder."},
 	{"config",	CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
 	{NULL, NULL, 0, NULL}
 };
 
-int CmdLFPCF7931(const char *Cmd)
-{
+int CmdLFPCF7931(const char *Cmd) {
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
 	CmdsHelp(CommandTable);
 	return 0;
 }