Changeset 584

Timestamp:

09/27/99 16:19:46 (14 years ago)

Author:

frodo

Message:

`functionality' checking for clients implemented

Location:

lm-sensors/trunk/kernel

Files:

• chips/adm1021.c (modified) (1 diff)
• chips/adm9240.c (modified) (1 diff)
• chips/bt869.c (modified) (1 diff)
• chips/eeprom.c (modified) (1 diff)
• chips/gl518sm.c (modified) (1 diff)
• chips/gl520sm.c (modified) (1 diff)
• chips/lm75.c (modified) (1 diff)
• chips/lm78.c (modified) (1 diff)
• chips/lm80.c (modified) (1 diff)
• chips/ltc1710.c (modified) (1 diff)
• chips/matorb.c (modified) (1 diff)
• chips/maxilife.c (modified) (4 diffs)
• chips/sis5595.c (modified) (1 diff)
• chips/thmc50.c (modified) (1 diff)
• chips/w83781d.c (modified) (1 diff)
• sensors.c (modified) (1 diff)

lm-sensors/trunk/kernel/chips/adm1021.c

@@ -208 +208 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+    goto ERROR0;
 
   /* We need address registration for the I2C bus too. That is not yet

lm-sensors/trunk/kernel/chips/adm9240.c

@@ -362 +362 @@
 #endif
 
+  if (i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+    goto ERROR0;
+
   /* We need address registration for the I2C bus too. That is not yet
      implemented. */

lm-sensors/trunk/kernel/chips/bt869.c

@@ -179 +179 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_READ_BYTE| 
+                                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+    goto ERROR0;
+
   /* Here, we have to do the address registration check for the I2C bus.
      But that is not yet implemented. */

lm-sensors/trunk/kernel/chips/eeprom.c

@@ -173 +173 @@
   }
 #endif
+
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA | 
+                                        I2C_FUNC_SMBUS_WRITE_WORD_DATA))
+    goto ERROR0;
 
   /* Here, we have to do the address registration check for the I2C bus.

lm-sensors/trunk/kernel/chips/gl518sm.c

@@ -304 +304 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA | 
+                                        I2C_FUNC_SMBUS_WORD_DATA))
+    goto ERROR0;
 
   /* We need address registration for the I2C bus too. That is not yet

lm-sensors/trunk/kernel/chips/gl520sm.c

@@ -306 +306 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA|
+                                        I2C_FUNC_SMBUS_WORD_DATA))
+    goto ERROR0;
 
   /* We need address registration for the I2C bus too. That is not yet

lm-sensors/trunk/kernel/chips/lm75.c

@@ -152 +152 @@
   }
 #endif
+
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA |
+                                        I2C_FUNC_SMBUS_WORD_DATA))
+    goto ERROR0;
 
   /* Here, we have to do the address registration check for the I2C bus.

lm-sensors/trunk/kernel/chips/lm78.c

@@ -314 +314 @@
   int is_isa = i2c_is_isa_adapter(adapter);
 
+  if (!is_isa && ! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+    goto ERROR0;
+
   /* We need address registration for the I2C bus too. That is not yet
      implemented. */

lm-sensors/trunk/kernel/chips/lm80.c

@@ -300 +300 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+    goto ERROR0;
+
   /* Here, we have to do the address registration check for the I2C bus.
      But that is not yet implemented. */

lm-sensors/trunk/kernel/chips/ltc1710.c

@@ -167 +167 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE))
+    goto ERROR0;
+
   /* Here, we have to do the address registration check for the I2C bus.
      But that is not yet implemented. */

lm-sensors/trunk/kernel/chips/matorb.c

@@ -139 +139 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_WRITE_BYTE |
+                                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+    goto ERROR0;
+
+
   /* Here, we have to do the address registration check for the I2C bus.
      But that is not yet implemented. */

lm-sensors/trunk/kernel/chips/maxilife.c

@@ -50 +50 @@
 #include "version.h"
 #include "sensors.h"
+#include "i2c-isa.h"
 #include "compat.h"
 
@@ -265 +266 @@
 int maxi_attach_adapter(struct i2c_adapter *adapter)
 {
-   return maxi_detect_smbus(adapter);
+   if (i2c_is_isa_adapter(adapter))
+     return 0;
+   else
+     return maxi_detect_smbus(adapter);
 }
 
@@ -289 +293 @@
    /* OK, this is no detection. I know. It will do for now, though. */
    err = 0;
+
+   if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+     goto ERROR0;
+
    for (address = 0x10; (! err) && (address <= 0x14); address++) {
 
@@ -376 +384 @@
       kfree(new_client);
    }
+ERROR0:
    return err;
 }

lm-sensors/trunk/kernel/chips/sis5595.c

@@ -313 +313 @@
   const char *client_name = "";
 
-  /* Make sure we are probing the ISA bus!! This is just a safety check
-     at this moment; sensors_detect really won't call us for I2C busses. */
-#ifdef DEBUG
+  /* Make sure we are probing the ISA bus!!  */
   if (!i2c_is_isa_adapter(adapter)) {
     printk("sis5595.o: sis5595_detect called for an I2C bus adapter?!?\n");
     return 0;
   }
-#endif
 
   if (check_region(address,SIS5595_EXTENT))

lm-sensors/trunk/kernel/chips/thmc50.c

@@ -199 +199 @@
 #endif
 
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+    goto ERROR0;
+
   /* Here, we have to do the address registration check for the I2C bus.
      But that is not yet implemented. */

lm-sensors/trunk/kernel/chips/w83781d.c

@@ -646 +646 @@
   int is_isa = i2c_is_isa_adapter(adapter);
 
+  if (!is_isa && ! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
+    goto ERROR0;
+
   /* We need address registration for the I2C bus too. That is not yet
      implemented. */

lm-sensors/trunk/kernel/sensors.c

@@ -595 +595 @@
   int adapter_id = is_isa?SENSORS_ISA_BUS:i2c_adapter_id(adapter);
 
+  /* Forget it if we can't probe using SMBUS_QUICK */
+  if ((! is_isa) && ! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
+    return -1;
+
   for (addr = 0x00; 
        addr <= (is_isa?0xffff:0x7f);