Serial number support, at 0xFFB0.

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

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 671bccd..4d54fd9 100644 (file)
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -64,7 +64,10 @@ class GoodFETMSP430(GoodFET):
                    (adr&0xff0000)>>16,(adr&0xff000000)>>24,
                    val&0xff, (val&0xff00)>>8];
         self.writecmd(self.MSP430APP,0x03,6,self.data);
-        return ord(self.data[0])+(ord(self.data[1])<<8);
+        written=ord(self.data[0])+(ord(self.data[1])<<8);
+        if(written!=val):
+            print "Failed to write 0x%04x to 0x$04x" % (val,adr);
+        return written;
     def MSP430pokeflash(self,adr,val):
         """Write the contents of flash memory at an address."""
         self.data=[adr&0xff, (adr&0xff00)>>8,
@@ -193,6 +196,10 @@ class GoodFETMSP430(GoodFET):
     def MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);
+    def MSP430infoerase(self):
+        """Erase MSP430 info flash."""
+        self.writecmd(self.MSP430APP,0xE8,0,None);
+
     def MSP430setPC(self, pc):
         """Set the program counter."""
         self.writecmd(self.MSP430APP,0xC2,2,[pc&0xFF,(pc>>8)&0xFF]);

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index c5413c5..bac20f2 100755 (executable)
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -12,9 +12,11 @@ if(len(sys.argv)==1):
     print "%s test" % sys.argv[0];
     print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % sys.argv[0];
+    print "%s eraseinfo" % 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];
     print "%s poke 0x$adr 0x$val" % sys.argv[0];
+    print "%s serial [$val]" % sys.argv[0];
     print "%s peek 0x$start [0x$stop]" % sys.argv[0];
     print "%s run" % sys.argv[0];
     sys.exit();
@@ -30,8 +32,6 @@ client.setup();
 #Identify model number.
 client.start();
 
-#print "started"
-
 if(sys.argv[1]=="info"):
     #print "Model    %08x " % client.MSP430deviceid();
     #print "Core     %04x " % client.MSP430coreid();
@@ -65,13 +65,19 @@ if(sys.argv[1]=="dump"):
             i+=1;
     h.write_hex_file(f);
 if(sys.argv[1]=="erase"):
+    print "Erasing main flash memory."
     client.MSP430masserase();
+if(sys.argv[1]=="eraseinfo"):
+    print "Erasing info memory."
+    client.MSP430infoerase();
+
+
 if(sys.argv[1]=="ivt"):
     client.MSP430dumpmem(0xFFE0,0xFFFF);
 if(sys.argv[1]=="flash"):
     f=sys.argv[2];
     start=0;
-    stop=0xFFFF;
+    stop=0x10000;
     if(len(sys.argv)>3):
         start=int(sys.argv[3],16);
     if(len(sys.argv)>4):
@@ -101,10 +107,6 @@ if(sys.argv[1]=="flash"):
                 first=i;
             last=i;
             count+=2;
-            #val2=client.MSP430pokeflash(i,val);
-            #if(val!=val2):
-            #    print "Write error at %04x, %04x!=%04x." %(
-            #        i, val, val2);
             vals+=[val&0xff,(val&0xff00)>>8];
             if(i%0x100==0):
                 print "%04x" % i;
@@ -148,10 +150,23 @@ if(sys.argv[1]=="poke"):
         val=int(sys.argv[3],16);
     print "Poking %06x to become %04x." % (start,val);
     
-    while client.MSP430peek(start)!=val:
-        client.MSP430pokeflash(start,val);
+    while client.MSP430peek(start)&(~val)>0:
+        client.MSP430pokeflashblock(start,[val&0xFF, (val>>8)&0xFF]);
         print "Poked to %04x" % client.MSP430peek(start);
-
+if(sys.argv[1]=="serial"):
+    oid=0xdeadbeef;
+    if(len(sys.argv)>2):
+        oid=eval(sys.argv[2]);
+    else:
+        oid=input("Serial Number?");
+    adr=0xFFB0;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    if(len(sys.argv)>3):
+        val=int(sys.argv[3],16);
+    print "Poking 32-bit OID to 0x%04x as %08x." % (adr,oid);
+    client.MSP430pokeflash(adr,oid&0xFFFF);
+    client.MSP430pokeflash(adr+2,(oid>>16)&0xFFFF);
 
 if(sys.argv[1]=="run"):
     #Set PC to RESET vector's value.