Author: uwe
Date: 2007-10-18 01:43:59 +0200 (Thu, 18 Oct 2007)
New Revision: 2872
Modified:
trunk/util/superiotool/README
trunk/util/superiotool/ali.c
trunk/util/superiotool/fintek.c
trunk/util/superiotool/ite.c
trunk/util/superiotool/nsc.c
trunk/util/superiotool/smsc.c
trunk/util/superiotool/superiotool.8
trunk/util/superiotool/superiotool.c
trunk/util/superiotool/superiotool.h
trunk/util/superiotool/winbond.c
Log:
Drop support for the --human-readable option. It's not any more useful than
the --dump option, it just means lots of additional work for no gain, IMO.
Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]>
Acked-by: Stefan Reinauer <[EMAIL PROTECTED]>
Modified: trunk/util/superiotool/README
===================================================================
--- trunk/util/superiotool/README 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/README 2007-10-17 23:43:59 UTC (rev 2872)
@@ -33,7 +33,6 @@
$ superiotool [-d] [-D] [-V] [-v] [-h]
-d | --dump Dump Super I/O registers
- -D | --dump-readable Dump Super I/O registers in human-readable format
-V | --verbose Verbose mode
-v | --version Show the superiotool version
-h | --help Show a short help text
@@ -51,11 +50,7 @@
$ superiotool -d
- - Detailed register dump in human-readable format:
- $ superiotool -D
-
-
Supported Super I/O Chips
-------------------------
Modified: trunk/util/superiotool/ali.c
===================================================================
--- trunk/util/superiotool/ali.c 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/ali.c 2007-10-17 23:43:59 UTC (rev 2872)
@@ -92,7 +92,6 @@
chip_found = 1;
dump_superio("ALi", reg_table, port, id);
- dump_superio_readable(port); /* TODO */
exit_conf_mode_ali(port);
}
Modified: trunk/util/superiotool/fintek.c
===================================================================
--- trunk/util/superiotool/fintek.c 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/fintek.c 2007-10-17 23:43:59 UTC (rev 2872)
@@ -70,68 +70,6 @@
{EOT}
};
-static void dump_readable_fintek(uint16_t port, uint16_t did)
-{
- if (!dump_readable)
- return;
-
- printf("Human-readable register dump:\n");
-
- 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(uint16_t port)
{
uint16_t vid, did;
@@ -158,7 +96,6 @@
chip_found = 1;
dump_superio("Fintek", reg_table, port, did);
- dump_readable_fintek(port, did);
exit_conf_mode_winbond_fintek_ite_8787(port);
}
Modified: trunk/util/superiotool/ite.c
===================================================================
--- trunk/util/superiotool/ite.c 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/ite.c 2007-10-17 23:43:59 UTC (rev 2872)
@@ -369,7 +369,6 @@
chip_found = 1;
dump_superio("ITE", reg_table, port, id);
- dump_superio_readable(port); /* TODO */
}
void probe_idregs_ite(uint16_t port)
Modified: trunk/util/superiotool/nsc.c
===================================================================
--- trunk/util/superiotool/nsc.c 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/nsc.c 2007-10-17 23:43:59 UTC (rev 2872)
@@ -135,42 +135,6 @@
{EOT}
};
-static void dump_readable_pc8374l(uint16_t port)
-{
- if (!dump_readable)
- return;
-
- printf("Human-readable register dump:\n");
-
- 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_nsc(uint16_t port)
{
uint8_t id, rev;
@@ -205,7 +169,5 @@
chip_found = 1;
dump_superio("NSC", reg_table, port, id);
- if (id == 0xf1)
- dump_readable_pc8374l(port);
}
Modified: trunk/util/superiotool/smsc.c
===================================================================
--- trunk/util/superiotool/smsc.c 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/smsc.c 2007-10-17 23:43:59 UTC (rev 2872)
@@ -381,7 +381,6 @@
chip_found = 1;
dump_superio((id == 0x77 ? "ASUS" : "SMSC"), reg_table, port, id);
- dump_superio_readable(port); /* TODO */
exit_conf_mode_smsc(port);
}
Modified: trunk/util/superiotool/superiotool.8
===================================================================
--- trunk/util/superiotool/superiotool.8 2007-10-17 23:42:02 UTC (rev
2871)
+++ trunk/util/superiotool/superiotool.8 2007-10-17 23:43:59 UTC (rev
2872)
@@ -2,7 +2,7 @@
.SH NAME
superiotool \- Super I/O detection tool
.SH SYNOPSIS
-.B superiotool \fR[\fB\-dDVvh\fR]
+.B superiotool \fR[\fB\-dVvh\fR]
.SH DESCRIPTION
.B superiotool
is a GPL'd user-space utility which can
@@ -72,17 +72,6 @@
detailed information about the
.BR MM " fields."
.TP
-.B "\-D, \-\-dump-readable"
-Dump Super I/O registers in human-readable format (if the Super I/O chip
-is detected and
-.B superiotool
-supports the
-.B "\-\-dump-readable"
-option for this chip).
-.sp
-The output format of this option is different for every Super I/O, and only
-very few Super I/Os currently support this option.
-.TP
.B "\-V, \-\-verbose"
Enable verbose mode. This option can be used together with the
.BR "\-d" " or " "\-D" " option (or both)."
Modified: trunk/util/superiotool/superiotool.c
===================================================================
--- trunk/util/superiotool/superiotool.c 2007-10-17 23:42:02 UTC (rev
2871)
+++ trunk/util/superiotool/superiotool.c 2007-10-17 23:43:59 UTC (rev
2872)
@@ -23,7 +23,7 @@
#include "superiotool.h"
/* Command line options. */
-int dump = 0, dump_readable = 0, verbose = 0;
+int dump = 0, verbose = 0;
/* Global flag which indicates whether a chip was detected at all. */
int chip_found = 0;
@@ -151,13 +151,6 @@
}
}
-void dump_superio_readable(uint16_t port)
-{
- /* TODO */
- if (dump_readable)
- printf("No human-readable dump available for this Super I/O\n");
-}
-
void probing_for(const char *vendor, const char *info, uint16_t port)
{
if (!verbose)
@@ -179,22 +172,18 @@
const static struct option long_options[] = {
{"dump", no_argument, NULL, 'd'},
- {"dump-readable", no_argument, NULL, 'D'},
{"verbose", no_argument, NULL, 'V'},
{"version", no_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{0, 0, 0, 0}
};
- while ((opt = getopt_long(argc, argv, "dDVvh",
+ while ((opt = getopt_long(argc, argv, "dVvh",
long_options, &option_index)) != EOF) {
switch (opt) {
case 'd':
dump = 1;
break;
- case 'D':
- dump_readable = 1;
- break;
case 'V':
verbose = 1;
break;
Modified: trunk/util/superiotool/superiotool.h
===================================================================
--- trunk/util/superiotool/superiotool.h 2007-10-17 23:42:02 UTC (rev
2871)
+++ trunk/util/superiotool/superiotool.h 2007-10-17 23:43:59 UTC (rev
2872)
@@ -29,9 +29,8 @@
#include <getopt.h>
#include <sys/io.h>
-#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\
@@ -55,7 +54,7 @@
#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;
@@ -80,7 +79,6 @@
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 probing_for(const char *vendor, const char *info, uint16_t port);
/* ali.c */
Modified: trunk/util/superiotool/winbond.c
===================================================================
--- trunk/util/superiotool/winbond.c 2007-10-17 23:42:02 UTC (rev 2871)
+++ trunk/util/superiotool/winbond.c 2007-10-17 23:43:59 UTC (rev 2872)
@@ -428,7 +428,6 @@
/* TODO: Special notes in dump output for the MISC entries. */
dump_superio("Winbond", reg_table, port, id);
- dump_superio_readable(port); /* TODO */
}
void probe_idregs_winbond(uint16_t port)
--
linuxbios mailing list
linuxbios@linuxbios.org
http://www.linuxbios.org/mailman/listinfo/linuxbios
