Split up superiotool.c into multiple source files, one per vendor.
authorUwe Hermann <uwe@hermann-uwe.de>
Sun, 16 Sep 2007 18:11:03 +0000 (18:11 +0000)
committerUwe Hermann <uwe@hermann-uwe.de>
Sun, 16 Sep 2007 18:11:03 +0000 (18:11 +0000)
As there will be lots more supported Super I/Os soon, the file is
really getting way too big...

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

util/superiotool/Makefile
util/superiotool/fintek.c [new file with mode: 0644]
util/superiotool/ite.c [new file with mode: 0644]
util/superiotool/nsc.c [new file with mode: 0644]
util/superiotool/superiotool.c
util/superiotool/superiotool.h [new file with mode: 0644]

index fa9853a90b5f5d22969c2abc633d5b7ed642b233..cf96d67c7a9e5002a19a8253a1eaf695f277f5fb 100644 (file)
@@ -28,16 +28,18 @@ PREFIX  = /usr/local
 CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
          -Werror-implicit-function-declaration
 
+OBJS = fintek.o ite.o nsc.o superiotool.o
+
 all: $(PROGRAM)
 
-$(PROGRAM): $(PROGRAM).c
-       $(CC) $(CFLAGS) -o $@ $< 
+$(PROGRAM): $(OBJS)
+       $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)
 
 install: $(PROGRAM)
        $(INSTALL) $(PROGRAM) $(PREFIX)/bin
 
 clean:
-       rm -f $(PROGRAM)
+       rm -f $(PROGRAM) *.o
 
 .PHONY: all install clean
 
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
new file mode 100644 (file)
index 0000000..f7baaf6
--- /dev/null
@@ -0,0 +1,149 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2006 coresystems GmbH <info@coresystems.de>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "superiotool.h"
+
+void dump_fintek(unsigned short port, unsigned int did)
+{
+       switch (did) {
+       case 0x0604:
+               printf("Fintek F71805\n");
+               break;
+       case 0x4103:
+               printf("Fintek F71872\n");
+               break;
+       default:
+               printf("Unknown Fintek Super I/O: did=0x%04x\n", did);
+               return;
+       }
+
+       printf("Flash write is %s.\n",
+              regval(port, 0x28) & 0x80 ? "enabled" : "disabled");
+       printf("Flash control is 0x%04x.\n", regval(port, 0x28));
+       printf("27=%02x\n", regval(port, 0x27));
+       printf("29=%02x\n", regval(port, 0x29));
+       printf("2a=%02x\n", regval(port, 0x2a));
+       printf("2b=%02x\n", regval(port, 0x2b));
+
+       /* Select UART 1. */
+       regwrite(port, 0x07, 0x01);
+       printf("UART1 is %s\n",
+              regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf("UART1 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60),
+              regval(port, 0x61), regval(port, 0x70) & 0x0f,
+              regval(port, 0xf0) & 0x10 ? "RS485" : "RS232");
+
+       /* Select UART 2. */
+       regwrite(port, 0x07, 0x02);
+       printf("UART2 is %s\n",
+              regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf("UART2 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60),
+              regval(port, 0x61), regval(port, 0x70) & 0x0f,
+              regval(port, 0xf0) & 0x10 ? "RS485" : "RS232");
+
+       /* Select parallel port. */
+       regwrite(port, 0x07, 0x03);
+       printf("PARPORT is %s\n",
+              regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf("PARPORT base=%02x%02x, irq=%02x\n", regval(port, 0x60),
+              regval(port, 0x61), regval(port, 0x70) & 0x0f);
+
+       /* Select HW monitor. */
+       regwrite(port, 0x07, 0x04);
+       printf("HW monitor is %s\n",
+              regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf("HW monitor base=%02x%02x, irq=%02x\n", regval(port, 0x60),
+              regval(port, 0x61), regval(port, 0x70) & 0x0f);
+
+       /* Select GPIO. */
+       regwrite(port, 0x07, 0x05);
+       printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf
+           ("GPIO 70=%02x, e0=%02x, e1=%02x, e2=%02x, e3=%02x, e4=%02x, e5=%02x\n",
+            regval(port, 0x70), regval(port, 0xe0), regval(port, 0xe1),
+            regval(port, 0xe2), regval(port, 0xe3), regval(port, 0xe4),
+            regval(port, 0xe5));
+       printf
+           ("GPIO e6=%02x, e7=%02x, e8=%02x, e9=%02x, f0=%02x, f1=%02x, f3=%02x, f4=%02x\n",
+            regval(port, 0xe6), regval(port, 0xe7), regval(port, 0xe8),
+            regval(port, 0xe9), regval(port, 0xf0), regval(port, 0xf1),
+            regval(port, 0xf3), regval(port, 0xf4));
+       printf("GPIO f5=%02x, f6=%02x, f7=%02x, f8=%02x\n", regval(port, 0xf5),
+              regval(port, 0xf6), regval(port, 0xf7), regval(port, 0xf8));
+}
+
+void probe_idregs_fintek(unsigned short port)
+{
+       unsigned int vid, did, success = 0;
+
+       /* Enable configuration sequence (Fintek uses this for example)
+        * Older ITE chips have the same enable sequence.
+        */
+       outb(0x87, port);
+       outb(0x87, port);
+
+       outb(0x20, port);
+       if (inb(port) != 0x20) {
+               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));
+               return;
+       }
+       did = inb(port + 1);
+       did |= (regval(port, 0x21) << 8);
+
+       vid = regval(port, 0x23);
+       vid |= (regval(port, 0x24) << 8);
+
+       printf("Super I/O found at 0x%02x: vid=0x%04x/did=0x%04x\n",
+              port, vid, did);
+
+       if (vid == 0xff || vid == 0xffff)
+               return;
+
+       /* printf("%s\n", familyid[id]); */
+       switch (did) {
+       case 0x0887:            /* Pseudoreversed for ITE8708 */
+       case 0x1087:            /* Pseudoreversed for ITE8710 */
+               success = 1;
+               dump_ite(port, ((did & 0xff) << 8) | ((did & 0xff00) >> 8));
+               regwrite(port, 0x02, 0x02);     /* Exit MB PnP mode. */
+               break;
+       default:
+               break;
+       }
+
+       switch (vid) {
+       case 0x3419:
+               success = 1;
+               dump_fintek(port, did);
+               break;
+       default:
+               break;
+       }
+
+       if (!success)
+               printf("No dump for vid 0x%04x, did 0x%04x\n", vid, did);
+
+       /* Exit MB PnP mode (for Fintek, doesn't hurt ITE). */
+       outb(0xaa, port);
+}
+
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
new file mode 100644 (file)
index 0000000..ca956be
--- /dev/null
@@ -0,0 +1,332 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Carl-Daniel Hailfinger
+ * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "superiotool.h"
+
+#define EOT            -1              /* End Of Table */
+#define NOLDN          -2              /* NO LDN needed */
+#define NANA           -3              /* Not Available */
+#define MAXNAMELEN     20              /* Maximum Name Length */
+#define MAXLDN         0xa             /* Biggest LDN */
+#define LDNSIZE                (MAXLDN + 3)    /* Biggest LDN + 0 + NOLDN + EOT */
+#define MAXNUMIDX      70              /* Maximum number of indexes */
+#define IDXSIZE        (MAXNUMIDX + 1)
+
+const static struct ite_registers {
+       /* Yes, superio_id should be unsigned, but EOT has to be negative. */
+       signed short superio_id;
+       const char name[MAXNAMELEN];
+       struct ite_ldnidx {
+               signed short ldn;
+               signed short idx[IDXSIZE];
+               signed short def[IDXSIZE];
+       } ldn[LDNSIZE];
+} ite_reg_table[] = {
+       {0x8702, "IT8702", {
+               {EOT}}},
+       {0x8705, "IT8705 or IT8700", {
+               {EOT}}},
+       {0x8708, "IT8708", {
+               {NOLDN,
+                       {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+                        0x29,0x2a,0x2e,0x2f,EOT},
+                       {NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,
+                        0xff,0xff,0x00,0x00,EOT}},
+               {0x0,
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
+               {0x1,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0xf8,0x04,0x00,EOT}},
+               {0x2,
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
+               {0x3,
+                       {0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0x74,
+                        0xf0,EOT},
+                       {0x00,0x03,0x78,0x07,0x78,0x00,0x80,0x07,0x03,
+                        0x03,EOT}},
+               {0x4,
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
+                        0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT},
+                       {NANA,NANA,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,NANA,NANA,EOT}},
+               {0x5,   /* Note: 0x30 can actually be 0x00 _or_ 0x01. */
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
+               {0x6,
+                       {0x30,0x70,0x71,0xf0,EOT},
+                       {0x00,0x0c,0x02,0x00,EOT}},
+               {0x7,
+                       {0x70,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,
+                        0xbb,0xbc,0xbd,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc8,
+                        0xc9,0xca,0xcb,0xcc,0xcd,0xd0,0xd1,0xd2,0xd3,0xd4,
+                        0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xf0,0xf1,
+                        0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,
+                        0xfc,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,NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,
+                        0x00,EOT}},
+               {0x8,
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x02,0x01,EOT}},
+               {0x9,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
+               {0xa,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
+               {EOT}}},
+       {0x8710, "IT8710", {
+               {EOT}}},
+       {0x8712, "IT8712", {
+               {NOLDN,
+                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
+               {0x0,
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
+               {0x1,
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
+               {0x2,
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
+               {0x3,
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
+                       {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
+               {0x4,
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
+                        0xf4,0xf5,0xf6,EOT},
+                       {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
+                        0x00,NANA,NANA,EOT}},
+               {0x5,
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x08,EOT}},
+               {0x6,
+                       {0x30,0x70,0x71,0xf0,EOT},
+                       {0x00,0x0c,0x02,0x00,EOT}},
+               {0x7,
+                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
+                        0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
+                        0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
+                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
+                        0xe0,0xe1,0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,
+                        0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,EOT},
+                       {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x30,0x38,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
+               {0x8,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
+               {0x9,
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x02,0x01,EOT}},
+               {0xa,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
+               {EOT}}},
+       {0x8716, "IT8716", {
+               {NOLDN,
+                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
+               {0x0,
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
+               {0x1,
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
+               {0x2,
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
+               {0x3,
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
+                       {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
+               {0x4,
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
+                        0xf4,0xf5,0xf6,EOT},
+                       {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
+                        0x00,NANA,NANA,EOT}},
+               {0x5,
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
+               {0x6,
+                       {0x30,0x70,0x71,0xf0,EOT},
+                       {0x00,0x0c,0x02,0x00,EOT}},
+               {0x7,
+                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
+                        0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
+                        0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
+                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
+                        0xe0,0xe1,0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,
+                        0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,EOT},
+                       {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x20,0x38,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
+               {0x8,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
+               {0x9,
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x02,0x01,EOT}},
+               {0xa,
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
+               {EOT}}},
+       {0x8718, "IT8718", {
+               {EOT}}},
+       {EOT}
+};
+
+void dump_ite(unsigned short port, unsigned short id)
+{
+       int i, j, k;
+       signed short *idx;
+
+       printf("ITE ");
+
+       /* TODO: Get datasheets for IT8711 and IT8712. */
+       switch (id) {
+       case 0x8702:
+       case 0x8705: /* IT8700F or IT8705F */
+       case 0x8708:
+       case 0x8710:
+       case 0x8712:
+       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");
+                       }
+               }
+               break;
+       default:
+               printf("Unknown ITE chip, id=%04x\n", id);
+               for (i = 0x20; i <= 0x24; i++)
+                       printf("index %02x=%02x\n", i, regval(port, i));
+               break;
+       }
+}
+
+void probe_idregs_ite(unsigned short port)
+{
+       unsigned int id, chipver;
+
+       /* Enable configuration sequence (ITE uses this for newer IT87[012]x)
+        * IT871[01] uses 0x87, 0x87 -> fintek detection should handle it
+        * IT8708 uses 0x87, 0x87 -> fintek detection should handle it
+        * IT8761 uses 0x87, 0x61, 0x55, 0x55/0xaa
+        * IT86xx series uses different ports
+        * IT8661 uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes
+        * IT8673 uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes
+        */
+       outb(0x87, port);
+       outb(0x01, port);
+       outb(0x55, port);
+       if (port == 0x2e)
+               outb(0x55, port);
+       else
+               outb(0xAA, port);
+
+       /* Read Chip ID Byte 1. */
+       id = regval(port, 0x20);
+       if (id != 0x87) {
+               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));
+               return;
+       }
+
+       id <<= 8;
+
+       /* Read Chip ID Byte 2. */
+       id |= regval(port, 0x21);
+
+       /* Read chip version, only bits 3..0 for all IT87xx. */
+       chipver = regval(port, 0x22) & 0x0f;
+
+       printf("Super I/O found at 0x%02x: id=0x%04x, chipver=0x%01x\n",
+              port, id, chipver);
+
+       switch (id) {
+       case 0x8702:
+       case 0x8705:
+       case 0x8708:
+       case 0x8712:
+       case 0x8716:
+       case 0x8718:
+       case 0x8726:
+               dump_ite(port, id);
+               break;
+       default:
+               printf("No dump for ID 0x%04x\n", id);
+               break;
+       }
+       regwrite(port, 0x02, 0x02);     /* Exit MB PnP mode. */
+}
+
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
new file mode 100644 (file)
index 0000000..0fb2b74
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include "superiotool.h"
+
+/* Well, they really thought this through, eh? Family is 8 bits! */
+static const char *familyid[] = {
+       [0xf1] = "PC8374 (Winbond/NatSemi)"
+};
+
+void dump_ns8374(unsigned short port)
+{
+       printf("Enables: 21=%02x, 22=%02x, 23=%02x, 24=%02x, 26=%02x\n",
+              regval(port, 0x21), regval(port, 0x22), regval(port, 0x23),
+              regval(port, 0x24), regval(port, 0x26));
+       printf("SMBUS at %02x\n", regval(port, 0x2a));
+
+       /* Check COM1. This is all we care about at present. */
+       printf("COM 1 is globally %s\n",
+              regval(port, 0x26) & 8 ? "disabled" : "enabled");
+
+       /* Select COM1. */
+       regwrite(port, 0x07, 0x03);
+       printf("COM 1 is locally %s\n",
+              regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf
+           ("COM1 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n",
+            regval(port, 0x60), regval(port, 0x61), regval(port, 0x70),
+            regval(port, 0x71), regval(port, 0x74), regval(port, 0x75),
+            regval(port, 0xf0));
+
+       /* Select GPIO. */
+       regwrite(port, 0x07, 0x07);
+       printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
+       printf
+           ("GPIO 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n",
+            regval(port, 0x60), regval(port, 0x61), regval(port, 0x70),
+            regval(port, 0x71), regval(port, 0x74), regval(port, 0x75),
+            regval(port, 0xf0));
+}
+
+void probe_idregs_simple(unsigned short port)
+{
+       unsigned char id;
+
+       outb(0x20, port);
+       if (inb(port) != 0x20) {
+               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));
+               return;
+       }
+       id = inb(port + 1);
+
+       printf("Super I/O found at 0x%02x: id = 0x%02x\n", port, id);
+       if (id == 0xff)
+               return;
+
+       if (familyid[id])
+               printf("%s\n", familyid[id]);
+       else
+               printf("<unknown>\n");
+
+       switch (id) {
+       case 0xf1:
+               dump_ns8374(port);
+               break;
+       default:
+               printf("No dump for 0x%02x\n", id);
+               break;
+       }
+}
+
index e3b27bf62c979bd2897df8ec84d6031c40232662..7c3f112904a10e9534a9ced70372852d8de529f5 100644 (file)
@@ -2,8 +2,6 @@
  * This file is part of the LinuxBIOS project.
  *
  * Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
- * Copyright (C) 2006 coresystems GmbH <info@coresystems.de>
- * Copyright (C) 2007 Carl-Daniel Hailfinger
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/io.h>
-
-/* Well, they really thought this through, eh? Family is 8 bits! */
-static const char *familyid[] = {
-       [0xf1] = "PC8374 (Winbond/NatSemi)"
-};
+#include "superiotool.h"
 
 unsigned char regval(unsigned short port, unsigned char reg)
 {
@@ -42,506 +33,6 @@ void regwrite(unsigned short port, unsigned char reg, unsigned char val)
        outb(val, port + 1);
 }
 
-void dump_ns8374(unsigned short port)
-{
-       printf("Enables: 21=%02x, 22=%02x, 23=%02x, 24=%02x, 26=%02x\n",
-              regval(port, 0x21), regval(port, 0x22), regval(port, 0x23),
-              regval(port, 0x24), regval(port, 0x26));
-       printf("SMBUS at %02x\n", regval(port, 0x2a));
-
-       /* Check COM1. This is all we care about at present. */
-       printf("COM 1 is globally %s\n",
-              regval(port, 0x26) & 8 ? "disabled" : "enabled");
-
-       /* Select COM1. */
-       regwrite(port, 0x07, 0x03);
-       printf("COM 1 is locally %s\n",
-              regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf
-           ("COM1 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n",
-            regval(port, 0x60), regval(port, 0x61), regval(port, 0x70),
-            regval(port, 0x71), regval(port, 0x74), regval(port, 0x75),
-            regval(port, 0xf0));
-
-       /* Select GPIO. */
-       regwrite(port, 0x07, 0x07);
-       printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf
-           ("GPIO 60=%02x, 61=%02x, 70=%02x, 71=%02x, 74=%02x, 75=%02x, f0=%02x\n",
-            regval(port, 0x60), regval(port, 0x61), regval(port, 0x70),
-            regval(port, 0x71), regval(port, 0x74), regval(port, 0x75),
-            regval(port, 0xf0));
-}
-
-void dump_fintek(unsigned short port, unsigned int did)
-{
-       switch (did) {
-       case 0x0604:
-               printf("Fintek F71805\n");
-               break;
-       case 0x4103:
-               printf("Fintek F71872\n");
-               break;
-       default:
-               printf("Unknown Fintek Super I/O: did=0x%04x\n", did);
-               return;
-       }
-
-       printf("Flash write is %s.\n",
-              regval(port, 0x28) & 0x80 ? "enabled" : "disabled");
-       printf("Flash control is 0x%04x.\n", regval(port, 0x28));
-       printf("27=%02x\n", regval(port, 0x27));
-       printf("29=%02x\n", regval(port, 0x29));
-       printf("2a=%02x\n", regval(port, 0x2a));
-       printf("2b=%02x\n", regval(port, 0x2b));
-
-       /* Select UART 1. */
-       regwrite(port, 0x07, 0x01);
-       printf("UART1 is %s\n",
-              regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf("UART1 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60),
-              regval(port, 0x61), regval(port, 0x70) & 0x0f,
-              regval(port, 0xf0) & 0x10 ? "RS485" : "RS232");
-
-       /* Select UART 2. */
-       regwrite(port, 0x07, 0x02);
-       printf("UART2 is %s\n",
-              regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf("UART2 base=%02x%02x, irq=%02x, mode=%s\n", regval(port, 0x60),
-              regval(port, 0x61), regval(port, 0x70) & 0x0f,
-              regval(port, 0xf0) & 0x10 ? "RS485" : "RS232");
-
-       /* Select parallel port. */
-       regwrite(port, 0x07, 0x03);
-       printf("PARPORT is %s\n",
-              regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf("PARPORT base=%02x%02x, irq=%02x\n", regval(port, 0x60),
-              regval(port, 0x61), regval(port, 0x70) & 0x0f);
-
-       /* Select HW monitor. */
-       regwrite(port, 0x07, 0x04);
-       printf("HW monitor is %s\n",
-              regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf("HW monitor base=%02x%02x, irq=%02x\n", regval(port, 0x60),
-              regval(port, 0x61), regval(port, 0x70) & 0x0f);
-
-       /* Select GPIO. */
-       regwrite(port, 0x07, 0x05);
-       printf("GPIO is %s\n", regval(port, 0x30) & 1 ? "enabled" : "disabled");
-       printf
-           ("GPIO 70=%02x, e0=%02x, e1=%02x, e2=%02x, e3=%02x, e4=%02x, e5=%02x\n",
-            regval(port, 0x70), regval(port, 0xe0), regval(port, 0xe1),
-            regval(port, 0xe2), regval(port, 0xe3), regval(port, 0xe4),
-            regval(port, 0xe5));
-       printf
-           ("GPIO e6=%02x, e7=%02x, e8=%02x, e9=%02x, f0=%02x, f1=%02x, f3=%02x, f4=%02x\n",
-            regval(port, 0xe6), regval(port, 0xe7), regval(port, 0xe8),
-            regval(port, 0xe9), regval(port, 0xf0), regval(port, 0xf1),
-            regval(port, 0xf3), regval(port, 0xf4));
-       printf("GPIO f5=%02x, f6=%02x, f7=%02x, f8=%02x\n", regval(port, 0xf5),
-              regval(port, 0xf6), regval(port, 0xf7), regval(port, 0xf8));
-}
-
-#define EOT            -1              /* End Of Table */
-#define NOLDN          -2              /* NO LDN needed */
-#define NANA           -3              /* Not Available */
-#define MAXNAMELEN     20              /* Maximum Name Length */
-#define MAXLDN         0xa             /* Biggest LDN */
-#define LDNSIZE                (MAXLDN + 3)    /* Biggest LDN + 0 + NOLDN + EOT */
-#define MAXNUMIDX      70              /* Maximum number of indexes */
-#define IDXSIZE        (MAXNUMIDX + 1)
-
-const static struct ite_registers {
-       /* Yes, superio_id should be unsigned, but EOT has to be negative. */
-       signed short superio_id;
-       const char name[MAXNAMELEN];
-       struct ite_ldnidx {
-               signed short ldn;
-               signed short idx[IDXSIZE];
-               signed short def[IDXSIZE];
-       } ldn[LDNSIZE];
-} ite_reg_table[] = {
-       {0x8702, "IT8702", {
-               {EOT}}},
-       {0x8705, "IT8705 or IT8700", {
-               {EOT}}},
-       {0x8708, "IT8708", {
-               {NOLDN,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
-                        0x29,0x2a,0x2e,0x2f,EOT},
-                       {NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,
-                        0xff,0xff,0x00,0x00,EOT}},
-               {0x0,
-                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
-                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-               {0x1,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0xf8,0x04,0x00,EOT}},
-               {0x2,
-                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
-                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-               {0x3,
-                       {0x30,0x60,0x61,0x62,0x63,0x64,0x65,0x70,0x74,
-                        0xf0,EOT},
-                       {0x00,0x03,0x78,0x07,0x78,0x00,0x80,0x07,0x03,
-                        0x03,EOT}},
-               {0x4,
-                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
-                        0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,EOT},
-                       {NANA,NANA,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,NANA,NANA,EOT}},
-               {0x5,   /* Note: 0x30 can actually be 0x00 _or_ 0x01. */
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
-                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
-               {0x6,
-                       {0x30,0x70,0x71,0xf0,EOT},
-                       {0x00,0x0c,0x02,0x00,EOT}},
-               {0x7,
-                       {0x70,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,
-                        0xbb,0xbc,0xbd,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc8,
-                        0xc9,0xca,0xcb,0xcc,0xcd,0xd0,0xd1,0xd2,0xd3,0xd4,
-                        0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xf0,0xf1,
-                        0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,
-                        0xfc,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,NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,
-                        0x00,EOT}},
-               {0x8,
-                       {0x30,0x60,0x61,EOT},
-                       {0x00,0x02,0x01,EOT}},
-               {0x9,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
-               {0xa,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
-               {EOT}}},
-       {0x8710, "IT8710", {
-               {EOT}}},
-       {0x8712, "IT8712", {
-               {NOLDN,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
-                       {NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
-               {0x0,
-                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
-                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-               {0x1,
-                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
-                       {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
-               {0x2,
-                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
-                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-               {0x3,
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
-                       {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
-               {0x4,
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
-                        0xf4,0xf5,0xf6,EOT},
-                       {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
-                        0x00,NANA,NANA,EOT}},
-               {0x5,
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
-                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x08,EOT}},
-               {0x6,
-                       {0x30,0x70,0x71,0xf0,EOT},
-                       {0x00,0x0c,0x02,0x00,EOT}},
-               {0x7,
-                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
-                        0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
-                        0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
-                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
-                        0xe0,0xe1,0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,
-                        0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,EOT},
-                       {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x30,0x38,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
-               {0x8,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
-               {0x9,
-                       {0x30,0x60,0x61,EOT},
-                       {0x00,0x02,0x01,EOT}},
-               {0xa,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
-               {EOT}}},
-       {0x8716, "IT8716", {
-               {NOLDN,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
-                       {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
-               {0x0,
-                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
-                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-               {0x1,
-                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
-                       {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
-               {0x2,
-                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
-                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-               {0x3,
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
-                       {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
-               {0x4,
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
-                        0xf4,0xf5,0xf6,EOT},
-                       {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
-                        0x00,NANA,NANA,EOT}},
-               {0x5,
-                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
-                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
-               {0x6,
-                       {0x30,0x70,0x71,0xf0,EOT},
-                       {0x00,0x0c,0x02,0x00,EOT}},
-               {0x7,
-                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
-                        0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
-                        0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
-                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
-                        0xe0,0xe1,0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,
-                        0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,EOT},
-                       {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x20,0x38,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
-               {0x8,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
-               {0x9,
-                       {0x30,0x60,0x61,EOT},
-                       {0x00,0x02,0x01,EOT}},
-               {0xa,
-                       {0x30,0x60,0x61,0x70,0xf0,EOT},
-                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
-               {EOT}}},
-       {0x8718, "IT8718", {
-               {EOT}}},
-       {EOT}
-};
-
-void dump_ite(unsigned short port, unsigned short id)
-{
-       int i, j, k;
-       signed short *idx;
-
-       printf("ITE ");
-
-       /* TODO: Get datasheets for IT8711 and IT8712. */
-       switch (id) {
-       case 0x8702:
-       case 0x8705: /* IT8700F or IT8705F */
-       case 0x8708:
-       case 0x8710:
-       case 0x8712:
-       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");
-                       }
-               }
-               break;
-       default:
-               printf("Unknown ITE chip, id=%04x\n", id);
-               for (i = 0x20; i <= 0x24; i++)
-                       printf("index %02x=%02x\n", i, regval(port, i));
-               break;
-       }
-}
-
-void probe_idregs_simple(unsigned short port)
-{
-       unsigned char id;
-
-       outb(0x20, port);
-       if (inb(port) != 0x20) {
-               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));
-               return;
-       }
-       id = inb(port + 1);
-
-       printf("Super I/O found at 0x%02x: id = 0x%02x\n", port, id);
-       if (id == 0xff)
-               return;
-
-       if (familyid[id])
-               printf("%s\n", familyid[id]);
-       else
-               printf("<unknown>\n");
-
-       switch (id) {
-       case 0xf1:
-               dump_ns8374(port);
-               break;
-       default:
-               printf("No dump for 0x%02x\n", id);
-               break;
-       }
-}
-
-void probe_idregs_fintek(unsigned short port)
-{
-       unsigned int vid, did, success = 0;
-
-       /* Enable configuration sequence (Fintek uses this for example)
-        * Older ITE chips have the same enable sequence.
-        */
-       outb(0x87, port);
-       outb(0x87, port);
-
-       outb(0x20, port);
-       if (inb(port) != 0x20) {
-               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));
-               return;
-       }
-       did = inb(port + 1);
-       did |= (regval(port, 0x21) << 8);
-
-       vid = regval(port, 0x23);
-       vid |= (regval(port, 0x24) << 8);
-
-       printf("Super I/O found at 0x%02x: vid=0x%04x/did=0x%04x\n",
-              port, vid, did);
-
-       if (vid == 0xff || vid == 0xffff)
-               return;
-
-       /* printf("%s\n", familyid[id]); */
-       switch (did) {
-       case 0x0887:            /* Pseudoreversed for ITE8708 */
-       case 0x1087:            /* Pseudoreversed for ITE8710 */
-               success = 1;
-               dump_ite(port, ((did & 0xff) << 8) | ((did & 0xff00) >> 8));
-               regwrite(port, 0x02, 0x02);     /* Exit MB PnP mode. */
-               break;
-       default:
-               break;
-       }
-
-       switch (vid) {
-       case 0x3419:
-               success = 1;
-               dump_fintek(port, did);
-               break;
-       default:
-               break;
-       }
-
-       if (!success)
-               printf("No dump for vid 0x%04x, did 0x%04x\n", vid, did);
-
-       /* Exit MB PnP mode (for Fintek, doesn't hurt ITE). */
-       outb(0xaa, port);
-}
-
-void probe_idregs_ite(unsigned short port)
-{
-       unsigned int id, chipver;
-
-       /* Enable configuration sequence (ITE uses this for newer IT87[012]x)
-        * IT871[01] uses 0x87, 0x87 -> fintek detection should handle it
-        * IT8708 uses 0x87, 0x87 -> fintek detection should handle it
-        * IT8761 uses 0x87, 0x61, 0x55, 0x55/0xaa
-        * IT86xx series uses different ports
-        * IT8661 uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes
-        * IT8673 uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes
-        */
-       outb(0x87, port);
-       outb(0x01, port);
-       outb(0x55, port);
-       if (port == 0x2e)
-               outb(0x55, port);
-       else
-               outb(0xAA, port);
-
-       /* Read Chip ID Byte 1. */
-       id = regval(port, 0x20);
-       if (id != 0x87) {
-               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));
-               return;
-       }
-
-       id <<= 8;
-
-       /* Read Chip ID Byte 2. */
-       id |= regval(port, 0x21);
-
-       /* Read chip version, only bits 3..0 for all IT87xx. */
-       chipver = regval(port, 0x22) & 0x0f;
-
-       printf("Super I/O found at 0x%02x: id=0x%04x, chipver=0x%01x\n",
-              port, id, chipver);
-
-       switch (id) {
-       case 0x8702:
-       case 0x8705:
-       case 0x8708:
-       case 0x8712:
-       case 0x8716:
-       case 0x8718:
-       case 0x8726:
-               dump_ite(port, id);
-               break;
-       default:
-               printf("No dump for ID 0x%04x\n", id);
-               break;
-       }
-       regwrite(port, 0x02, 0x02);     /* Exit MB PnP mode. */
-}
-
 void probe_superio(unsigned short port)
 {
        probe_idregs_simple(port);
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
new file mode 100644 (file)
index 0000000..c973b9e
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef SUPERIOTOOL_H
+#define SUPERIOTOOL_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/io.h>
+
+unsigned char regval(unsigned short port, unsigned char reg);
+void regwrite(unsigned short port, unsigned char reg, unsigned char val);
+void probe_superio(unsigned short port);
+
+/* fintek.c */
+void dump_fintek(unsigned short port, unsigned int did);
+void probe_idregs_fintek(unsigned short port);
+
+/* ite.c */
+void dump_ite(unsigned short port, unsigned short id);
+void probe_idregs_ite(unsigned short port);
+
+/* nsc.c */
+void dump_ns8374(unsigned short port);
+void probe_idregs_simple(unsigned short port);
+
+#endif