Various smaller fixes in superiotool:

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

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 493c841058c1fee059217ff9a914695070b8b331..26851484c1247cc1e96a0f4e0fbb52005fca0e08 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -1,8 +1,9 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Carl-Daniel Hailfinger
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2008 Robinson P. Tryon <bishop.robinson@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
@@ -29,16 +30,19 @@
 #include <getopt.h>
 #include <sys/io.h>
 
-#define SUPERIOTOOL_VERSION "0.1"
-
-#define USAGE "Usage: superiotool [-d] [-D] [-V] [-v] [-h]\n\n\
-  -d | --dump            Dump Super I/O registers\n\
-  -D | --dump-readable   Dump Super I/O registers in human-readable format\n\
+#define USAGE "Usage: superiotool [-d] [-e] [-l] [-V] [-v] [-h]\n\n\
+  -d | --dump            Dump Super I/O register contents\n\
+  -e | --extra-dump      Dump secondary registers too (e.g. EC registers)\n\
+  -l | --list-supported  Show the list of supported Super I/O chips\n\
   -V | --verbose         Verbose mode\n\
   -v | --version         Show the superiotool version\n\
-  -h | --help            Show a short help text\n\n\
+  -h | --help            Show a short help text\n\n"
+
+#define USAGE_INFO "\
 Per default (no options) superiotool will just probe for a Super I/O\n\
-and print its vendor, name, ID, version, and config port.\n"
+and print its vendor, name, ID, revision, and config port.\n"
+
+#define NOTFOUND "  Failed. Returned data: "
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
@@ -47,15 +51,17 @@ and print its vendor, name, ID, version, and config port.\n"
 #define NANA           -3              /* Not Available */
 #define RSVD           -4              /* Reserved */
 #define MISC           -5              /* Needs special comment in output */
-#define MAXNAMELEN     20              /* Maximum Name Length */
-#define MAXLDN         0xa             /* Biggest LDN */
+#define MAXNAMELEN     30              /* Maximum Name Length */
+#define MAXLDN         0x10            /* Biggest LDN */
 #define LDNSIZE                (MAXLDN + 3)    /* Biggest LDN + 0 + NOLDN + EOT */
 #define MAXNUMIDX      70              /* Maximum number of indexes */
 #define IDXSIZE        (MAXNUMIDX + 1)
-#define MAXNUMPORTS    (2 + 1)         /* Maximum number of Super I/O ports */
+#define MAXNUMPORTS    (6 + 1)         /* Maximum number of Super I/O ports */
 
 /* Command line parameters. */
-extern int dump, dump_readable, verbose;
+extern int dump, verbose, extra_dump;
+
+extern int chip_found;
 
 struct superio_registers {
        int32_t superio_id;             /* Signed, as we need EOT. */
@@ -78,34 +84,57 @@ 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);
-void dump_superio_readable(uint16_t port);
-void no_superio_found(uint16_t port);
+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[]);
+
+/* ali.c */
+void probe_idregs_ali(uint16_t port);
+void print_ali_chips(void);
 
 /* fintek.c */
 void probe_idregs_fintek(uint16_t port);
+void print_fintek_chips(void);
 
 /* ite.c */
 void probe_idregs_ite(uint16_t port);
+void print_ite_chips(void);
 
 /* nsc.c */
-void probe_idregs_simple(uint16_t port);
+void probe_idregs_nsc(uint16_t port);
+void print_nsc_chips(void);
 
 /* smsc.c */
 void probe_idregs_smsc(uint16_t port);
+void print_smsc_chips(void);
 
 /* winbond.c */
 void probe_idregs_winbond(uint16_t port);
+void print_winbond_chips(void);
 
-/** Table of which config ports to probe on each Super I/O. */
-const static struct {
+/** Table of which config ports to probe for each Super I/O family. */
+static const struct {
        void (*probe_idregs) (uint16_t port);
        int ports[MAXNUMPORTS]; /* Signed, as we need EOT. */
 } superio_ports_table[] = {
-       {probe_idregs_simple,   {0x2e,  0x4e,   EOT}},
-       {probe_idregs_fintek,   {0x2e,  0x4e,   EOT}},
-       {probe_idregs_ite,      {0x2e,  0x4e,   EOT}},
-       {probe_idregs_smsc,     {0x3f0, 0x370,  EOT}},
-       {probe_idregs_winbond,  {0x2e,  0x4e,   EOT}},
+       {probe_idregs_ali,      {0x3f0, 0x370, EOT}},
+       {probe_idregs_fintek,   {0x2e, 0x4e, EOT}},
+       {probe_idregs_ite,      {0x2e, 0x4e, EOT}},
+       {probe_idregs_nsc,      {0x2e, 0x4e, EOT}},
+       {probe_idregs_smsc,     {0x2e, 0x4e, 0x162e, 0x164e, 0x3f0, 0x370, EOT}},
+       {probe_idregs_winbond,  {0x2e, 0x4e, 0x3f0, 0x370, 0x250, EOT}},
+};
+
+/** Table of functions to print out supported Super I/O chips. */
+static const struct {
+       void (*print_list) (void);
+} vendor_print_functions[] = {
+       {print_ali_chips},
+       {print_fintek_chips},
+       {print_ite_chips},
+       {print_nsc_chips},
+       {print_smsc_chips},
+       {print_winbond_chips},
 };
 
 #endif