X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3d4207f3b673c479e572b960d5a307b1f73a912d..f7c1147ab81009cd48b5e28f70dc57c84f6fa2d0:/client/cmdhw.c

diff --git a/client/cmdhw.c b/client/cmdhw.c
index b561c7d4..537e6335 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -26,284 +26,122 @@ static int CmdHelp(const char *Cmd);
 
 static void lookupChipID(uint32_t iChipID, uint32_t mem_used)
 {
-	char asBuff[100];
+	char asBuff[120];
+	memset(asBuff, 0, sizeof(asBuff));
 	uint32_t mem_avail = 0;
 	
-	switch(iChipID)
-	{
-		case 0x270B0A40:
-			sprintf(asBuff,"AT91SAM7S512 Rev A");
-			break;
-		case 0x270B0A4F:
-			sprintf(asBuff,"AT91SAM7S512 Rev B");
-			break;
-		case 0x270D0940:
-			sprintf(asBuff,"AT91SAM7S256 Rev A");
-			break;
-		case 0x270B0941:
-			sprintf(asBuff,"AT91SAM7S256 Rev B");
-			break;
-		case 0x270B0942:
-			sprintf(asBuff,"AT91SAM7S256 Rev C");
-			break;
-		case 0x270B0943:
-			sprintf(asBuff,"AT91SAM7S256 Rev D");
-			break;
-		case 0x270C0740:
-			sprintf(asBuff,"AT91SAM7S128 Rev A");
-			break;
-		case 0x270A0741:
-			sprintf(asBuff,"AT91SAM7S128 Rev B");
-			break;
-		case 0x270A0742:
-			sprintf(asBuff,"AT91SAM7S128 Rev C");
-			break;
-		case 0x270A0743:
-			sprintf(asBuff,"AT91SAM7S128 Rev D");
-			break;
-		case 0x27090540:
-			sprintf(asBuff,"AT91SAM7S64 Rev A");
-			break;
-		case 0x27090543:
-			sprintf(asBuff,"AT91SAM7S64 Rev B");
-			break;
-		case 0x27090544:
-			sprintf(asBuff,"AT91SAM7S64 Rev C");
-			break;
-		case 0x27080342:
-			sprintf(asBuff,"AT91SAM7S321 Rev A");
-			break;
-		case 0x27080340:
-			sprintf(asBuff,"AT91SAM7S32 Rev A");
-			break;
-		case 0x27080341:
-			sprintf(asBuff,"AT91SAM7S32 Rev B");
-			break;
-		case 0x27050241:
-			sprintf(asBuff,"AT9SAM7S161 Rev A");
-			break;
-		case 0x27050240:
-			sprintf(asBuff,"AT91SAM7S16 Rev A");
-			break;
+	switch(iChipID) {
+		case 0x270B0A40: sprintf(asBuff,"AT91SAM7S512 Rev A"); break;
+		case 0x270B0A4F: sprintf(asBuff,"AT91SAM7S512 Rev B"); break;
+		case 0x270D0940: sprintf(asBuff,"AT91SAM7S256 Rev A"); break;
+		case 0x270B0941: sprintf(asBuff,"AT91SAM7S256 Rev B"); break;
+		case 0x270B0942: sprintf(asBuff,"AT91SAM7S256 Rev C"); break;
+		case 0x270B0943: sprintf(asBuff,"AT91SAM7S256 Rev D"); break;
+		case 0x270C0740: sprintf(asBuff,"AT91SAM7S128 Rev A"); break;
+		case 0x270A0741: sprintf(asBuff,"AT91SAM7S128 Rev B"); break;
+		case 0x270A0742: sprintf(asBuff,"AT91SAM7S128 Rev C"); break;
+		case 0x270A0743: sprintf(asBuff,"AT91SAM7S128 Rev D"); break;
+		case 0x27090540: sprintf(asBuff,"AT91SAM7S64 Rev A"); break;
+		case 0x27090543: sprintf(asBuff,"AT91SAM7S64 Rev B"); break;
+		case 0x27090544: sprintf(asBuff,"AT91SAM7S64 Rev C"); break;
+		case 0x27080342: sprintf(asBuff,"AT91SAM7S321 Rev A"); break;
+		case 0x27080340: sprintf(asBuff,"AT91SAM7S32 Rev A"); break;
+		case 0x27080341: sprintf(asBuff,"AT91SAM7S32 Rev B"); break;
+		case 0x27050241: sprintf(asBuff,"AT9SAM7S161 Rev A"); break;
+		case 0x27050240: sprintf(asBuff,"AT91SAM7S16 Rev A"); break;
 	}
 	PrintAndLog("uC: %s",asBuff);
-	switch((iChipID&0xE0)>>5)
-	{
-		case 1:
-			sprintf(asBuff,"ARM946ES");
-			break;
-		case 2:
-			sprintf(asBuff,"ARM7TDMI");
-			break;
-		case 4:
-			sprintf(asBuff,"ARM920T");
-			break;
-		case 5:
-			sprintf(asBuff,"ARM926EJS");
-			break;
+	switch( (iChipID & 0xE0) >> 5) {
+		case 1: sprintf(asBuff,"ARM946ES");	break;
+		case 2:	sprintf(asBuff,"ARM7TDMI");	break;
+		case 4:	sprintf(asBuff,"ARM920T"); break;
+		case 5:	sprintf(asBuff,"ARM926EJS"); break;
 	}
 	PrintAndLog("Embedded Processor: %s",asBuff);
-	switch((iChipID&0xF00)>>8)
-	{
-		case 0:
-			mem_avail = 0;
-			break;
-		case 1:
-			mem_avail = 8;
-			break;
-		case 2:
-			mem_avail = 16;
-			break;
-		case 3:
-			mem_avail = 32;
-			break;
-		case 5:
-			mem_avail = 64;
-			break;
-		case 7:
-			mem_avail = 128;
-			break;
-		case 9:
-			mem_avail = 256;
-			break;
-		case 10:
-			mem_avail = 512;
-			break;
-		case 12:
-			mem_avail = 1024;
-			break;
-		case 14:
-			mem_avail = 2048;
-			break;
+	switch( (iChipID & 0xF00) >> 8) {
+		case 0:  mem_avail = 0; break;
+		case 1:	 mem_avail = 8; break;
+		case 2:  mem_avail = 16; break;
+		case 3:  mem_avail = 32; break;
+		case 5:	 mem_avail = 64; break;
+		case 7:	 mem_avail = 128; break;
+		case 9:  mem_avail = 256; break;
+		case 10: mem_avail = 512; break;
+		case 12: mem_avail = 1024; break;
+		case 14: mem_avail = 2048; break;
 	}
-	PrintAndLog("Nonvolatile Program Memory Size: %dK bytes. Used: %d bytes (%2.0f\%). Free: %d bytes (%2.0f\%).", 
+	
+	uint32_t mem_left = 0;
+	if ( mem_avail > 0 ) 
+		mem_left = (mem_avail * 1024) - mem_used;
+	
+	PrintAndLog("Nonvolatile Program Memory Size: %uK bytes. Used: %u bytes (%2.0f\%). Free: %u bytes (%2.0f\%).", 
 				mem_avail, 
 				mem_used, 
-				mem_avail == 0 ? 0 : (float)mem_used/(mem_avail*1024)*100,
-				mem_avail*1024 - mem_used,
-				mem_avail == 0 ? 0 : (float)(mem_avail*1024-mem_used)/(mem_avail*1024)*100
-				);
-	switch((iChipID&0xF000)>>12)
-	{
-		case 0:
-			sprintf(asBuff,"None");
-			break;
-		case 1:
-			sprintf(asBuff,"8K bytes");
-			break;
-		case 2:
-			sprintf(asBuff,"16K bytes");
-			break;
-		case 3:
-			sprintf(asBuff,"32K bytes");
-			break;
-		case 5:
-			sprintf(asBuff,"64K bytes");
-			break;
-		case 7:
-			sprintf(asBuff,"128K bytes");
-			break;
-		case 9:
-			sprintf(asBuff,"256K bytes");
-			break;
-		case 10:
-			sprintf(asBuff,"512K bytes");
-			break;
-		case 12:
-			sprintf(asBuff,"1024K bytes");
-			break;
-		case 14:
-			sprintf(asBuff,"2048K bytes");
-			break;
+				mem_avail == 0 ? 0.0f : (float)mem_used/(mem_avail*1024)*100,
+				mem_left,
+				mem_avail == 0 ? 0.0f : (float)mem_left/(mem_avail*1024)*100
+			);
+				
+	switch( (iChipID & 0xF000) >> 12 ) {
+		case 0:	 sprintf(asBuff,"None"); break;
+		case 1:	 sprintf(asBuff,"8K bytes"); break;
+		case 2:	 sprintf(asBuff,"16K bytes"); break;
+		case 3:	 sprintf(asBuff,"32K bytes"); break;
+		case 5:  sprintf(asBuff,"64K bytes"); break;
+		case 7:  sprintf(asBuff,"128K bytes"); break;
+		case 9:  sprintf(asBuff,"256K bytes"); break;
+		case 10: sprintf(asBuff,"512K bytes"); break;
+		case 12: sprintf(asBuff,"1024K bytes");	break;
+		case 14: sprintf(asBuff,"2048K bytes"); break;
 	}
 	PrintAndLog("Second Nonvolatile Program Memory Size: %s",asBuff);
-	switch((iChipID&0xF0000)>>16)
-	{
-		case 1:
-			sprintf(asBuff,"1K bytes");
-			break;
-		case 2:
-			sprintf(asBuff,"2K bytes");
-			break;
-		case 3:
-			sprintf(asBuff,"6K bytes");
-			break;
-		case 4:
-			sprintf(asBuff,"112K bytes");
-			break;
-		case 5:
-			sprintf(asBuff,"4K bytes");
-			break;
-		case 6:
-			sprintf(asBuff,"80K bytes");
-			break;
-		case 7:
-			sprintf(asBuff,"160K bytes");
-			break;
-		case 8:
-			sprintf(asBuff,"8K bytes");
-			break;
-		case 9:
-			sprintf(asBuff,"16K bytes");
-			break;
-		case 10:
-			sprintf(asBuff,"32K bytes");
-			break;
-		case 11:
-			sprintf(asBuff,"64K bytes");
-			break;
-		case 12:
-			sprintf(asBuff,"128K bytes");
-			break;
-		case 13:
-			sprintf(asBuff,"256K bytes");
-			break;
-		case 14:
-			sprintf(asBuff,"96K bytes");
-			break;
-		case 15:
-			sprintf(asBuff,"512K bytes");
-			break;
+	switch( (iChipID & 0xF0000) >> 16) {
+		case 1:  sprintf(asBuff,"1K bytes"); break;
+		case 2:  sprintf(asBuff,"2K bytes"); break;
+		case 3:	 sprintf(asBuff,"6K bytes"); break;
+		case 4:	 sprintf(asBuff,"112K bytes"); break;
+		case 5:	 sprintf(asBuff,"4K bytes"); break;
+		case 6:	 sprintf(asBuff,"80K bytes"); break;
+		case 7:  sprintf(asBuff,"160K bytes"); break;
+		case 8:	 sprintf(asBuff,"8K bytes"); break;
+		case 9:  sprintf(asBuff,"16K bytes"); break;
+		case 10: sprintf(asBuff,"32K bytes"); break;
+		case 11: sprintf(asBuff,"64K bytes"); break;
+		case 12: sprintf(asBuff,"128K bytes"); break;
+		case 13: sprintf(asBuff,"256K bytes"); break;
+		case 14: sprintf(asBuff,"96K bytes"); break;
+		case 15: sprintf(asBuff,"512K bytes");break;
 	}
 	PrintAndLog("Internal SRAM Size: %s",asBuff);
-	switch((iChipID&0xFF00000)>>20)
-	{
-		case 0x19:
-			sprintf(asBuff,"AT91SAM9xx Series");
-			break;
-		case 0x29:
-			sprintf(asBuff,"AT91SAM9XExx Series");
-			break;
-		case 0x34:
-			sprintf(asBuff,"AT91x34 Series");
-			break;
-		case 0x37:
-			sprintf(asBuff,"CAP7 Series");
-			break;
-		case 0x39:
-			sprintf(asBuff,"CAP9 Series");
-			break;
-		case 0x3B:
-			sprintf(asBuff,"CAP11 Series");
-			break;
-		case 0x40:
-			sprintf(asBuff,"AT91x40 Series");
-			break;
-		case 0x42:
-			sprintf(asBuff,"AT91x42 Series");
-			break;
-		case 0x55:
-			sprintf(asBuff,"AT91x55 Series");
-			break;
-		case 0x60:
-			sprintf(asBuff,"AT91SAM7Axx Series");
-			break;
-		case 0x61:
-			sprintf(asBuff,"AT91SAM7AQxx Series");
-			break;
-		case 0x63:
-			sprintf(asBuff,"AT91x63 Series");
-			break;
-		case 0x70:
-			sprintf(asBuff,"AT91SAM7Sxx Series");
-			break;
-		case 0x71:
-			sprintf(asBuff,"AT91SAM7XCxx Series");
-			break;
-		case 0x72:
-			sprintf(asBuff,"AT91SAM7SExx Series");
-			break;
-		case 0x73:
-			sprintf(asBuff,"AT91SAM7Lxx Series");
-			break;
-		case 0x75:
-			sprintf(asBuff,"AT91SAM7Xxx Series");
-			break;
-		case 0x92:
-			sprintf(asBuff,"AT91x92 Series");
-			break;
-		case 0xF0:
-			sprintf(asBuff,"AT75Cxx Series");
-			break;
+	switch( (iChipID & 0xFF00000) >> 20) {
+		case 0x19: sprintf(asBuff,"AT91SAM9xx Series"); break;
+		case 0x29: sprintf(asBuff,"AT91SAM9XExx Series"); break;
+		case 0x34: sprintf(asBuff,"AT91x34 Series"); break;
+		case 0x37: sprintf(asBuff,"CAP7 Series"); break;
+		case 0x39: sprintf(asBuff,"CAP9 Series"); break;
+		case 0x3B: sprintf(asBuff,"CAP11 Series"); break;
+		case 0x40: sprintf(asBuff,"AT91x40 Series"); break;
+		case 0x42: sprintf(asBuff,"AT91x42 Series"); break;
+		case 0x55: sprintf(asBuff,"AT91x55 Series"); break;
+		case 0x60: sprintf(asBuff,"AT91SAM7Axx Series"); break;
+		case 0x61: sprintf(asBuff,"AT91SAM7AQxx Series"); break;
+		case 0x63: sprintf(asBuff,"AT91x63 Series"); break;
+		case 0x70: sprintf(asBuff,"AT91SAM7Sxx Series"); break;
+		case 0x71: sprintf(asBuff,"AT91SAM7XCxx Series"); break;
+		case 0x72: sprintf(asBuff,"AT91SAM7SExx Series"); break;
+		case 0x73: sprintf(asBuff,"AT91SAM7Lxx Series"); break;
+		case 0x75: sprintf(asBuff,"AT91SAM7Xxx Series"); break;
+		case 0x92: sprintf(asBuff,"AT91x92 Series"); break;
+		case 0xF0: sprintf(asBuff,"AT75Cxx Series"); break;
 	}
 	PrintAndLog("Architecture Identifier: %s",asBuff);
-	switch((iChipID&0x70000000)>>28)
-	{
-		case 0:
-			sprintf(asBuff,"ROM");
-			break;
-		case 1:
-			sprintf(asBuff,"ROMless or on-chip Flash");
-			break;
-		case 4:
-			sprintf(asBuff,"SRAM emulating ROM");
-			break;
-		case 2:
-			sprintf(asBuff,"Embedded Flash Memory");
-			break;
-		case 3:
-			sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size");
-			break;
+	switch( (iChipID & 0x70000000) >> 28 ) {
+		case 0: sprintf(asBuff,"ROM"); break;
+		case 1: sprintf(asBuff,"ROMless or on-chip Flash");	break;
+		case 2:	sprintf(asBuff,"Embedded Flash Memory"); break;
+		case 3:	sprintf(asBuff,"ROM and Embedded Flash Memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size");	break;
+		case 4:	sprintf(asBuff,"SRAM emulating ROM"); break;		
 	}
 	PrintAndLog("Nonvolatile Program Memory Type: %s",asBuff);
 }
@@ -384,10 +222,11 @@ int CmdSetDivisor(const char *Cmd)
 		PrintAndLog("divisor must be between 19 and 255");
 		return 1;
 	} 
-	
+	// 12 000 000 (12Mhz)
+	// 
 	clearCommandBuffer();
 	SendCommand(&c);
-	PrintAndLog("Divisor set, expected freq=%dHz", 12000000 / (c.arg[0]+1));
+	PrintAndLog("Divisor set, expected %.1f KHz", ((double)12000 / (c.arg[0]+1)) );
 	return 0;
 }
 
@@ -417,13 +256,13 @@ int CmdVersion(const char *Cmd)
 	if (resp.arg[0] == 0 && resp.arg[1] == 0) { // no cached information available
 		SendCommand(&c);
 		if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
-			PrintAndLog("Prox/RFID mark3 RFID instrument");
+			PrintAndLog("Proxmark3 RFID instrument");
 			PrintAndLog((char*)resp.d.asBytes);
 			lookupChipID(resp.arg[0], resp.arg[1]);
 		}
 	} else {
 		PrintAndLog("[[[ Cached information ]]]\n");
-		PrintAndLog("Prox/RFID mark3 RFID instrument");
+		PrintAndLog("Proxmark3 RFID instrument");
 		PrintAndLog((char*)resp.d.asBytes);
 		lookupChipID(resp.arg[0], resp.arg[1]);
 		PrintAndLog("");
@@ -443,7 +282,6 @@ int CmdStatus(const char *Cmd)
 	return 0;
 }
 
-
 int CmdPing(const char *Cmd)
 {
 	clearCommandBuffer();