Changeset 3388

Timestamp:

09/27/99 13:33:18 (9 years ago)

Author:

frodo

Message:

New `functionality' (features) implemented

* A new callback `functionality' in the algorithm structure:

u32 (*functionality) (struct i2c_adapter *);

* New general purpose routines in i2c.h

/* Return functionality */
u32 i2c_get_functionality (struct i2c_adapter *adap);
/* Return 1 if all functionality is supported, 0 if not */
int i2c_check_functionality (struct i2c_adapter *adap, u32 func);

* New macros in i2c.h

#define I2C_FUNC_I2C 0x00000001
#define I2C_FUNC_10BIT_ADDR 0x00000002
#define I2C_FUNC_SMBUS_QUICK 0x00010000
#define I2C_FUNC_SMBUS_READ_BYTE 0x00020000
#define I2C_FUNC_SMBUS_WRITE_BYTE 0x00040000
#define I2C_FUNC_SMBUS_READ_BYTE_DATA 0x00080000
#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA 0x00100000
#define I2C_FUNC_SMBUS_READ_WORD_DATA 0x00200000
#define I2C_FUNC_SMBUS_WRITE_WORD_DATA 0x00400000
#define I2C_FUNC_SMBUS_PROC_CALL 0x00800000
#define I2C_FUNC_SMBUS_READ_BLOCK_DATA 0x01000000
#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
#define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 /* New I2C-like block */
#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* transfers */

* A single define I2C_FUNC_SMBUS_EMUL with all SMBus things that can be

simulated on a plain i2c adapter;

* Implemented the call-back function in both i2c-algo-bit.c and i2c-algo-pcf.c
* Updated the documentation

Files:

• i2c/trunk/doc/writing-clients (modified) (1 diff)
• i2c/trunk/kernel/i2c-algo-bit.c (modified) (2 diffs)
• i2c/trunk/kernel/i2c-algo-pcf.c (modified) (2 diffs)
• i2c/trunk/kernel/i2c-core.c (modified) (2 diffs)
• i2c/trunk/kernel/i2c.h (modified) (2 diffs)

i2c/trunk/doc/writing-clients

@@ -379 +379 @@
-    const char *client_name = ""; /* For non-`sensors' drivers, put the real
-                                     name here! */
+   
+    /* Let's see whether this adapter can support what we need.
+       Please substitute the things you need here! */
+    if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_READ_WORD |
+                                          I2C_FUNC_SMBUS_WRITE_WORD))
+       goto ERROR0;
-
-    /* SENSORS ONLY START */

i2c/trunk/kernel/i2c-algo-bit.c

@@ -519 +519 @@
-}
-
+static u32 bit_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
+}
+
-
-/* -----exported algorithm data: -------------------------------------  */
@@ -530 +535 @@
-        NULL,                           /* slave_recv           */
-        algo_control,                   /* ioctl                */
+        bit_func,                       /* functionality        */
-};
-

i2c/trunk/kernel/i2c-algo-pcf.c

@@ -493 +493 @@
-}
-
+static u32 pcf_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
+}
-
-/* -----exported algorithm data: -------------------------------------  */
@@ -504 +508 @@
-        NULL,                           /* slave_recv           */
-        algo_control,                   /* ioctl                */
+        pcf_func,                       /* functionality        */
-};
-

i2c/trunk/kernel/i2c-core.c

@@ -1187 +1187 @@
-
-
+/* You should always define `functionality'; the 'else' is just for
+   backward compatibility. */ 
+u32 i2c_get_functionality (struct i2c_adapter *adap)
+{
+  if (adap->algo->functionality)
+    return adap->algo->functionality(adap);
+  else
+    return 0xffffffff;
+}
+
+int i2c_check_functionality (struct i2c_adapter *adap, u32 func)
+{
+  u32 adap_func = i2c_get_functionality (adap);
+  return (func & adap_func) == func;
+}
+
+
-static int __init i2c_init(void)
-{
@@ -1301 +1318 @@
-EXPORT_SYMBOL(i2c_smbus_write_block_data);
-
+EXPORT_SYMBOL(i2c_get_functionality);
+EXPORT_SYMBOL(i2c_check_functionality);
+
-#ifdef MODULE
-MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");

i2c/trunk/kernel/i2c.h

@@ -233 +233 @@
-        int (*algo_control)(struct i2c_adapter *, unsigned int, unsigned long);
-
+        /* To determine what the adapter supports */
+        u32 (*functionality) (struct i2c_adapter *);
-};
-
@@ -349 +351 @@
- */
-extern int i2c_adapter_id(struct i2c_adapter *adap);
+
+
+/* To determine what functionality is present */
+
+#define I2C_FUNC_I2C                    0x00000001
+#define I2C_FUNC_10BIT_ADDR             0x00000002
+#define I2C_FUNC_SMBUS_QUICK            0x00010000 
+#define I2C_FUNC_SMBUS_READ_BYTE        0x00020000 
+#define I2C_FUNC_SMBUS_WRITE_BYTE       0x00040000 
+#define I2C_FUNC_SMBUS_READ_BYTE_DATA   0x00080000 
+#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA  0x00100000 
+#define I2C_FUNC_SMBUS_READ_WORD_DATA   0x00200000 
+#define I2C_FUNC_SMBUS_WRITE_WORD_DATA  0x00400000 
+#define I2C_FUNC_SMBUS_PROC_CALL        0x00800000 
+#define I2C_FUNC_SMBUS_READ_BLOCK_DATA  0x01000000 
+#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000 
+#define I2C_FUNC_SMBUS_READ_I2C_BLOCK   0x04000000 /* New I2C-like block */
+#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK  0x08000000 /* transfers          */
+#define I2C_FUNC_SMBUS_EMUL I2C_FUNC_SMBUS_QUICK | \
+                            I2C_FUNC_SMBUS_READ_BYTE | \
+                            I2C_FUNC_SMBUS_WRITE_BYTE | \
+                            I2C_FUNC_SMBUS_READ_BYTE_DATA | \
+                            I2C_FUNC_SMBUS_WRITE_BYTE_DATA | \
+                            I2C_FUNC_SMBUS_READ_WORD_DATA | \
+                            I2C_FUNC_SMBUS_WRITE_WORD_DATA | \
+                            I2C_FUNC_SMBUS_PROC_CALL | \
+                            I2C_FUNC_SMBUS_READ_BLOCK_DATA
+
+
+/* Return the functionality mask */
+extern u32 i2c_get_functionality (struct i2c_adapter *adap);
+
+/* Return 1 if adapter supports everything we need, 0 if not. */
+extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func);
+
+/* The mask of functionality any plain i2c adapter has due to SMBus
+   emulation */
+extern u32 i2c_smbus_emul_func;
-
-#endif /* __KERNEL__ */