From 43735da2125b015ee7ecaaf4fa7c1ba997a7a9ac Mon Sep 17 00:00:00 2001
From: Daniel Beer <dlbeer@gmail.com>
Date: Mon, 22 Oct 2012 16:43:07 +1300
Subject: [PATCH] fet: fix support for MSP430F2418/2618.

---
 drivers/fet_db.c | 58 ++++++++++--------------------------------------
 1 file changed, 12 insertions(+), 46 deletions(-)

diff --git a/drivers/fet_db.c b/drivers/fet_db.c
index 02b563b..3bcd2fe 100644
--- a/drivers/fet_db.c
+++ b/drivers/fet_db.c
@@ -468,8 +468,8 @@ static const struct fet_db_record fet_db[] = {
 			0x00, 0x00
 		}
 	},
-	{ /* copied from MSP430F2616, with modifications */
-		.name = "MSP430F2618",
+	{ /* from Olimex DB */
+		.name = "MSP430F2x18",
 		.msg28_data = {
 			0xf2, 0x6f, 0x05, 0x60, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00, 0x02, 0x13, 0x01, 0x00, 0xf4, 0x1c,
@@ -480,16 +480,16 @@ static const struct fet_db_record fet_db[] = {
 		.msg29_data = {
 			0x00, 0x31, 0xff, 0xff, 0x01, 0x00, 0x00, 0x10,
 			0xff, 0x10, 0x40, 0x00, 0x00, 0x02, 0xff, 0x09,
-			0x00, 0x00, 0x00, 0x00, 0x08, 0x07, 0x10, 0x0e,
-			0xc4, 0x09, 0x70, 0x17, 0x58, 0x1b, 0xd7, 0x60,
-			0x70, 0x00, 0x08, 0x03, 0x02, 0x03, 0x33, 0x0f,
-			0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00
+			0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0x00,
+			0x02, 0x00, 0xd7, 0x60, 0x00, 0x00, 0x00, 0x00,
+			0x08, 0x07, 0x10, 0x0e, 0xc4, 0x09, 0x70, 0x17,
+			0x58, 0x1b, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
+			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x33, 0x0f, 0x1f, 0x0f,
+			0xff, 0xff
 		},
-		.msg2b_len = 0x42,
+		.msg2b_len = 0x4a,
 		.msg2b_data = {
 			0x00, 0x0c, 0xff, 0x0f, 0x00, 0x02, 0x02, 0x00,
 			0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -499,6 +499,7 @@ static const struct fet_db_record fet_db[] = {
 			0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
 			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
 			0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0xff, 0x30,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 			0x00, 0x00
 		}
 	},
@@ -1840,41 +1841,6 @@ static const struct fet_db_record fet_db[] = {
 			0x00, 0x00, 0x00, 0x00
 		}
 	},
-	{ /* Captured data */
-		.name = "MSP430F2418",
-		.msg28_data = {
-			0xf2, 0x6f, 0x05, 0x60, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x02, 0x13, 0x01, 0x00, 0xf4, 0x1c,
-			0x85, 0x00
-			/* extra: 89 00 00 00 00 00 00 00 */
-		},
-		.msg29_params = {0, 0x44, 0x3c},
-		.msg29_data = {
-			0x00, 0x31, 0xff, 0xff, 0x01, 0x00, 0x00, 0x10,
-			0xff, 0x10, 0x40, 0x00, 0x00, 0x02, 0xff, 0x09,
-			0x00, 0x11, 0xff, 0x30, 0x08, 0x00, 0x03, 0x00,
-			0x02, 0x00, 0xd7, 0x60, 0x00, 0x00, 0x00, 0x00,
-			0x08, 0x07, 0x10, 0x0e, 0xc4, 0x09, 0x70, 0x17,
-			0x58, 0x1b, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
-			0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x33, 0x0f, 0x1f, 0x0f,
-			0xff, 0xff
-		},
-		.msg2b_len = 0x4a,
-		.msg2b_data = {
-			0x00, 0x0c, 0xff, 0x0f, 0x00, 0x02, 0x02, 0x00,
-			0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00
-		}
-	},
 	{ /* Copied from MSP430F5329, with modifications */
 		.name = "MSP430F6736",
 		.msg28_data = {