Split out a dump_superio() function from ite.c, and make it slightly more

generic, so that we can use it for other Super I/Os, too.

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

diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 314b8df16efad665f9d31b3f65f9500885d3958e..41f2a9bb3db41b732f72d39505caa61bf673e884 100644 (file)
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -21,7 +21,7 @@
 
 #include "superiotool.h"
 
-const static struct superio_registers ite_reg_table[] = {
+const static struct superio_registers reg_table[] = {
        {0x8702, "IT8702", {
                {EOT}}},
        {0x8705, "IT8705 or IT8700", {
@@ -189,10 +189,7 @@ const static struct superio_registers ite_reg_table[] = {
 
 void dump_ite(unsigned short port, unsigned short id)
 {
-       int i, j, k;
-       signed short *idx;
-
-       printf("ITE ");
+       int i;
 
        /* TODO: Get datasheets for IT8711 and IT8712. */
        switch (id) {
@@ -204,47 +201,7 @@ void dump_ite(unsigned short port, unsigned short id)
        case 0x8716:
        /* Note: IT8726F has ID 0x8726 (datasheet wrongly says 0x8716). */
        case 0x8718:
-               for (i = 0;; i++) {
-                       if (ite_reg_table[i].superio_id == EOT)
-                               break;
-                       if ((unsigned short)ite_reg_table[i].superio_id != id)
-                               continue;
-                       printf("%s\n", ite_reg_table[i].name);
-                       for (j = 0;; j++) {
-                               if (ite_reg_table[i].ldn[j].ldn == EOT)
-                                       break;
-                               if (ite_reg_table[i].ldn[j].ldn != NOLDN) {
-                                       printf("Switching to LDN 0x%01x\n",
-                                              ite_reg_table[i].ldn[j].ldn);
-                                       regwrite(port, 0x07,
-                                                ite_reg_table[i].ldn[j].ldn);
-                               }
-                               idx = ite_reg_table[i].ldn[j].idx;
-                               printf("idx ");
-                               for (k = 0;; k++) {
-                                       if (idx[k] == EOT)
-                                               break;
-                                       printf("%02x ", idx[k]);
-                               }
-                               printf("\nval ");
-                               for (k = 0;; k++) {
-                                       if (idx[k] == EOT)
-                                               break;
-                                       printf("%02x ", regval(port, idx[k]));
-                               }
-                               printf("\ndef ");
-                               idx = ite_reg_table[i].ldn[j].def;
-                               for (k = 0;; k++) {
-                                       if (idx[k] == EOT)
-                                               break;
-                                       if (idx[k] == NANA)
-                                               printf("NA ");
-                                       else
-                                               printf("%02x ", idx[k]);
-                               }
-                               printf("\n");
-                       }
-               }
+               dump_superio("ITE", reg_table, port, id);
                break;
        default:
                printf("Unknown ITE chip, id=%04x\n", id);

diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 7c3f112904a10e9534a9ced70372852d8de529f5..ad3cd45c34eef1aa74d45e2d82049464ecfc103a 100644 (file)
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2007 Carl-Daniel Hailfinger
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +34,65 @@ void regwrite(unsigned short port, unsigned char reg, unsigned char val)
        outb(val, port + 1);
 }
 
+void dump_superio(const char *name, const struct superio_registers reg_table[],
+                 unsigned short port, unsigned short id)
+{
+       int i, j, k;
+       signed short *idx;
+
+       printf("%s ", name);
+
+       for (i = 0; /* Nothing */; i++) {
+               if (reg_table[i].superio_id == EOT)
+                       break;
+
+               if ((unsigned short)reg_table[i].superio_id != id)
+                       continue;
+
+               printf("%s\n", reg_table[i].name);
+
+               for (j = 0;; j++) {
+                       if (reg_table[i].ldn[j].ldn == EOT)
+                               break;
+
+                       if (reg_table[i].ldn[j].ldn != NOLDN) {
+                               printf("Switching to LDN 0x%01x\n",
+                                      reg_table[i].ldn[j].ldn);
+                               regwrite(port, 0x07,
+                                        reg_table[i].ldn[j].ldn);
+                       }
+
+                       idx = reg_table[i].ldn[j].idx;
+
+                       printf("idx ");
+                       for (k = 0;; k++) {
+                               if (idx[k] == EOT)
+                                       break;
+                               printf("%02x ", idx[k]);
+                       }
+
+                       printf("\nval ");
+                       for (k = 0;; k++) {
+                               if (idx[k] == EOT)
+                                       break;
+                               printf("%02x ", regval(port, idx[k]));
+                       }
+
+                       printf("\ndef ");
+                       idx = reg_table[i].ldn[j].def;
+                       for (k = 0;; k++) {
+                               if (idx[k] == EOT)
+                                       break;
+                               if (idx[k] == NANA)
+                                       printf("NA ");
+                               else
+                                       printf("%02x ", idx[k]);
+                       }
+                       printf("\n");
+               }
+       }
+}
+
 void probe_superio(unsigned short port)
 {
        probe_idregs_simple(port);

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index f7c715eb669025a2d32141f789743bb3e028631b..904007cbdf240f4c216d8a5308d8d92b51e7df79 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -49,6 +49,8 @@ struct superio_registers {
 /* superiotool.c */
 unsigned char regval(unsigned short port, unsigned char reg);
 void regwrite(unsigned short port, unsigned char reg, unsigned char val);
+void dump_superio(const char *name, const struct superio_registers reg_table[],
+                  unsigned short port, unsigned short id);
 void probe_superio(unsigned short port);
 
 /* fintek.c */