X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETCC.py;h=a51540936069c32dfd097358c989d156c8348233;hp=7f6e3349a8369981df05c12c2b8e95ec3c65d3c6;hb=039a62c63ef19f44880a77451d0aa7c21fddc041;hpb=ecb9432850549952b9fe14b67fcf6798bbab0261

diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index 7f6e334..a515409 100644
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -50,10 +50,10 @@ class GoodFETCC(GoodFET):
         
         #print "Status: %s." % self.CCstatusstr();
         #Exit debugger
-        self.CCstop();
+        self.stop();
         print "Done.";
 
-    def CCsetup(self):
+    def setup(self):
         """Move the FET into the CC2430/CC2530 application."""
         #print "Initializing Chipcon.";
         self.writecmd(0x30,0x10,0,self.data);
@@ -67,12 +67,15 @@ class GoodFETCC(GoodFET):
     def CClockchip(self):
         """Set the flash lock bit in info mem."""
         self.writecmd(0x30, 0x9A, 0, None);
-        
+    
+
     CCversions={0x0100:"CC1110",
                 0x8500:"CC2430",
                 0x8900:"CC2431",
                 0x8100:"CC2510",
                 0x9100:"CC2511",
+                0xA500:"CC2530", #page 52 of SWRU191
+                0xB500:"CC2531",
                 0xFF00:"CCmissing"};
     def CCidentstr(self):
         ident=self.CCident();
@@ -90,6 +93,11 @@ class GoodFETCC(GoodFET):
         hi=ord(self.data[0]);
         lo=ord(self.data[1]);
         return (hi<<8)+lo;
+    def CCcmd(self,phrase):
+        self.writecmd(0x30,0x00,len(phrase),phrase);
+        val=ord(self.data[0]);
+        print "Got %02x" % val;
+        return val;
     def CCdebuginstr(self,instr):
         self.writecmd(0x30,0x88,len(instr),instr);
         return ord(self.data[0]);
@@ -103,6 +111,24 @@ class GoodFETCC(GoodFET):
         self.data=[adr&0xff, (adr&0xff00)>>8];
         self.writecmd(0x30,0x91, 2, self.data);
         return ord(self.data[0]);
+    def CCpeekirambyte(self,adr):
+        """Read the contents of IRAM at an address."""
+        self.data=[adr&0xff];
+        self.writecmd(0x30,0x02, 1, self.data);
+        return ord(self.data[0]);
+    def CCpeekiramword(self,adr):
+        """Read the little-endian contents of IRAM at an address."""
+        return self.CCpeekirambyte(adr)+(
+            self.CCpeekirambyte(adr+1)<<8);
+    def CCpokeiramword(self,adr,val):
+        self.CCpokeirambyte(adr,val&0xff);
+        self.CCpokeirambyte(adr+1,(val>>8)&0xff);
+    def CCpokeirambyte(self,adr,val):
+        """Write the contents of IRAM at an address."""
+        self.data=[adr&0xff, val&0xff];
+        self.writecmd(0x30,0x02, 2, self.data);
+        return ord(self.data[0]);
+    
     def CCpokedatabyte(self,adr,val):
         """Write a byte to data memory."""
         self.data=[adr&0xff, (adr&0xff00)>>8, val];
@@ -115,14 +141,23 @@ class GoodFETCC(GoodFET):
         """Check the status."""
         self.writecmd(0x30,0x84,0,None);
         return ord(self.data[0])
-    CCstatusbits={0x80 : "erased",
+    #Same as CC2530
+    CCstatusbits={0x80 : "erase_busy",
                   0x40 : "pcon_idle",
                   0x20 : "cpu_halted",
                   0x10 : "pm0",
                   0x08 : "halt_status",
                   0x04 : "locked",
                   0x02 : "oscstable",
-                  0x01 : "overflow"};
+                  0x01 : "overflow"
+                  };
+    CCconfigbits={0x20 : "soft_power_mode",   #new for CC2530
+                  0x08 : "timers_off",
+                  0x04 : "dma_pause",
+                  0x02 : "timer_suspend",
+                  0x01 : "sel_flash_info_page" #stricken from CC2530
+                  };
+                  
     def CCstatusstr(self):
         """Check the status as a string."""
         status=self.CCstatus();
@@ -133,7 +168,7 @@ class GoodFETCC(GoodFET):
                 str="%s %s" %(self.CCstatusbits[i],str);
             i*=2;
         return str;
-    def CCstart(self):
+    def start(self):
         """Start debugging."""
         self.writecmd(0x30,0x20,0,self.data);
         ident=self.CCidentstr();
@@ -143,7 +178,7 @@ class GoodFETCC(GoodFET):
         self.CChaltcpu();
         #print "Status: %s." % self.CCstatusstr();
         
-    def CCstop(self):
+    def stop(self):
         """Stop debugging."""
         self.writecmd(0x30,0x21,0,self.data);
     def CCstep_instr(self):