Drop support for the --human-readable option. It's not any more useful than

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

diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 9c9e55a23871e2a44e55cadea923ec3c4834ae3f..38f9cdfc1a6863b6e72f0b48dfd6eed5b4ec6f92 100644 (file)
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -29,17 +29,16 @@
 #include <getopt.h>
 #include <sys/io.h>
 
-#define SUPERIOTOOL_VERSION "$Rev$"
-
-#define USAGE "Usage: superiotool [-d] [-D] [-V] [-v] [-h]\n\n\
+#define USAGE "Usage: superiotool [-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\
   -V | --verbose         Verbose mode\n\
   -v | --version         Show the superiotool version\n\
   -h | --help            Show a short help text\n\n\
 Per default (no options) superiotool will just probe for a Super I/O\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]))
 
 #define EOT            -1              /* End Of Table */
@@ -48,14 +47,16 @@ and print its vendor, name, ID, revision, and config port.\n"
 #define RSVD           -4              /* Reserved */
 #define MISC           -5              /* Needs special comment in output */
 #define MAXNAMELEN     30              /* Maximum Name Length */
-#define MAXLDN         0xa             /* Biggest LDN */
+#define MAXLDN         0xf             /* Biggest LDN */
 #define LDNSIZE                (MAXLDN + 3)    /* Biggest LDN + 0 + NOLDN + EOT */
 #define MAXNUMIDX      70              /* Maximum number of indexes */
 #define IDXSIZE        (MAXNUMIDX + 1)
-#define MAXNUMPORTS    (5 + 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;
+
+extern int chip_found;
 
 struct superio_registers {
        int32_t superio_id;             /* Signed, as we need EOT. */
@@ -78,8 +79,7 @@ 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(const char *vendor, const char *info, uint16_t port);
+void probing_for(const char *vendor, const char *info, uint16_t port);
 
 /* ali.c */
 void probe_idregs_ali(uint16_t port);
@@ -91,7 +91,7 @@ void probe_idregs_fintek(uint16_t port);
 void probe_idregs_ite(uint16_t port);
 
 /* nsc.c */
-void probe_idregs_simple(uint16_t port);
+void probe_idregs_nsc(uint16_t port);
 
 /* smsc.c */
 void probe_idregs_smsc(uint16_t port);
@@ -105,10 +105,10 @@ const static struct {
        int ports[MAXNUMPORTS]; /* Signed, as we need EOT. */
 } superio_ports_table[] = {
        {probe_idregs_ali,      {0x3f0, 0x370, EOT}},
-       {probe_idregs_simple,   {0x2e, 0x4e, EOT}},
        {probe_idregs_fintek,   {0x2e, 0x4e, EOT}},
        {probe_idregs_ite,      {0x2e, 0x4e, EOT}},
-       {probe_idregs_smsc,     {0x2e, 0x4e, 0x3f0, 0x370, 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}},
 };