]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
Added more informations at command hw version. Now we can get some informations of...
authorjonor@live.it <jonor@live.it@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Fri, 4 Oct 2013 18:54:10 +0000 (18:54 +0000)
committerjonor@live.it <jonor@live.it@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Fri, 4 Oct 2013 18:54:10 +0000 (18:54 +0000)
Maybe is useful when someone got a bigger AT91

Example:
#db# Prox/RFID mark3 RFID instrument
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07
#db# os: svn 796-unclean 2013-10-04 18:50:44
#db# FPGA image built on 2013/ 9/26 at  9:17:32
uC: AT91SAM7S256 Rev B
Embedded Processor: ARM7TDMI
Nonvolatile Program Memory Size: 256K bytes
Second Nonvolatile Program Memory Size: None
Internal SRAM Size: 64K bytes
Architecture Identifier: AT91SAM7Sxx Series
Nonvolatile Program Memory Type: Embedded Flash Memory

armsrc/appmain.c
client/cmdhw.c

index 4477a12025d043df0e5969af81a867ab3adca182..b5a85deba690cef7d98e0a4629a16b4d163f218b 100644 (file)
@@ -356,6 +356,8 @@ void SendVersion(void)
 
        FpgaGatherVersion(temp, sizeof(temp));
        DbpString(temp);
+       // Send Chip ID
+       cmd_send(CMD_ACK,*(AT91C_DBGU_CIDR),0,0,NULL,0);
 }
 
 #ifdef WITH_LF
index dd1f37b3c5be343f20ad86d1e006c1c91e590143..4f0f3e38a9a6ddd2f109c0c995d30334af4bfbd2 100644 (file)
 #include "proxmark3.h"
 #include "cmdparser.h"
 #include "cmdhw.h"
+#include "cmdmain.h"
 
 /* low-level hardware control */
 
 static int CmdHelp(const char *Cmd);
 
+static void lookupChipID(uint32_t iChipID)
+{
+       char asBuff[100];
+       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;
+       }
+       PrintAndLog("Embedded Processor: %s",asBuff);
+       switch((iChipID&0xF00)>>8)
+       {
+               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("Nonvolatile Program Memory Size: %s",asBuff);
+       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;
+       }
+       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;
+       }
+       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;
+       }
+       PrintAndLog("Nonvolatile Program Memory Type: %s",asBuff);
+}
+
 int CmdDetectReader(const char *Cmd)
 {
   UsbCommand c={CMD_LISTEN_READER_FIELD};
@@ -122,7 +399,11 @@ int CmdTune(const char *Cmd)
 int CmdVersion(const char *Cmd)
 {
   UsbCommand c = {CMD_VERSION};
+  UsbCommand resp;
   SendCommand(&c);
+  if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+      lookupChipID(resp.arg[0]);
+  }
   return 0;
 }
 
Impressum, Datenschutz