SFR fixmes for Cutaway.

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

diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index 04826f4..c1892c4 100644 (file)
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -21,7 +21,7 @@ class GoodFETCC(GoodFET):
     def loadsymbols(self):
         try: self.SRF_loadsymbols();
         except:
-            if self.verbose>0: print "SmartRF not found at %s." % self.smartrfpath;
+            print "SmartRF not found at %s." % self.smartrfpath;
     def SRF_chipdom(self,chip="cc1110", doc="register_definition.xml"):
         """Loads the chip XML definitions from SmartRF7."""
         fn="%s/config/xml/%s/%s" % (self.smartrfpath,chip,doc);
@@ -939,7 +939,9 @@ class GoodFETCC(GoodFET):
         secret=self.CCpeekcodebyte(0);
         #print "Got secret %02x" % secret;
         return secret;
-
+    
+    #FIXME: This is CC1110-specific and duplicates functionality of 
+    #       SmartRF7 integration.
     CCspecfuncregs={
         'P0':0x80,
         'SP':0x81,

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 7293534..8d403c2 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -471,7 +471,7 @@ if(sys.argv[1]=="adctest"):
 if(sys.argv[1]=="config"):
     print "Config is %02x" % client.CCrd_config();
 
-if(sys.argv[1]=="specfuncreg"):
+if(sys.argv[1]=="specfuncreg" or sys.argv[1]=="sfr"):
     if len(sys.argv) > 2:
         client.getSPR(sys.argv[2:]);
     else: