Superiotool: Add dump support to the Winbond W83697HF/F.

Minor coding style changes and code simplifications. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2791 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
2007-09-20 00:00:49 +00:00
parent e474956590
commit 2c290e3362
5 changed files with 154 additions and 103 deletions
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -27,37 +27,38 @@ const static struct superio_registers reg_table[] = {
 	{0x8705, "IT8705 or IT8700", {
 		{EOT}}},
 	{0x8708, "IT8708", {
-		{NOLDN,
+		{NOLDN, NULL,
 			{0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
 			 0x29,0x2a,0x2e,0x2f,EOT},
 			{NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,
 			 0xff,0xff,0x00,0x00,EOT}},
-		{0x0,
+		{0x0, NULL,
 			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
 			{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-		{0x1,
+		{0x1, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0xf8,0x04,0x00,EOT}},
-		{0x2,
+		{0x2, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
 			{0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-		{0x3,
+		{0x3, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0x74,
 			 0xf0,EOT},
 			{0x00,0x03,0x78,0x07,0x78,0x00,0x80,0x07,0x03,
 			 0x03,EOT}},
-		{0x4,
+		{0x4, NULL,
 			{0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
 			 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT},
 			{NANA,NANA,0x00,0x00,0x00,0x00,0x00,0x00,
 			 0x00,0x00,0x00,0x00,0x00,NANA,NANA,EOT}},
-		{0x5,	/* Note: 0x30 can actually be 0x00 _or_ 0x01. */
+		{0x5, NULL,
+			/* Note: 0x30 can actually be 0x00 _or_ 0x01. */
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
 			{0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
-		{0x6,
+		{0x6, NULL,
 			{0x30,0x70,0x71,0xf0,EOT},
 			{0x00,0x0c,0x02,0x00,EOT}},
-		{0x7,
+		{0x7, NULL,
 			{0x70,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,
 			 0xbb,0xbc,0xbd,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc8,
 			 0xc9,0xca,0xcb,0xcc,0xcd,0xd0,0xd1,0xd2,0xd3,0xd4,
@@ -70,46 +71,46 @@ const static struct superio_registers reg_table[] = {
 			 0x00,0x00,NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x00,
 			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,
 			 0x00,EOT}},
-		{0x8,
+		{0x8, NULL,
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x02,0x01,EOT}},
-		{0x9,
+		{0x9, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0x10,0x0b,0x00,EOT}},
-		{0xa,
+		{0xa, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0x00,0x0a,0x00,EOT}},
 		{EOT}}},
 	{0x8710, "IT8710", {
 		{EOT}}},
 	{0x8712, "IT8712", {
-		{NOLDN,
+		{NOLDN, NULL,
 			{0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
 			{NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
-		{0x0,
+		{0x0, NULL,
 			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
 			{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-		{0x1,
+		{0x1, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
 			{0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
-		{0x2,
+		{0x2, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
 			{0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-		{0x3,
+		{0x3, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
 			{0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
-		{0x4,
+		{0x4, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
 			 0xf4,0xf5,0xf6,EOT},
 			{0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
 			 0x00,NANA,NANA,EOT}},
-		{0x5,
+		{0x5, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
 			{0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x08,EOT}},
-		{0x6,
+		{0x6, NULL,
 			{0x30,0x70,0x71,0xf0,EOT},
 			{0x00,0x0c,0x02,0x00,EOT}},
-		{0x7,
+		{0x7, NULL,
 			{0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
 			 0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
 			 0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
@@ -122,44 +123,44 @@ const static struct superio_registers reg_table[] = {
 			 0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
 			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
-		{0x8,
+		{0x8, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0x00,0x0a,0x00,EOT}},
-		{0x9,
+		{0x9, NULL,
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x02,0x01,EOT}},
-		{0xa,
+		{0xa, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0x10,0x0b,0x00,EOT}},
 		{EOT}}},
 	{0x8716, "IT8716", {
-		{NOLDN,
+		{NOLDN, NULL,
 			{0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
 			{NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
-		{0x0,
+		{0x0, NULL,
 			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
 			{0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-		{0x1,
+		{0x1, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
 			{0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
-		{0x2,
+		{0x2, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
 			{0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-		{0x3,
+		{0x3, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
 			{0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
-		{0x4,
+		{0x4, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
 			 0xf4,0xf5,0xf6,EOT},
 			{0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
 			 0x00,NANA,NANA,EOT}},
-		{0x5,
+		{0x5, NULL,
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
 			{0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
-		{0x6,
+		{0x6, NULL,
 			{0x30,0x70,0x71,0xf0,EOT},
 			{0x00,0x0c,0x02,0x00,EOT}},
-		{0x7,
+		{0x7, NULL,
 			{0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
 			 0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
 			 0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
@@ -172,13 +173,13 @@ const static struct superio_registers reg_table[] = {
 			 0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
 			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 			 0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
-		{0x8,
+		{0x8, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0x00,0x0a,0x00,EOT}},
-		{0x9,
+		{0x9, NULL,
 			{0x30,0x60,0x61,EOT},
 			{0x00,0x02,0x01,EOT}},
-		{0xa,
+		{0xa, NULL,
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0x10,0x0b,0x00,EOT}},
 		{EOT}}},