[LinuxBIOS] r2861 - trunk/util/superiotool

Author: uwe
Date: 2007-10-16 20:15:25 +0200 (Tue, 16 Oct 2007)
New Revision: 2861

Modified:
   trunk/util/superiotool/winbond.c
Log:
Fix the detection for the Winbond W83697SF. Unfortunately the revision
has a slightly different format than that of the W83697UF/UG so we have
to hack around it a bit.

This patch has been verified to work on real hardware by
Idwer Vollering  on IRC (thanks!).

Signed-off-by: Uwe Hermann 
Acked-by: Ronald G. Minnich

Modified: trunk/util/superiotool/winbond.c
===================================================================
--- trunk/util/superiotool/winbond.c	2007-10-16 00:34:03 UTC (rev 2860)
+++ trunk/util/superiotool/winbond.c	2007-10-16 18:15:25 UTC (rev 2861)
@@ -92,8 +92,6 @@
    	{EOT}}},
    {0x610, "W83L517D/D-F", {
    	{EOT}}},
-	{0x681, "W83697SF/UF/UG", {
-		{EOT}}},
    {0x708, "W83637HF/HG", {
    	{EOT}}},
    {0x828, "W83627THF/THG", { /* We assume rev is bits 3..0 of 0x21. */
@@ -295,6 +293,8 @@
    		{0x30,0x60,0x61,0x70,0xf0,EOT},
    		{0x00,0x00,0x00,0x00,0x00,EOT}},
    	{EOT}}},
+	{0x68, "W83697SF/UF/UG", {	/* TODO: Add comment. */
+		{EOT}}},

/* ID[3..0] */
    {0xa, "W83877F", {
@@ -333,7 +333,7 @@
    rev = regval(port, DEVICE_REV_REG);
    olddevid = regval(port, DEVICE_ID_REG_OLD) & 0x0f;

-	if (devid == 0x52)
+	if (devid == 0x52 || devid == 0x68)
    	id = devid;				 /* ID only */
    else if ((devid == 0x97) && ((rev & 0xf0) == 0x70))
    	id = (devid << 8) | rev;		 /* ID and rev */