The Winbond Super I/O chips have another indirection of registers. The

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

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 23234e944343094f64c895a261341653c747e26b..e26f21c59c18db070dd1701614e087aa9c7d1ce9 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -28,7 +28,27 @@
 #include <stdint.h>
 #include <string.h>
 #include <getopt.h>
+#if defined(__GLIBC__)
 #include <sys/io.h>
+#endif
+
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0)
+#define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0)
+#define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0)
+#define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); })
+#define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); })
+#define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); })
+#else
+#define OUTB outb
+#define OUTW outw
+#define OUTL outl
+#define INB  inb
+#define INW  inw
+#define INL  inl
+#endif
 
 #define USAGE "Usage: superiotool [-d] [-e] [-l] [-V] [-v] [-h]\n\n\
   -d | --dump            Dump Super I/O register contents\n\
@@ -51,12 +71,16 @@ and print its vendor, name, ID, revision, and config port.\n"
 #define NANA           -3              /* Not Available */
 #define RSVD           -4              /* Reserved */
 #define MISC           -5              /* Needs special comment in output */
-#define MAXLDN         0x10            /* Biggest LDN */
+#define MAXLDN         0x14            /* Biggest LDN */
 #define LDNSIZE                (MAXLDN + 3)    /* Biggest LDN + 0 + NOLDN + EOT */
-#define MAXNUMIDX      170             /* Maximum number of indexes */
+#define MAXNUMIDX      170             /* Maximum number of indices */
 #define IDXSIZE        (MAXNUMIDX + 1)
 #define MAXNUMPORTS    (6 + 1)         /* Maximum number of Super I/O ports */
 
+/* Select registers for various components. */
+#define LDN_SEL                0x07            /* LDN select register */
+#define WINBOND_HWM_SEL        0x4e            /* Hardware monitor bank select */
+
 /* Command line parameters. */
 extern int dump, verbose, extra_dump;
 
@@ -82,7 +106,7 @@ int superio_unknown(const struct superio_registers reg_table[], uint16_t id);
 const char *get_superio_name(const struct superio_registers reg_table[],
                             uint16_t id);
 void dump_superio(const char *name, const struct superio_registers reg_table[],
-                 uint16_t port, uint16_t id);
+                 uint16_t port, uint16_t id, uint8_t ldn_sel);
 void probing_for(const char *vendor, const char *info, uint16_t port);
 void print_vendor_chips(const char *vendor,
                        const struct superio_registers reg_table[]);
@@ -118,7 +142,8 @@ static const struct {
 } superio_ports_table[] = {
        {probe_idregs_ali,      {0x3f0, 0x370, EOT}},
        {probe_idregs_fintek,   {0x2e, 0x4e, EOT}},
-       {probe_idregs_ite,      {0x2e, 0x4e, EOT}},
+       /* Only use 0x370 for ITE, but 0x3f0 or 0x3bd would also be valid. */
+       {probe_idregs_ite,      {0x2e, 0x4e, 0x370, EOT}},
        {probe_idregs_nsc,      {0x2e, 0x4e, 0x15c, EOT}},
        {probe_idregs_smsc,     {0x2e, 0x4e, 0x162e, 0x164e, 0x3f0, 0x370, EOT}},
        {probe_idregs_winbond,  {0x2e, 0x4e, 0x3f0, 0x370, 0x250, EOT}},