X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/823ad2e186601e91359de071ac303d3464ba39d1..650cd714c4527d6c6d054d12e7202bf3587393d0:/client/cmdhf14a.c?ds=sidebyside

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index fe308746..b404d449 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -64,7 +64,7 @@ const manufactureName manufactureMapping[] = {
 	{ 0x17, "KSW Microtec GmbH Germany" },
 	{ 0x18, "ZMD AG Germany" },
 	{ 0x19, "XICOR, Inc. USA" },
-	{ 0x1A, "Sony Corporation Japan Identifier Company Country" },
+	{ 0x1A, "Sony Corporation Japan" },
 	{ 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
 	{ 0x1C, "Emosyn USA" },
 	{ 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
@@ -94,7 +94,7 @@ const manufactureName manufactureMapping[] = {
 	{ 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
 	{ 0x36, "IDS Microchip AG Switzerland" },
 	{ 0x37, "Kovio USA" },
-	{ 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
+	{ 0x38, "HMT Microelectronic Ltd Switzerland" },
 	{ 0x39, "Silicon Craft Technology Thailand" },
 	{ 0x3A, "Advanced Film Device Inc. Japan" },
 	{ 0x3B, "Nitecrest Ltd UK" },
@@ -106,7 +106,7 @@ const manufactureName manufactureMapping[] = {
 	{ 0x41, "Renesas Electronics Corporation Japan" },
 	{ 0x42, "3Alogics Inc Korea" },
 	{ 0x43, "Top TroniQ Asia Limited Hong Kong" },
-	{ 0x44, "Gentag Inc (USA) USA" },
+	{ 0x44, "Gentag Inc. USA" },
 	{ 0x00, "no tag-info available" } // must be the last entry
 };
 
@@ -184,7 +184,7 @@ int CmdHF14AReader(const char *Cmd) {
 	clearCommandBuffer();
 	SendCommand(&c);
 	UsbCommand resp;
-	WaitForResponse(CMD_ACK,&resp);
+	WaitForResponse(CMD_ACK, &resp);
 	
 	iso14a_card_select_t card;
 	memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
@@ -655,14 +655,17 @@ int CmdHF14ACmdRaw(const char *cmd) {
 		c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
 	}
 
-    if(power)
+    if(power) {
         c.arg[0] |= ISO14A_NO_DISCONNECT;
-
-    if(datalen>0)
+	}
+	
+    if(datalen>0) {
         c.arg[0] |= ISO14A_RAW;
-
-	if(topazmode)
+	}
+	
+	if(topazmode) {
 		c.arg[0] |= ISO14A_TOPAZMODE;
+	}
 			
 	// Max buffer is USB_CMD_DATA_SIZE
 	datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;