[LinuxBIOS] r2814 - trunk/util/superiotool

Author: uwe
Date: 2007-09-28 17:45:43 +0200 (Fri, 28 Sep 2007)
New Revision: 2814

Modified:
   trunk/util/superiotool/Makefile
   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.c
   trunk/util/superiotool/superiotool.h
   trunk/util/superiotool/winbond.c
Log:
Random minor fixes. Use svn revision as superiotool version number.
Make the -V output more informative.

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

Modified: trunk/util/superiotool/Makefile
===================================================================
--- trunk/util/superiotool/Makefile	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/Makefile	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 ##
-## This file is part of the LinuxBIOS project.
+## This file is part of the superiotool project.
 ##
 ## Copyright (C) 2007 Uwe Hermann 
 ##

Modified: trunk/util/superiotool/ali.c
===================================================================
--- trunk/util/superiotool/ali.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/ali.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Uwe Hermann 
  *
@@ -79,7 +79,7 @@
    rev = regval(port, DEVICE_REV_REG);

if (superio_unknown(reg_table, id)) {
-		no_superio_found(port);
+		no_superio_found("ALi", "", port);
    	exit_conf_mode_ali(port);
    	return;
    }

Modified: trunk/util/superiotool/fintek.c
===================================================================
--- trunk/util/superiotool/fintek.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/fintek.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2006 coresystems GmbH 
  * Copyright (C) 2007 Uwe Hermann 
@@ -145,7 +145,7 @@
    vid |= (regval(port, VENDOR_ID_BYTE2_REG) << 8);

if (vid != FINTEK_VENDOR_ID || superio_unknown(reg_table, did)) {
-		no_superio_found(port);
+		no_superio_found("Fintek", "", port);
    	exit_conf_mode_winbond_fintek_ite_8787(port);
    	return;
    }

Modified: trunk/util/superiotool/ite.c
===================================================================
--- trunk/util/superiotool/ite.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/ite.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * 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 
@@ -261,7 +261,7 @@
    regwrite(port, 0x02, 0x02);
 }

-static void probe_idregs_ite_helper(uint16_t port)
+static void probe_idregs_ite_helper(const char *init, uint16_t port)
 {
    uint16_t id, chipver;

@@ -270,7 +270,7 @@
    chipver = regval(port, CHIP_VERSION_REG) & 0x0f; /* Only bits 3..0 */

if (superio_unknown(reg_table, id)) {
-		no_superio_found(port);
+		no_superio_found("ITE", init, port);
    	exit_conf_mode_ite(port);
    	return;
    }
@@ -285,11 +285,11 @@
 void probe_idregs_ite(uint16_t port)
 {
    enter_conf_mode_ite(port);
-	probe_idregs_ite_helper(port);
+	probe_idregs_ite_helper("(init=0x87,0x01,0x55,0x55/0xaa) ", port);
    exit_conf_mode_ite(port);

enter_conf_mode_winbond_fintek_ite_8787(port);
-	probe_idregs_ite_helper(port);
+	probe_idregs_ite_helper("(init=0x87,0x87) ", port);
    exit_conf_mode_winbond_fintek_ite_8787(port);
 }

Modified: trunk/util/superiotool/nsc.c
===================================================================
--- trunk/util/superiotool/nsc.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/nsc.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2006 Ronald Minnich 
  *
@@ -65,7 +65,7 @@

outb(0x20, port);
    if (inb(port) != 0x20) {
-		no_superio_found(port);
+		no_superio_found("NSC", "", port);
    	/* TODO: Exit config mode? */
    	return;
    }

Modified: trunk/util/superiotool/smsc.c
===================================================================
--- trunk/util/superiotool/smsc.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/smsc.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Uwe Hermann 
  *
@@ -140,7 +140,7 @@
    rev = regval(port, revreg);

if (superio_unknown(reg_table, id)) {
-		no_superio_found(port);
+		no_superio_found("SMSC", "", port);
    	exit_conf_mode_smsc(port);
    	return;
    }

Modified: trunk/util/superiotool/superiotool.c
===================================================================
--- trunk/util/superiotool/superiotool.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/superiotool.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2006 Ronald Minnich 
  * Copyright (C) 2007 Uwe Hermann 
@@ -155,15 +155,17 @@
    	printf("No human-readable dump available for this Super I/O\n");
 }

-void no_superio_found(uint16_t port)
+void no_superio_found(const char *vendor, const char *info, uint16_t port)
 {
    if (!verbose)
    	return;

if (inb(port) == 0xff)
-		printf("No Super I/O chip found at 0x%04x\n", port);
+		/* Yes, there's no space between '%s' and 'at'! */
+		printf("Probing for %s Super I/O %sat 0x%x... failed\n",
+		       vendor, info, port);
    else
-		printf("Probing 0x%04x, failed (0x%02x), data returns 0x%02x\n",
+		printf("Probing 0x%x, failed (0x%02x), data returns 0x%02x\n",
    	       port, inb(port), inb(port + 1));
 }

Modified: trunk/util/superiotool/superiotool.h
===================================================================
--- trunk/util/superiotool/superiotool.h	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/superiotool.h	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * 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 
@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <sys/io.h>

-#define SUPERIOTOOL_VERSION "0.1"
+#define SUPERIOTOOL_VERSION "r$Rev$"

#define USAGE "Usage: superiotool [-d] [-D] [-V] [-v] [-h]\n\n\
   -d | --dump            Dump Super I/O registers\n\
@@ -38,7 +38,7 @@
   -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, version, and config port.\n"
+and print its vendor, name, ID, revision, and config port.\n"

#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))

@@ -79,7 +79,7 @@
 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 no_superio_found(const char *vendor, const char *info, uint16_t port);

/* ali.c */
 void probe_idregs_ali(uint16_t port);

Property changes on: trunk/util/superiotool/superiotool.h
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Rev URL

Modified: trunk/util/superiotool/winbond.c
===================================================================
--- trunk/util/superiotool/winbond.c	2007-09-28 15:39:10 UTC (rev 2813)
+++ trunk/util/superiotool/winbond.c	2007-09-28 15:45:43 UTC (rev 2814)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Uwe Hermann 
  *
@@ -179,7 +179,7 @@
    outb(0x86, port);
 }

-void probe_idregs_winbond_helper(uint16_t port)
+void probe_idregs_winbond_helper(const char *init, uint16_t port)
 {
    uint16_t id;
    uint8_t devid, rev, olddevid;
@@ -199,7 +199,7 @@
    	id = olddevid & 0x0f;			 /* ID[3..0] */

if (superio_unknown(reg_table, id)) {
-		no_superio_found(port);
+		no_superio_found("Winbond", init, port);
    	exit_conf_mode_winbond_fintek_ite_8787(port);
    	return;
    }
@@ -220,20 +220,20 @@
 {
    /* TODO: Not all init sequences are valid for all ports. */

-	enter_conf_mode_winbond_fintek_ite_8787(port);
-	probe_idregs_winbond_helper(port);
-	exit_conf_mode_winbond_fintek_ite_8787(port);
-
    enter_conf_mode_winbond_88(port);
-	probe_idregs_winbond_helper(port);
+	probe_idregs_winbond_helper("(init=0x88) ", port);
    exit_conf_mode_winbond_fintek_ite_8787(port);

enter_conf_mode_winbond_89(port);
-	probe_idregs_winbond_helper(port);
+	probe_idregs_winbond_helper("(init=0x89) ", port);
    exit_conf_mode_winbond_fintek_ite_8787(port);

enter_conf_mode_winbond_86(port);
-	probe_idregs_winbond_helper(port);
+	probe_idregs_winbond_helper("(init=0x86,0x86) ", port);
    exit_conf_mode_winbond_fintek_ite_8787(port);
+
+	enter_conf_mode_winbond_fintek_ite_8787(port);
+	probe_idregs_winbond_helper("(init=0x87,0x87) ", port);
+	exit_conf_mode_winbond_fintek_ite_8787(port);
 }