Various superiotool fixes.

  - IT8671F/IT8687R:

    - Fix typo: Parallel port register 0x60 value is 0x03 (not 0x01).
  
    - Fix typo: APC register 0xf6 is 0x00.
  
    - Drop register 0x07 (LDN 0 / none), that's not useful and not listed in
      any of the other Super I/Os either, it always contains the LDN number
      selected "last time", which is useless.
    
    - Fix indentation and other cosmetics.
  
  - Cosmetics, and consistency fixes in LDN names of various Super I/Os.

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@5549 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 59 insertions, 46 deletions

diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index 20ba74e8a6..013d78de74 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -37,13 +37,13 @@ static const struct superio_registers reg_table[] = {
 			 0x2b,0x2c,0x2d,EOT},
 			{0x06,0x01,0x19,0x34,0x00,0x00,MISC,0x00,0x00,0x00,
 			 0x00,0x00,0x08,EOT}},
-		{0x0, "FDC",
+		{0x0, "Floppy",
 			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf2,0xf4,EOT},
 			{0x01,0x03,0xf0,0x06,0x02,0x0e,0x03,0x00,EOT}},
-		{0x1, "UART1",
+		{0x1, "COM1",
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x01,0x03,0xf8,0x04,0x00,EOT}},
-		{0x2, "UART2",
+		{0x2, "COM2",
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
 			{0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
 		{0x3, "Parallel port",
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 155809facb..30ca1981d2 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -74,74 +74,86 @@ static const struct superio_registers reg_table[] = {
 		{EOT}}},
 	{0x8681, "IT8671F/IT8687R", {
 		{NOLDN, NULL,
-			{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x2E,0x2F,EOT},
-			{NANA,NANA,NANA,NANA,NANA,NANA,0x00,NANA,0x86,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
-		{0x0, "Floppy disk controller",
-			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0xF0,EOT},
-			{0x00,0x00,0x03,0xF0,0x06,0x02,0x02,0x00,EOT}},
+			{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x20,0x21,0x22,
+			 0x23,0x24,0x25,0x26,0x2e,0x2f,EOT},
+			{NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x86,0x81,0x00,
+			 0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x31,0x60,0x61,0x70,0x71,0x74,0xf0,EOT},
+			{0x00,0x00,0x03,0xf0,0x06,0x02,0x02,0x00,EOT}},
 		{0x1, "COM1",
-			{0x30,0x31,0x60,0x61,0x70,0x71,0xF0,EOT},
-			{0x00,0x00,0x03,0xF8,0x04,0x02,0x00,EOT}},
+			{0x30,0x31,0x60,0x61,0x70,0x71,0xf0,EOT},
+			{0x00,0x00,0x03,0xf8,0x04,0x02,0x00,EOT}},
 		{0x2, "COM2",
-			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x72,0x73,0x74,0x75,0xF0,0xF1,EOT},
-			{0x00,0x00,0x02,0xF8,0x03,0x00,0x03,0x02,0x0A,0x02,0x00,0x01,0x00,0x00,EOT}},
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x72,0x73,
+			 0x74,0x75,0xf0,0xf1,EOT},
+			{0x00,0x00,0x02,0xf8,0x03,0x00,0x03,0x02,0x0a,0x02,
+			 0x00,0x01,0x00,0x00,EOT}},
 		{0x3, "Parallel port",
-			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0xF0,EOT},
-			{0x00,0x00,0x01,0x78,0x07,0x78,0x07,0x02,0x03,0x03,EOT}},
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0x74,
+			 0xf0,EOT},
+			{0x00,0x00,0x03,0x78,0x07,0x78,0x07,0x02,0x03,
+			 0x03,EOT}},
 		{0x4, "APC",
-			{0x30,0xF0,0xF1,0xF2,0xF4,0xF5,0xF6,EOT},
-			{0x00,0x00,0x00,0x00,0x00,0x00,NANA,EOT}},
+			{0x30,0xf0,0xf1,0xf2,0xf4,0xf5,0xf6,EOT},
+			{0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
 		{0x5, "Keyboard",
-			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0xF0,EOT},
-			{0x01,0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
+			{0x30,0x31,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
+			{MISC,0x00,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
 		{0x6, "Mouse",
-			{0x30,0x70,0x71,0xF0,EOT},
-			{0x00,0x0C,0x02,0x00,EOT}},
-		{0x7, "GPIO and Alternative function",
-			{0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x70,0x71,0x72,0x73,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,0xE0,0xE1,0xE2,0xE3,0xE4,EOT},
-			{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,EOT}},
+			{0x30,0x70,0x71,0xf0,EOT},
+			{0x00,0x0c,0x02,0x00,EOT}},
+		{0x7, "GPIO",
+			{0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,
+			 0x70,0x71,0x72,0x73,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,
+			 0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff,
+			 0xe0,0xe1,0xe2,0xe3,0xe4,EOT},
+			{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,EOT}},
 		{EOT}}},
 	{0x8701, "IT8703F", {
 		{NOLDN, NULL,
-			{0x20,0x21,0x23,0x24,0x26,0x29,0x2A,0x2B,EOT},
-			{0x87,0x00,0x00,0x80,0x00,0x00,0x7C,0xC0,EOT}},
-		{0x0, "Floppy disk controller",
-			{0x30,0x60,0x61,0x70,0x74,0xF0,0xF1,0xF2,0xF3,0xF4,
-			 0xF5,EOT},
-			{0x00,0x03,0xf0,0x06,0x02,0x0E,0x00,0xFF,0x00,0x00,
+			{0x20,0x21,0x23,0x24,0x26,0x29,0x2a,0x2b,EOT},
+			{0x87,0x00,0x00,0x80,0x00,0x00,0x7c,0xc0,EOT}},
+		{0x0, "Floppy",
+			{0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf3,0xf4,
+			 0xf5,EOT},
+			{0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,0x00,
 			 0x00,EOT}},
 		{0x1, "Parallel port",
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
 			{0x00,0x03,0x78,0x00,0x80,0x07,0x03,0x03,EOT}},
-		{0x2, "Serial port 1",
+		{0x2, "COM1",
 			{0x30,0x60,0x61,0x70,0xf0,EOT},
 			{0x00,0x03,0xf8,0x04,0x00,EOT}},
-		{0x3, "Serial port 2",
+		{0x3, "COM2",
 			{0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
 			{0x00,0x02,0xf8,0x03,0x00,0x00,0x00,0x7f,EOT}},
-		{0x5, "Keyboard controller",
+		{0x5, "Keyboard",
 			{0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
-			{0x01,0x00,0x60,0x00,0x64,0x01,0x0C,0x80,EOT}},
+			{0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x80,EOT}},
 		{0x6, "Consumer IR",
 			{0x30,0x60,0x61,0x70,EOT},
 			{0x00,0x00,0x00,0x00,EOT}},
 		{0x7, "Game port, MIDI, GPIO set 1",
-			{0x30,0x60,0x61,0x62,0x63,0x70,0xF0,0xF1,0xF2,EOT},
-			{0x00,0x02,0x01,0x03,0x30,0x00,0xFF,0x00,0x00,EOT}},
+			{0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,EOT},
+			{0x00,0x02,0x01,0x03,0x30,0x00,0xff,0x00,0x00,EOT}},
 		{0x8, "GPIO set 2",
-			{0x30,0xF0,0xF1,0xF2,0xF3,0xF5,EOT},
-			{0x00,0xFF,0x00,0x00,0x00,0x00,EOT}},
+			{0x30,0xf0,0xf1,0xf2,0xf3,0xf5,EOT},
+			{0x00,0xff,0x00,0x00,0x00,0x00,EOT}},
 		{0x9, "GPIO set 3 and 4",
-			{0x30,0x60,0x61,0xF0,0xF1,0xF2,0xF3,0xF4,EOT},
-			{0x00,0x02,0x90,0xFF,0x00,0x00,0x00,0x00,EOT}},
-		{0xA, "ACPI",
-			{0x30,0x70,0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-			 0xF3,0xF4,0xF6,0xF7,0xF9,EOT},
+			{0x30,0x60,0x61,0xf0,0xf1,0xf2,0xf3,0xf4,EOT},
+			{0x00,0x02,0x90,0xff,0x00,0x00,0x00,0x00,EOT}},
+		{0xa, "ACPI",
+			{0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
+			 0xf3,0xf4,0xf6,0xf7,0xf9,EOT},
 			{0x00,0x00,0x00,0x00,NANA,NANA,0x00,0x00,0x00,0x00,
 			 NANA,NANA,0x00,0x00,0x00,EOT}},
-		{0xC, "GPIO set 5, 6 and 7",
-			{0x30,0x60,0x61,0xF0,0xF3,0xF6,EOT},
-			{0x00,0x03,0x70,0x00,0xFF,0xFF,EOT}},
+		{0xc, "GPIO set 5, 6 and 7",
+			{0x30,0x60,0x61,0xf0,0xf3,0xf6,EOT},
+			{0x00,0x03,0x70,0x00,0xff,0xff,EOT}},
 		{EOT}}},
 	{0x8702, "IT8702F", {
 		{EOT}}},
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 88db205344..fd132bfa2a 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -243,7 +243,8 @@ static const struct superio_registers reg_table[] = {
 	{0x9771, "W83977F-A/G-A/AF-A/AG-A", {
 		{EOT}}},
 	{0x9777, "W83977AF", {
-		/* W83977AF as found on the Advantech PCM-5820. We weren't able
+		/*
+		 * W83977AF as found on the Advantech PCM-5820. We weren't able
 		 * to find a datasheet (so far) which lists the 0x77 revision,
 		 * but the hardware is there in the wild, so detect it...
 		 */