X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e88c04f924abb31589f9f58691fcf94238fead63..8c0ccdef357a5a940788cb81730f4847fe47606a:/client/cmdlfem4x.c?ds=sidebyside

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index c26b4f39..6a076e33 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -14,6 +14,7 @@
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"
+#include "data.h"
 #include "graph.h"
 #include "cmdparser.h"
 #include "cmddata.h"
@@ -63,6 +64,20 @@ int CmdEM410xRead(const char *Cmd)
 	return 1;
 }
 
+int usage_lf_em410x_sim(void) {
+	PrintAndLog("Simulating EM410x tag");
+	PrintAndLog("");
+	PrintAndLog("Usage:  lf em 410xsim [h] <uid> <clock>");
+	PrintAndLog("Options:");
+	PrintAndLog("       h         - this help");
+	PrintAndLog("       uid       - uid (10 HEX symbols)");
+	PrintAndLog("       clock     - clock (32|64) (optional)");
+	PrintAndLog("samples:");
+	PrintAndLog("      lf em 410xsim 0F0368568B");
+	PrintAndLog("      lf em 410xsim 0F0368568B 32");
+	return 0;
+}
+
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
@@ -71,12 +86,7 @@ int CmdEM410xSim(const char *Cmd)
 	char cmdp = param_getchar(Cmd, 0);
 	uint8_t uid[5] = {0x00};
 
-	if (cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf em 410xsim <UID> <clock>");
-		PrintAndLog("");
-		PrintAndLog("     sample: lf em 410xsim 0F0368568B");
-		return 0;
-	}
+	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
 	/* clock is 64 in EM410x tags */
 	uint8_t clock = 64;
 
@@ -174,7 +184,7 @@ int CmdEM410xWrite(const char *Cmd)
 	int card = 0xFF; // invalid card value
 	unsigned int clock = 0; // invalid clock value
 
-	sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
+	sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);
 
 	// Check ID
 	if (id == 0xFFFFFFFFFFFFFFFF) {
@@ -753,9 +763,10 @@ int CmdEM4x05dump(const char *Cmd) {
 int usage_lf_em_write(void) {
 	PrintAndLog("Write EM4x05/EM4x69.  Tag must be on antenna. ");
 	PrintAndLog("");
-	PrintAndLog("Usage:  lf em 4x05writeword [h] <address> <data> <pwd>");
+	PrintAndLog("Usage:  lf em 4x05writeword [h] [s] <address> <data> <pwd>");
 	PrintAndLog("Options:");
 	PrintAndLog("       h         - this help");
+	PrintAndLog("       s         - swap data bit order before write");
 	PrintAndLog("       address   - memory address to write to. (0-15)");
 	PrintAndLog("       data      - data to write (hex)");	
 	PrintAndLog("       pwd       - password (hex) (optional)");
@@ -768,18 +779,23 @@ int usage_lf_em_write(void) {
 int CmdEM4x05WriteWord(const char *Cmd) {
 	uint8_t ctmp = param_getchar(Cmd, 0);
 	if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();
-	
+
 	bool usePwd = false;
-		
+
 	uint8_t addr = 16; // default to invalid address
 	uint32_t data = 0xFFFFFFFF; // default to blank data
 	uint32_t pwd = 0xFFFFFFFF; // default to blank password
-	
-	addr = param_get8ex(Cmd, 0, 16, 10);
-	data = param_get32ex(Cmd, 1, 0, 16);
-	pwd =  param_get32ex(Cmd, 2, 1, 16);
-	
-	
+	char swap = 0;
+
+	int p = 0;
+	swap = param_getchar(Cmd, 0);
+	if (swap == 's' || swap=='S') p++;
+	addr = param_get8ex(Cmd, p++, 16, 10);
+	data = param_get32ex(Cmd, p++, 0, 16);
+	pwd  = param_get32ex(Cmd, p++, 1, 16);
+
+	if (swap == 's' || swap=='S') data = SwapBits(data, 32);
+
 	if ( (addr > 15) ) {
 		PrintAndLog("Address must be between 0 and 15");
 		return 1;
@@ -788,15 +804,15 @@ int CmdEM4x05WriteWord(const char *Cmd) {
 		PrintAndLog("Writing address %d data %08X", addr, data);	
 	else {
 		usePwd = true;
-		PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);		
+		PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);
 	}
-	
+
 	uint16_t flag = (addr << 8 ) | usePwd;
-	
+
 	UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};
 	clearCommandBuffer();
 	SendCommand(&c);
-	UsbCommand resp;	
+	UsbCommand resp;
 	if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){
 		PrintAndLog("Error occurred, device did not respond during write operation.");
 		return -1;
@@ -804,7 +820,7 @@ int CmdEM4x05WriteWord(const char *Cmd) {
 	if ( !downloadSamplesEM() ) {
 		return -1;
 	}
-	//check response for 00001010 for write confirmation!	
+	//check response for 00001010 for write confirmation!
 	//attempt demod:
 	uint32_t dummy = 0;
 	int result = demodEM4x05resp(&dummy,false);