superiotool: Cosmetics and coding style fixes.

[coreboot.git] / util / superiotool / smsc.c

diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 2e203ad5e3a5abbe410495020063ed17428d280a..820be0871f9b843007c67d7b7a4f6a5e038cee89 100644 (file)
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -68,7 +68,7 @@ static const struct superio_registers reg_table[] = {
                        {0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,
                         0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,
                         0x00,0x00,0x00,MISC,EOT}},
-               {EOT}}},        
+               {EOT}}},
        {0x03, "FDC37C93xFR", {
                /* FIXME: There's another 0x03 but found on port 0x0d/0x0e! */
                {EOT}}},
@@ -358,6 +358,8 @@ static const struct superio_registers reg_table[] = {
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x00,0x00,NANA,NANA,EOT}},
                {EOT}}},
+#if 0
+       /* FIXME: FDC37M81x and MEC1308 have conflicting device IDs */
        {0x4d, "FDC37M81x", {
                {NOLDN, NULL,
                        {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x2b,0x2c,
@@ -390,6 +392,34 @@ static const struct superio_registers reg_table[] = {
                         NANA,NANA,NANA,NANA,0x00,0x00,0x00,0x00,RSVD,RSVD,
                         RSVD,RSVD,RSVD,RSVD,EOT}},
                {EOT}}},
+#endif
+       {0x4d, "MEC1308", {
+               {NOLDN, NULL,
+                       {0x02,0x03,0x07,0x17,0x20,0x21,0x22,0x23,0x24,0x25,
+                        0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
+                        EOT},
+                       {0x00,RSVD,0x00,RSVD,0x4d,0x00,0x00,0x00,0x04,0x04,
+                        MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,MISC,
+                        EOT}},
+               {0x1, "PM1",
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x00,0x00,EOT}},
+               {0x4, "COM1",
+                       {0x30,0x60,0x61,0x70,EOT},
+                       {0x00,0x00,0x00,0x00,EOT}},
+               {0x7, "KBD",
+                       {0x30,0x70,0x72,0xf0,EOT},
+                       {0x00,0x00,0x00,0x00,EOT}},
+               {0x8, "EC/ACPI",
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x00,0x62,EOT}},
+               {0x9, "Mailbox",
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x00,0x00,EOT}},
+               {0x10, "CIRV",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf3,0xf4,EOT},
+                       {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}},
+               {EOT}}},
        {0x51, "LPC47B27x", {
                {NOLDN, NULL,
                        {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x28,