X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.avr;h=5eee753882fa5cbc4c0b1a695acf0e7ce512dc6d;hp=241885428443519d54bd52323b818730cdfad5d9;hb=a8b686459e73c8a37df4537083a675fc21de4699;hpb=ed0549956cb25b94cbd1951be718efc1dbfdf1c9

diff --git a/client/goodfet.avr b/client/goodfet.avr
index 2418854..5eee753 100755
--- a/client/goodfet.avr
+++ b/client/goodfet.avr
@@ -28,11 +28,12 @@ client.start();
 if(sys.argv[1]=="glitch"):
     print "Identifies as %s" % client.identstr();
     client.glitchVoltages(0x880, 0xfff);
-    for i in range(1,20):
+    for i in range(1,2000):
         client.start();
-        print "Identifies as %s, fused 0x%02x" % (
+        print "Identifies as %s, fused 0x%02x; eeprom(0)=%02x" % (
             client.identstr(),
-            client.lockbits());
+            client.lockbits(),
+            client.eeprompeek(0));
 if(sys.argv[1]=="glitchgraph"):
     print "Identifies as %s" % client.identstr();
     for voltage in range(0x860,0x890,5):
@@ -50,7 +51,7 @@ if(sys.argv[1]=="glitchgraph"):
         print "%04x %s" % (voltage,str);
         #print "%f, %i" % (voltage*(3.3/4096.0),count);
 if(sys.argv[1]=="info"):
-    print "Identifies as %s" % client.identstr();
+    print "Identifies as %s, lock=%02x" % (client.identstr(),client.lockbits());
 if(sys.argv[1]=="erase"):
     print "Erasing %s" % client.identstr();
     client.erase();
@@ -58,7 +59,22 @@ if(sys.argv[1]=="lockbits"):
     print "Lockbits are 0x%02x" % client.lockbits();
     if(len(sys.argv)>2):
         print "Lockbits set 0x%02x" %  client.setlockbits(int(sys.argv[2],16));
-#if(sys.argv[1]=="lock"):
+if(sys.argv[1]=="lock"):
+    client.setlockbits(0xFC);
+
+if(sys.argv[1]=="unlock"):
+    print "Identifies as %s" % client.identstr();
+    client.glitchVoltages(0x880, 0xfff);
+    for i in range(1,20):
+        client.start();
+        print "Identifies as %s, fused 0x%02x; eeprom(0)=%02x" % (
+            client.identstr(),
+            client.lockbits(),
+            client.eeprompeek(0));
+        if(client.lockbits()==0xFF):
+            client.setlockbits(0xFF);
+            print "Chip unlocked!"
+            exit();
 #if(sys.argv[1]=="unlock"):