From 4ff9ba051542564fa12a2eeb6a19b7698ac5a426 Mon Sep 17 00:00:00 2001
From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Wed, 30 Sep 2009 17:30:54 +0000
Subject: [PATCH] MSP430 model numbers.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@158 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---
 client/GoodFETMSP430.py | 28 ++++++++++++++++++++++++++++
 client/goodfet.msp430   |  1 +
 2 files changed, 29 insertions(+)

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 0e1f18f..7aff5a5 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -99,6 +99,34 @@ class GoodFETMSP430(GoodFET):
             #ident=0x0091;
         
         return ident;
+    def MSP430identstr(self):
+        """Grab model string."""
+        return self.MSP430devices.get(self.MSP430ident());
+    MSP430devices={
+        #MSP430F2xx
+        0xf227: "MSP430F22xx",
+        0xf213: "MSP430F21x1",
+        0xf249: "MSP430F24x",
+        0xf26f: "MSP430F261x",
+        
+        #MSP430F1xx
+        0xf16c: "MSP430F161x",
+        0xf149: "MSP430F13x", #or f14x(1)
+        0xf112: "MSP430F11x", #or f11x1
+        0xf143: "MSP430F14x",
+        0xf112: "MSP430F11x", #or F11x1A
+        0xf123: "MSP430F1xx", #or F123x
+        0x1132: "MSP430F1122", #or F1132
+        0x1232: "MSP430F1222", #or F1232
+        0xf169: "MSP430F16x",
+        
+        #MSP430F4xx
+        0xF449: "MSP430F43x", #or F44x
+        0xF427: "MSP430FE42x", #or FW42x, F415, F417
+        0xF439: "MSP430FG43x",
+        0xf46f: "MSP430FG46xx", #or F471xx
+        
+        }
     def MSP430test(self):
         """Test MSP430 JTAG.  Requires that a chip be attached."""
         if self.MSP430ident()==0xffff:
diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 37f7351..f9c744c 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -33,6 +33,7 @@ if(sys.argv[1]=="info"):
     print "Model    %08x " % client.MSP430deviceid();
     print "Core     %04x " % client.MSP430coreid();
     print "Identity %04x" % client.MSP430ident();
+    print "Identifies as %s" % client.MSP430identstr();
 if(sys.argv[1]=="test"):
     client.MSP430test();
 if(sys.argv[1]=="dump"):
-- 
2.20.1