Random minor fixes. Use svn revision as superiotool version number.

[coreboot.git] / util / superiotool / winbond.c

diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 78b002d2ec1bb6a715c17997b5c5eadf2af30b55..f45acb78736799e2c6bc912f8c67dcec9b97f4ed 100644 (file)
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -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 <uwe@hermann-uwe.de>
  *
@@ -179,7 +179,7 @@ static void enter_conf_mode_winbond_86(uint16_t port)
        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 @@ void probe_idregs_winbond_helper(uint16_t port)
                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 @@ void probe_idregs_winbond(uint16_t port)
 {
        /* 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);
 }