Changeset 310

Timestamp:

03/14/99 01:39:19 (14 years ago)

Author:

mds

Message:

updated block read/write code.

Files:

• lm-sensors/trunk/kernel/busses/i2c-ali15x3.c (modified) (3 diffs)

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

@@ -88 +88 @@
 #define MAP_ACPI 1
 #undef FORCE_ALI15X3_ENABLE
-#undef DEBUG
 
 /* ALI15X3 SMBus address offsets */
@@ -514 +513 @@
       if (read_write == SMBUS_WRITE) {
         len = data->block[0];
-        if (len < 0) 
+        if (len < 0) {
           len = 0;
-        if (len > 32)
+          data->block[0] = len;
+        }       
+        if (len > 32) {
           len = 32;
+          data->block[0] = len;
+        }       
         outb_p(len,SMBHSTDAT0);
         outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT); /* Reset SMBBLKDAT */
-        for (i = 1; i <= len; i ++)
+        for (i = 1; i <= len; i++)
           outb_p(data->block[i],SMBBLKDAT);
       }
@@ -547 +550 @@
       break;
     case ALI15X3_BLOCK_DATA:
-      data->block[0] = inb_p(SMBHSTDAT0);
+      len = inb_p(SMBHSTDAT0);
+      if(len > 32)      
+        len = 32;
+      data->block[0] = len;
       outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT); /* Reset SMBBLKDAT */
-      for (i = 1; i <= data->block[0]; i++)
+      for (i = 1; i <= data->block[0]; i++) {
         data->block[i] = inb_p(SMBBLKDAT);
+#ifdef DEBUG
+        printk("i2c-ali15x3.o: Blk: len=%d, i=%d, data=%02x\n", len, i, data->block[i]);
+#endif DEBUG
+      }
       break;
   }