superiotool: Cosmetics and coding style fixes.

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

diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 279e389d4dbc880ddb50bc4ffcc224bc8c27bfef..a3c6547d50d22b852e7a73d0ecc010ff02fced52 100644 (file)
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -238,6 +238,59 @@ static const struct superio_registers reg_table[] = {
        {0xa51, "W83667HG", {
                /* See also: http://lists.lm-sensors.org/pipermail/lm-sensors/2008-July/023683.html */
                {EOT}}},
+       {0xb07, "W83627DHG-P/-PT", {
+               {NOLDN, NULL,
+                       {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+                        0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+                       {0x00,0xb0,NANA,0xff,0x00,MISC,0x00,MISC,RSVD,0x50,
+                        0x00,0x00,RSVD,0xe2,0x21,0x00,0x00,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5,
+                        EOT},
+                       {0x01,0x03,0xf0,0x06,0x02,0x8e,0x00,0xff,0x00,0x00,
+                        EOT}},
+               {0x1, "Parallel port",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
+                       {0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
+               {0x2, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x01,0x03,0xf8,0x04,0x00,EOT}},
+               {0x3, "COM2",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+                       {0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
+               {0x5, "Keyboard",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}},
+               {0x6, "Serial peripheral interface",
+                       {0x30,0x62,0x63,EOT},
+                       {0x00,0x00,0x00,EOT}},
+               {0x7, "GPIO 6",
+                       {0x30,0xf4,0xf5,0xf6,0xf7,0xf8,EOT},
+                       {0x00,0xff,0x00,0x00,0x00,0x00,EOT}},
+               {0x8, "WDTO#, PLED",
+                       {0x30,0xf5,0xf6,0xf7,EOT},
+                       {0x00,0x00,0x00,0x00,EOT}},
+               {0x9, "GPIO 2, GPIO 3, GPIO 4, GPIO 5",
+                       {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,
+                        0xe9,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+                        0xf9,0xfa,0xfe,EOT},
+                       {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,EOT}},
+               {0xa, "ACPI",
+                       {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
+                        0xe8,0xe9,0xf2,0xf3,0xf4,0xf6,0xf7,0xfe,EOT},
+                       {0x00,0x00,0x01,0x00,0xff,0x08,0x00,RSVD,0x1c,0x00,
+                        RSVD,RSVD,0x7c,0x00,0x00,0x00,0x00,0x00,EOT}},
+               {0xb, "Hardware monitor",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
+                       {0x00,0x00,0x00,0x00,0x81,0x00,0x00,EOT}},
+               {0xc, "PECI, SST",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xe9,0xea,0xec,
+                        0xee,0xef,0xf1,0xf2,0xf3,0xfe,0xff,EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,RSVD,0x00,0x00,
+                        0x01,0x5a,0x48,0x50,0x10,0x00,0x00,EOT}},
+               {EOT}}},
        {0xb35, "Nuvoton NCT5571D", {
                {NOLDN, NULL,
                        {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
@@ -625,6 +678,8 @@ static void enter_conf_mode_winbond_86(uint16_t port)
        OUTB(0x86, port);
 }
 
+static int chip_found_at_port;
+
 static void probe_idregs_winbond_helper(const char *init, uint16_t port)
 {
        uint16_t id, hwmport;
@@ -662,6 +717,7 @@ static void probe_idregs_winbond_helper(const char *init, uint16_t port)
                printf("Found Winbond %s (id=0x%02x, rev=0x%02x) at 0x%x\n",
                       get_superio_name(reg_table, id), devid, rev, port);
        chip_found = 1;
+       chip_found_at_port = 1;
 
        dump_superio("Winbond", reg_table, port, id, LDN_SEL);
 
@@ -688,25 +744,31 @@ static void probe_idregs_winbond_helper(const char *init, uint16_t port)
 
 void probe_idregs_winbond(uint16_t port)
 {
+       chip_found_at_port = 0;
+
        enter_conf_mode_winbond_88(port);
        probe_idregs_winbond_helper("(init=0x88) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
-       if (chip_found) return;
+       if (chip_found_at_port)
+               return;
 
        enter_conf_mode_winbond_89(port);
        probe_idregs_winbond_helper("(init=0x89) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
-       if (chip_found) return;
+       if (chip_found_at_port)
+               return;
 
        enter_conf_mode_winbond_86(port);
        probe_idregs_winbond_helper("(init=0x86,0x86) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
-       if (chip_found) return;
+       if (chip_found_at_port)
+               return;
 
        enter_conf_mode_winbond_fintek_ite_8787(port);
        probe_idregs_winbond_helper("(init=0x87,0x87) ", port);
        exit_conf_mode_winbond_fintek_ite_8787(port);
-       if (chip_found) return;
+       if (chip_found_at_port)
+               return;
 }
 
 void print_winbond_chips(void)