X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMSP430.py;h=6d1184c8c9e90f220950f67071f155e4c11a76ef;hp=e7cc36863110d99fdf5291a30ebace9d8325ed01;hb=41777a0dda559dc2b2738720a39f3b5d57b5cee0;hpb=32cd2608110971bb8591f4bc92e7cbdf7512fbcd

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index e7cc368..6d1184c 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -5,7 +5,7 @@
 #
 # Presently being rewritten.
 
-import sys, time, string, cStringIO, struct, glob, serial, os;
+import sys, time, string, cStringIO, struct, glob, os;
 
 from GoodFET import GoodFET;
 
@@ -42,10 +42,13 @@ class GoodFETMSP430(GoodFET):
         return DeviceID;
     def peek16(self,adr,memory="vn"):
         return self.MSP430peek(adr);
+    def peek(self,adr,memory="vn"):
+        return self.MSP430peek(adr);
     def peek8(self,adr, memory="vn"):
         adr=self.MSP430peek(adr&~1);
         if adr&1==0: return adr&0xFF;
         else: return adr>>8;
+
     def MSP430peek(self,adr):
         """Read a word at an address."""
         self.data=[adr&0xff, (adr&0xff00)>>8,
@@ -79,6 +82,12 @@ class GoodFETMSP430(GoodFET):
                    val&0xff, (val&0xff00)>>8];
         self.writecmd(self.MSP430APP,0xE1,6,self.data);
         return ord(self.data[0])+(ord(self.data[1])<<8);
+    def setsecret(self,value):
+        """Set a secret word for later retreival.  Used by glitcher."""
+        self.MSP430pokeflash(0xFFFE,value);
+    def getsecret(self):
+        """Get a secret word.  Used by glitcher."""
+        return self.peek(0xfffe);
     def MSP430pokeflashblock(self,adr,data):
         """Write many words to flash memory at an address."""
         self.data=[adr&0xff, (adr&0xff00)>>8,
@@ -201,7 +210,8 @@ class GoodFETMSP430(GoodFET):
         
         print "Tests complete, erasing."
         self.MSP430masserase();
-        
+    def erase(self):
+        self.MSP430masserase();
     def MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);