X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=3f2860dc9de8158c34cdc6360f9ec1136f49b550;hp=d2ba3e638ad5ec35cf768fdcdc17d11f14fd2482;hb=6648c78f1f6eca1ff5bc477d10b12c2125f31285;hpb=3dde040c1eb050de56c26df2b9bb4b044734630a

diff --git a/client/goodfet.cc b/client/goodfet.cc
index d2ba3e6..3f2860d 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -1,9 +1,14 @@
 #!/usr/bin/env python
+# GoodFET Chipcon Example
+# 
+# (C) 2009 Travis Goodspeed <travis at radiantmachines.com>
+#
+# This code is being rewritten and refactored.  You've been warned!
 
 import sys;
 import binascii;
 
-from GoodFET import GoodFETCC;
+from GoodFETCC import GoodFETCC;
 from intelhex import IntelHex;
 
 
@@ -18,7 +23,9 @@ if(len(sys.argv)==1):
     print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s peekdata 0x$start [0x$stop]" % sys.argv[0];
     print "%s pokedata 0x$adr 0x$val" % sys.argv[0];
-    #print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
+    print "%s peek 0x$iram" % sys.argv[0];
+    print "%s poke 0x$iram 0x$val" % sys.argv[0];
+    print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
     sys.exit();
 
 #Initailize FET and set baud rate
@@ -33,7 +40,7 @@ if(sys.argv[1]=="test"):
     client.CCtest();
 if(sys.argv[1]=="deadtest"):
     for i in range(1,10):
-        print "IDENT as %s" % self.CCidentstr();
+        print "IDENT as %s" % client.CCidentstr();
 if(sys.argv[1]=="dumpcode"):
     f = sys.argv[2];
     start=0x0000;
@@ -47,7 +54,7 @@ if(sys.argv[1]=="dumpcode"):
     h = IntelHex(None);
     i=start;
     while i<=stop:
-        h[i>>1]=client.CCpeekcodebyte(i);
+        h[i]=client.CCpeekcodebyte(i);
         if(i%0x100==0):
             print "Dumped %04x."%i;
         i+=1;
@@ -77,24 +84,98 @@ if(sys.argv[1]=="erase"):
     client.CCchiperase();
     print "Status: %s" %client.CCstatusstr();
 
-# if(sys.argv[1]=="flash"):
-#     f=sys.argv[2];
-#     start=0;
-#     stop=0xFFFF;
-#     if(len(sys.argv)>3):
-#         start=int(sys.argv[3],16);
-#     if(len(sys.argv)>4):
-#         stop=int(sys.argv[4],16);
+if(sys.argv[1]=="peekinfo"):
+    print "Select info flash."
+    client.CCwr_config(1);
+    print "Config is %02x" % client.CCrd_config();
     
-#     h = IntelHex(f);
+    start=0x0000;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    stop=start;
+    if(len(sys.argv)>3):
+        stop=int(sys.argv[3],16);
+    print "Peeking from %04x to %04x." % (start,stop);
+    while start<=stop:
+        print "%04x: %02x" % (start,client.CCpeekcodebyte(start));
+        start=start+1;
+if(sys.argv[1]=="poke"):
+    client.CCpokeirambyte(int(sys.argv[2],16),
+                          int(sys.argv[3],16));
+if(sys.argv[1]=="randtest"):
+    #Seed RNG
+    client.CCpokeirambyte(0xBD,0x01); #RNDH=0x01
+    client.CCpokeirambyte(0xB4,0x04); #ADCCON1=0x04
+    client.CCpokeirambyte(0xBD,0x01); #RNDH=0x01
+    client.CCpokeirambyte(0xB4,0x04); #ADCCON1=0x04
     
-#     client.CCchiperase();
-#     for i in h._buf.keys():
-#         #print "%04x: %04x"%(i,h[i>>1]);
-#         if(i>=start and i<=stop  and i&1==0):
-#             client.CCwriteflash(i,h[i>>1]);
-#             if(i%0x100==0):
-#                 print "%04x" % i;
+    #Dump values
+    for foo in range(1,10):
+        print "%02x" % client.CCpeekirambyte(0xBD); #RNDH
+        client.CCpokeirambyte(0xB4,0x04); #ADCCON1=0x04
+        client.CCreleasecpu();
+        client.CChaltcpu();
+    print "%02x" % client.CCpeekdatabyte(0xDF61); #CHIP ID
+if(sys.argv[1]=="adctest"):
+    # ADCTest 0xDF3A 0xDF3B
+    print "ADC TEST %02x%02x" % (
+        client.CCpeekdatabyte(0xDF3A),
+        client.CCpeekdatabyte(0xDF3B));
+if(sys.argv[1]=="config"):
+    print "Config is %02x" % client.CCrd_config();
+
+if(sys.argv[1]=="flash"):
+     f=sys.argv[2];
+     start=0;
+     stop=0xFFFF;
+     if(len(sys.argv)>3):
+         start=int(sys.argv[3],16);
+     if(len(sys.argv)>4):
+         stop=int(sys.argv[4],16);
+   
+     h = IntelHex(f);
+     page = 0x0000;
+     pagelen = 2048; #2kB pages in 32-bit words
+     bcount = 0;
+     
+     print "Wiping Flash."
+     #Wipe all of flash.
+     #client.CCchiperase();
+     #Wipe the RAM buffer for the next flash page.
+     #client.CCeraseflashbuffer();
+     for i in h._buf.keys():
+         while(i>page+pagelen):
+             if bcount>0:
+                 client.CCflashpage(page);
+                 #client.CCeraseflashbuffer();
+                 bcount=0;
+                 print "Flashed page at %06x" % page
+             page+=pagelen;
+             
+         #Place byte into buffer.
+         client.CCpokedatabyte(0xF000+i-page,
+                               h[i]);
+         bcount+=1;
+         if(i%0x100==0):
+                print "Buffering %04x toward %06x" % (i,page);
+     #last page
+     client.CCflashpage(page);
+     print "Flashed final page at %06x" % page;
+     
+if(sys.argv[1]=="lock"):
+    print "Status: %s" %client.CCstatusstr();
+    client.CClockchip();
+    print "Status: %s" %client.CCstatusstr();
+if(sys.argv[1]=="flashpage"):
+    target=0;
+    if(len(sys.argv)>2):
+        target=int(sys.argv[2],16);
+    print "Writing a page of flash from 0xF000 in XDATA"
+    client.CCflashpage(target);
+if(sys.argv[1]=="erasebuffer"):
+    print "Erasing flash buffer.";
+    client.CCeraseflashbuffer();
+
 if(sys.argv[1]=="writedata"):
     f=sys.argv[2];
     start=0;
@@ -124,6 +205,18 @@ if(sys.argv[1]=="peekdata"):
     while start<=stop:
         print "%04x: %02x" % (start,client.CCpeekdatabyte(start));
         start=start+1;
+if(sys.argv[1]=="peek"):
+    start=0x0000;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    stop=start;
+    if(len(sys.argv)>3):
+        stop=int(sys.argv[3],16);
+    print "Peeking from %04x to %04x." % (start,stop);
+    while start<=stop:
+        print "%04x: %02x" % (start,client.CCpeekirambyte(start));
+        start=start+1;
+
 if(sys.argv[1]=="peekcode"):
     start=0x0000;
     if(len(sys.argv)>2):