From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Tue, 23 Jun 2009 03:17:11 +0000 (+0000)
Subject: goodfet.cc commands for dumping flash and data
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=b86fb0f2dec49f42a9c9531f37b29e8815fc1384;hp=4b078450299a8de594a771f3448a1068e56e5167

goodfet.cc commands for dumping flash and data
Only data has been tested.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@56 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/client/goodfet.cc b/client/goodfet.cc
index e573679..4da29c5 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -4,14 +4,14 @@ import sys;
 import binascii;
 
 from GoodFET import GoodFET;
-from intelhex import IntelHex16bit;
+from intelhex import IntelHex;
 
 
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];
-    print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % sys.argv[0];
     print "%s flash $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
@@ -29,23 +29,41 @@ client.CCstart();
 
 if(sys.argv[1]=="test"):
     client.CCtest();
-if(sys.argv[1]=="dump"):
+if(sys.argv[1]=="dumpcode"):
     f = sys.argv[2];
-    start=0x0200;
+    start=0x0000;
     stop=0xFFFF;
     if(len(sys.argv)>3):
         start=int(sys.argv[3],16);
     if(len(sys.argv)>4):
         stop=int(sys.argv[4],16);
     
-    print "Dumping from %04x to %04x as %s." % (start,stop,f);
-    h = IntelHex16bit(None);
+    print "Dumping code from %04x to %04x as %s." % (start,stop,f);
+    h = IntelHex(None);
     i=start;
     while i<stop:
-        h[i>>1]=client.MSP430peek(i);
+        h[i>>1]=client.CCpeekcodebyte(i);
         if(i%0x100==0):
             print "Dumped %04x."%i;
-        i+=2;
+        i+=1;
+    h.write_hex_file(f);
+if(sys.argv[1]=="dumpdata"):
+    f = sys.argv[2];
+    start=0xE000;
+    stop=0xFFFF;
+    if(len(sys.argv)>3):
+        start=int(sys.argv[3],16);
+    if(len(sys.argv)>4):
+        stop=int(sys.argv[4],16);
+    
+    print "Dumping data from %04x to %04x as %s." % (start,stop,f);
+    h = IntelHex(None);
+    i=start;
+    while i<stop:
+        h[i>>1]=client.CCpeekdatabyte(i);
+        if(i%0x100==0):
+            print "Dumped %04x."%i;
+        i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="erase"):
   print "Status: %s" % client.CCstatusstr();
@@ -61,7 +79,7 @@ if(sys.argv[1]=="flash"):
     if(len(sys.argv)>4):
         stop=int(sys.argv[4],16);
     
-    h = IntelHex16bit(f);
+    h = IntelHex(f);
     
     client.MSP430masserase();
     for i in h._buf.keys():
@@ -81,7 +99,7 @@ if(sys.argv[1]=="verify"):
     if(len(sys.argv)>4):
         stop=int(sys.argv[4],16);
     
-    h = IntelHex16bit(f);
+    h = IntelHex(f);
     for i in h._buf.keys():
         if(i>=start and i<stop and i&1==0):
             peek=client.MSP430peek(i)
diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index aaae922..45a27e7 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -360,7 +360,7 @@ unsigned char peekcodebyte(unsigned long adr){
   
   //for each byte
   //CLR A
-  cc_debug(1, 0xE4, 0, 0);
+  cc_debug(2, 0xE4, 0, 0);
   //MOVC A, @A+DPTR;
   toret=cc_debug(1, 0x93, 0, 0);
   //INC DPTR