Dump support for the SMSC LPC47B27x (trivial).

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

diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 8aea0a02d98b42586f909b6103929368be2d66b3..72e6b6c923e097608e665896a77bd5e2f8f27efb 100644 (file)
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
@@ -25,6 +25,9 @@
 /* Command line options. */
 int dump = 0, verbose = 0;
 
+/* Global flag which indicates whether a chip was detected at all. */
+int chip_found = 0;
+
 uint8_t regval(uint16_t port, uint8_t reg)
 {
        outb(reg, port);
@@ -37,6 +40,18 @@ void regwrite(uint16_t port, uint8_t reg, uint8_t val)
        outb(val, port + 1);
 }
 
+void enter_conf_mode_winbond_fintek_ite_8787(uint16_t port)
+{
+       outb(0x87, port);
+       outb(0x87, port);
+}
+
+void exit_conf_mode_winbond_fintek_ite_8787(uint16_t port)
+{
+       outb(0xaa, port);               /* Fintek, Winbond */
+       regwrite(port, 0x02, 0x02);     /* ITE */
+}
+
 int superio_unknown(const struct superio_registers reg_table[], uint16_t id)
 {
        return !strncmp(get_superio_name(reg_table, id), "<unknown>", 9);
@@ -63,12 +78,13 @@ const char *get_superio_name(const struct superio_registers reg_table[],
 static void dump_regs(const struct superio_registers reg_table[],
                      int i, int j, uint16_t port)
 {
-       int k, *idx;
+       int k;
+       const int *idx;
 
        if (reg_table[i].ldn[j].ldn != NOLDN) {
-               printf("LDN 0x%02x ", reg_table[i].ldn[j].ldn);
+               printf("LDN 0x%02x", reg_table[i].ldn[j].ldn);
                if (reg_table[i].ldn[j].name != NULL)
-                       printf("(%s)", reg_table[i].ldn[j].name);
+                       printf(" (%s)", reg_table[i].ldn[j].name);
                regwrite(port, 0x07, reg_table[i].ldn[j].ldn);
        } else {
                printf("Register dump:");
@@ -76,33 +92,33 @@ static void dump_regs(const struct superio_registers reg_table[],
 
        idx = reg_table[i].ldn[j].idx;
 
-       printf("\nidx ");
-       for (k = 0; /* Nothing */; k++) {
-               if (idx[k] == EOT)
-                       break;
-               printf("%02x ", idx[k]);
+       printf("\nidx");
+       for (k = 0; idx[k] != EOT; k++) {
+               if (k && !(k % 8))
+                       putchar(' ');
+               printf(" %02x", idx[k]);
        }
 
-       printf("\nval ");
-       for (k = 0; /* Nothing */; k++) {
-               if (idx[k] == EOT)
-                       break;
-               printf("%02x ", regval(port, idx[k]));
+       printf("\nval");
+       for (k = 0; idx[k] != EOT; k++) {
+               if (k && !(k % 8))
+                       putchar(' ');
+               printf(" %02x", regval(port, idx[k]));
        }
 
-       printf("\ndef ");
+       printf("\ndef");
        idx = reg_table[i].ldn[j].def;
-       for (k = 0; /* Nothing */; k++) {
-               if (idx[k] == EOT)
-                       break;
-               else if (idx[k] == NANA)
-                       printf("NA ");
+       for (k = 0; idx[k] != EOT; k++) {
+               if (k && !(k % 8))
+                       putchar(' ');
+               if (idx[k] == NANA)
+                       printf(" NA");
                else if (idx[k] == RSVD)
-                       printf("RR ");
+                       printf(" RR");
                else if (idx[k] == MISC)        /* TODO */
-                       printf("MM ");
+                       printf(" MM");
                else
-                       printf("%02x ", idx[k]);
+                       printf(" %02x", idx[k]);
        }
        printf("\n");
 }
@@ -135,27 +151,30 @@ void dump_superio(const char *vendor,
        }
 }
 
-void no_superio_found(uint16_t port)
+void probing_for(const char *vendor, const char *info, uint16_t port)
 {
        if (!verbose)
                return;
 
-       if (inb(port) == 0xff)
-               printf("No Super I/O chip found at 0x%04x\n", port);
-       else
-               printf("Probing 0x%04x, failed (0x%02x), data returns 0x%02x\n",
-                      port, inb(port), inb(port + 1));
+       /* Yes, there's no space between '%s' and 'at'! */
+       printf("Probing for %s Super I/O %sat 0x%x...\n",
+              vendor, info, port);
+}
+
+static void print_version(void)
+{
+       printf("superiotool r%s\n", SUPERIOTOOL_VERSION);
 }
 
 int main(int argc, char *argv[])
 {
        int i, j, opt, option_index;
 
-       const static struct option long_options[] = {
-               {"dump",        no_argument, NULL, 'd'},
-               {"verbose",     no_argument, NULL, 'V'},
-               {"version",     no_argument, NULL, 'v'},
-               {"help",        no_argument, NULL, 'h'},
+       static const struct option long_options[] = {
+               {"dump",                no_argument, NULL, 'd'},
+               {"verbose",             no_argument, NULL, 'V'},
+               {"version",             no_argument, NULL, 'v'},
+               {"help",                no_argument, NULL, 'h'},
                {0, 0, 0, 0}
        };
 
@@ -169,7 +188,7 @@ int main(int argc, char *argv[])
                        verbose = 1;
                        break;
                case 'v':
-                       printf("superiotool %s\n", SUPERIOTOOL_VERSION);
+                       print_version();
                        exit(0);
                        break;
                case 'h':
@@ -189,11 +208,16 @@ int main(int argc, char *argv[])
                exit(1);
        }
 
+       print_version();
+
        for (i = 0; i < ARRAY_SIZE(superio_ports_table); i++) {
                for (j = 0; superio_ports_table[i].ports[j] != EOT; j++)
                        superio_ports_table[i].probe_idregs(
                                superio_ports_table[i].ports[j]);
        }
 
+       if (!chip_found)
+               printf("No Super I/O found\n");
+
        return 0;
 }