r3163 - trunk/util/superiotool

Author: uwe
Date: 2008-03-17 14:43:48 +0100 (Mon, 17 Mar 2008)
New Revision: 3163

Modified:
   trunk/util/superiotool/Makefile
   trunk/util/superiotool/README
   trunk/util/superiotool/ite.c
   trunk/util/superiotool/superiotool.c
   trunk/util/superiotool/superiotool.h
Log:
Various smaller fixes in superiotool:

- Also dump the extra registers (e.g. EC regs) in --list-supported.

- Small fix in the code to allow for building with -pedantic (yes,
   the fix is a bit silly, but it's simple and allows us to use the
   -pedantic flag to keep the code even cleaner and nicer).

- Install the binary in /usr/sbin, as it's meant to be run as root.

- Small typo in README.

Signed-off-by: Uwe Hermann 
Acked-by: Stefan Reinauer

Modified: trunk/util/superiotool/Makefile
===================================================================
--- trunk/util/superiotool/Makefile	2008-03-17 13:37:34 UTC (rev 3162)
+++ trunk/util/superiotool/Makefile	2008-03-17 13:43:48 UTC (rev 3163)
@@ -29,9 +29,8 @@
 SVNDEF := -D'SUPERIOTOOL_VERSION="$(shell svnversion -cn . \
           | sed -e "s/.*://" -e "s/([0-9]*).*/\1/")"'

-# TODO: -pedantic
 CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-         -Werror-implicit-function-declaration -ansi $(SVNDEF)
+         -Werror-implicit-function-declaration -ansi -pedantic $(SVNDEF)

OBJS = superiotool.o ali.o fintek.o ite.o nsc.o smsc.o winbond.o

@@ -43,7 +42,7 @@
    $(CC) $(CFLAGS) -o $(PROGRAM) $(OBJS)

install: $(PROGRAM)
-	$(INSTALL) $(PROGRAM) $(PREFIX)/bin
+	$(INSTALL) $(PROGRAM) $(PREFIX)/sbin
    mkdir -p $(PREFIX)/share/man/man8
    $(INSTALL) $(PROGRAM).8 $(PREFIX)/share/man/man8

Modified: trunk/util/superiotool/README
===================================================================
--- trunk/util/superiotool/README	2008-03-17 13:37:34 UTC (rev 3162)
+++ trunk/util/superiotool/README	2008-03-17 13:43:48 UTC (rev 3163)
@@ -30,7 +30,7 @@
 Usage
 -----

-Please read the superiotool(1) manpage or type 'superiotool --help'.
+Please read the superiotool(8) manpage or type 'superiotool --help'.

Per default (no options) superiotool will just probe for a Super I/O
 and print its vendor, name, ID, revision, and config port.

Modified: trunk/util/superiotool/ite.c
===================================================================
--- trunk/util/superiotool/ite.c	2008-03-17 13:37:34 UTC (rev 3162)
+++ trunk/util/superiotool/ite.c	2008-03-17 13:43:48 UTC (rev 3163)
@@ -428,4 +428,5 @@
 void print_ite_chips(void)
 {
    print_vendor_chips("ITE", reg_table);
+	print_vendor_chips("ITE EC", ec_table);
 }

Modified: trunk/util/superiotool/superiotool.c
===================================================================
--- trunk/util/superiotool/superiotool.c	2008-03-17 13:37:34 UTC (rev 3162)
+++ trunk/util/superiotool/superiotool.c	2008-03-17 13:43:48 UTC (rev 3163)
@@ -237,6 +237,7 @@
    		break;
    	case 'h':
    		printf(USAGE);
+			printf(USAGE_INFO);
    		exit(0);
    		break;
    	default:

Modified: trunk/util/superiotool/superiotool.h
===================================================================
--- trunk/util/superiotool/superiotool.h	2008-03-17 13:37:34 UTC (rev 3162)
+++ trunk/util/superiotool/superiotool.h	2008-03-17 13:43:48 UTC (rev 3163)
@@ -36,7 +36,9 @@
   -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, revision, and config port.\n"

@@ -123,7 +125,6 @@
    {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);