Changeset 711

Timestamp:

01/28/00 02:05:40 (13 years ago)

Author:

mds

Message:

(mds) Fix broken send_byte_data() for I2C and DDC.

Wasn't used by bt869 so wasn't found before.
i2cdump now works and sensors_detect will find ddc monitor.

Files:

• lm-sensors/trunk/kernel/busses/i2c-voodoo3.c (modified) (5 diffs)

lm-sensors/trunk/kernel/busses/i2c-voodoo3.c

@@ -410 +410 @@
         if (!ddc_rdat()) {
                 printk
-                    ("i2c-voodoo3: I2C bus in use or hung!  Try again later.\n");
+                    ("i2c-voodoo3: DDC bus in use or hung!  Try again later.\n");
                 return 1;
         }
@@ -443 +443 @@
 int Voodoo3_I2CRead_byte_data(int addr, int command)
 {
-        int this_dat = 0;
-
         Voodoo3_I2CStart();
-        if (Voodoo3_I2CSendByte(addr)) {
+        if (Voodoo3_I2CSendByte(addr & 0xfe)) {
 #ifdef DEBUG
                 printk
@@ -452 +450 @@
                      addr);
 #endif
-                this_dat = -1;
                 goto ENDREAD2;
         }
-        if (!Voodoo3_I2CSendByte(command)) {
+        if (Voodoo3_I2CSendByte(command)) {
 #ifdef DEBUG
                 printk
@@ -461 +458 @@
                      addr);
 #endif
-                this_dat = -1;
                 goto ENDREAD2;
         }
-        this_dat = Voodoo3_I2CReadByte(0);
+        return(Voodoo3_I2CRead_byte(addr));
       ENDREAD2:Voodoo3_I2CStop();
 #ifdef DEBUG
         printk
-            ("i2c-voodoo3: Byte read at addr:0x%X (command:0x%X) result:0x%X\n",
-             addr, command, this_dat);
-#endif
-        return this_dat;
+            ("i2c-voodoo3: Byte read at addr:0x%X (command:0x%X) failed\n",
+             addr, command);
+#endif
+        return(-1);
 }
 
@@ -637 +633 @@
 int Voodoo3_DDCRead_byte_data(int addr, int command)
 {
-        int this_dat = 0;
-
         Voodoo3_DDCStart();
-        if (Voodoo3_DDCSendByte(addr)) {
-                this_dat = -1;
+        if (Voodoo3_DDCSendByte(addr & 0xfe))
                 goto ENDREAD2;
-        }
-        if (!Voodoo3_DDCSendByte(command)) {
-                this_dat = -1;
+        if (Voodoo3_DDCSendByte(command))
                 goto ENDREAD2;
-        }
-        this_dat = Voodoo3_DDCReadByte(0);
-      ENDREAD2:Voodoo3_DDCStop();
-        return this_dat;
+        return(Voodoo3_DDCRead_byte(addr));
+      ENDREAD2: Voodoo3_DDCStop();
+        return (-1);
 }