X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8258f409697ab41a6858ef9bdcdf406989223bbb..28b9facceaea4d2d4cb66ed240300157be42bcdc:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 7b94f8a3..80ae4bc2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -310,7 +310,7 @@ void ReadMem(int addr)
 /* osimage version information is linked in */
 extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
-extern char *_bootphase1_version_pointer, _flash_start, _flash_end;
+extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __os_size__;
 void SendVersion(void)
 {
 	char temp[512]; /* Limited data payload in USB packets */
@@ -331,10 +331,13 @@ void SendVersion(void)
 	FormatVersionInformation(temp, sizeof(temp), "os: ", &version_information);
 	DbpString(temp);
 
-	FpgaGatherVersion(temp, sizeof(temp));
+	FpgaGatherVersion(FPGA_BITSTREAM_LF, temp, sizeof(temp));
 	DbpString(temp);
-	// Send Chip ID
-	cmd_send(CMD_ACK,*(AT91C_DBGU_CIDR),0,0,NULL,0);
+	FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp));
+	DbpString(temp);
+	
+	// Send Chip ID and used flash memory
+	cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), (uint32_t)&_bootrom_end - (uint32_t)&_bootrom_start + (uint32_t)&__os_size__, 0, NULL, 0);
 }
 
 #ifdef WITH_LF
@@ -830,7 +833,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			MifareUC_Auth(c->arg[0],c->d.asBytes);
 			break;
 		case CMD_MIFAREU_READCARD:
-		case CMD_MIFAREUC_READCARD:
 			MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
 		case CMD_MIFAREUC_SETPWD: