From: iceman1001 <iceman@iuse.se>
Date: Fri, 26 Dec 2014 21:38:23 +0000 (+0100)
Subject: FIX: minor fixes to the new feature in "hf 14a reader".  Not turning off the field... 
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/9c7c222c035156c33766daec6c635113414eab41?ds=sidebyside;hp=-c

FIX: minor fixes to the new feature in "hf 14a reader".  Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO)
---

9c7c222c035156c33766daec6c635113414eab41
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index ee2132ef..b84d0484 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1127,9 +1127,7 @@ void MifareCIdent(){
 	
 	uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
 	uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
-	
-	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-	
+
 	ReaderTransmitBitsPar(wupC1,7,0, NULL);
 	if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
 		isOK = 0;
@@ -1145,6 +1143,5 @@ void MifareCIdent(){
 	};
 
 	cmd_send(CMD_ACK,isOK,0,0,0,0);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 }
 
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 27f0ac36..5798fee6 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -376,6 +376,7 @@ int CmdHF14AReader(const char *Cmd)
 	PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
 	
 	// disconnect
+	c.cmd = CMD_READER_ISO_14443a;
 	c.arg[0] = 0;
 	c.arg[1] = 0;
 	c.arg[2] = 0;
diff --git a/client/mifarehost.c b/client/mifarehost.c
index 41ea1030..3516fca4 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -236,7 +236,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *oldUID, bool wantWipe) {
 	memcpy(block0, uid, 4); 
 	block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC
 	// mifare classic SAK(byte 5) and ATQA(byte 6 and 7)
-	block0[5] = 0x88;
+	block0[5] = 0x08;
 	block0[6] = 0x04;
 	block0[7] = 0x00;
 	
@@ -246,7 +246,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *oldUID, bool wantWipe) {
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {
 
 	uint8_t isOK = 0;
-	UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
+	UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
 	memcpy(c.d.asBytes, data, 16); 
 	SendCommand(&c);
 
@@ -265,7 +265,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
 	uint8_t isOK = 0;
 
-	UsbCommand c = {CMD_MIFARE_EML_CGETBLOCK, {params, 0, blockNo}};
+	UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
 	SendCommand(&c);
 
   UsbCommand resp;