X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=client%2Fgoodfet.cc;h=7dbb59ac52c4f82011cc50ac000b27d5f353699d;hb=dbd55dca7cded37fc93f74beb7c3043f11389d6e;hp=badbf7ab9aa6429a9ff6e7fecd415eb532f084ed;hpb=ea4f451d1fbdc93bb175c7b55a43f3e906219a62;p=goodfet

diff --git a/client/goodfet.cc b/client/goodfet.cc
index badbf7a..7dbb59a 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -23,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
@@ -31,11 +33,22 @@ client=GoodFETCC();
 client.serInit()
 
 #Connect to target
-client.CCsetup();
-client.CCstart();
+client.setup();
+client.start();
 
+if(sys.argv[1]=="explore"):
+    print "Exploring undefined commands."
+    print "Status: %s" %client.status();
+    
+    cmd=0x04; #read status
+    for foo in range(0,0x5):
+        client.CCcmd([(0x0F<<3)|(0x00)|0x03,0x09<<3]);
+        print "Status %02x: %s" % (foo,client.status());
+    for foo in range(0,3):
+        print "PC: %04x" % client.CCgetPC();
+        
 if(sys.argv[1]=="test"):
-    client.CCtest();
+    client.test();
 if(sys.argv[1]=="deadtest"):
     for i in range(1,10):
         print "IDENT as %s" % client.CCidentstr();
@@ -76,11 +89,53 @@ if(sys.argv[1]=="dumpdata"):
         i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="status"):
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
+if(sys.argv[1]=="info"):
+    print "%s" % client.CCidentstr();
 if(sys.argv[1]=="erase"):
-    print "Status: %s" % client.CCstatusstr();
+    print "Status: %s" % client.status();
     client.CCchiperase();
-    print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" %client.status();
+
+if(sys.argv[1]=="peekinfo"):
+    print "Select info flash."
+    client.CCwr_config(1);
+    print "Config is %02x" % client.CCrd_config();
+    
+    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
+    
+    #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];
@@ -93,18 +148,19 @@ if(sys.argv[1]=="flash"):
    
      h = IntelHex(f);
      page = 0x0000;
-     pagelen = 2048; #2kB pages in 32-bit words
+     pagelen = client.CCpagesize(); #2048; #2kB pages in 32-bit words
+     
+     print "page=%04x, pagelen=%04x" % (page,pagelen);
+     
      bcount = 0;
      
-     #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):
+         while(i>=page+pagelen):
              if bcount>0:
                  client.CCflashpage(page);
-                 client.CCeraseflashbuffer();
+                 #client.CCeraseflashbuffer();
                  bcount=0;
                  print "Flashed page at %06x" % page
              page+=pagelen;
@@ -114,11 +170,15 @@ if(sys.argv[1]=="flash"):
                                h[i]);
          bcount+=1;
          if(i%0x100==0):
-                print "%04x at %06x" % (i,page);
+                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.status();
+    client.CClockchip();
+    print "Status: %s" %client.status();
 if(sys.argv[1]=="flashpage"):
     target=0;
     if(len(sys.argv)>2):
@@ -158,6 +218,34 @@ 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]=="verify"):
+    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);
+    for i in h._buf.keys():
+        if(i>=start and i<stop):
+            peek=client.CCpeekcodebyte(i)
+            if(h[i]!=peek):
+                print "ERROR at %04x, found %02x not %02x"%(i,peek,h[i]);
+            if(i%0x100==0):
+                print "%04x" % i;
 if(sys.argv[1]=="peekcode"):
     start=0x0000;
     if(len(sys.argv)>2):
@@ -179,4 +267,4 @@ if(sys.argv[1]=="pokedata"):
     print "Poking %04x to become %02x." % (start,val);
     client.CCpokedatabyte(start,val);
 
-client.CCstop();
+client.stop();