Changeset 3391

Timestamp:

09/27/99 18:00:17 (9 years ago)

Author:

frodo

Message:

Preparations for better 10-bit address support

WARNING! INTERFACE CHANGE!

All i2c_smbus_* transaction functions now use a client parameter, instead of
adapter and address parameters.

Also, at some other places 'flags' parameter are added.

Files:

• i2c/trunk/doc/writing-clients (modified) (7 diffs)
• i2c/trunk/kernel/i2c-core.c (modified) (16 diffs)
• i2c/trunk/kernel/i2c-dev.c (modified) (2 diffs)
• i2c/trunk/kernel/i2c.h (modified) (5 diffs)

i2c/trunk/doc/writing-clients

@@ -138 +138 @@
-  {
-    if (reg < 0x10) /* byte-sized register */
-->adapter,client->addr
+
-    else /* word-sized register */
-->adapter,client->addr
+
-  }
-
@@ -148 +148 @@
-      return -1;
-    else if (reg < 0x10) /* byte-sized register */
-->adapter,client->addr
+
-    else /* word-sized register */
-->adapter,client->addr
+
-  }
-
@@ -166 +166 @@
-      return res;
-    } else
-->adapter,client->addr
+
-  }
-
@@ -388 +388 @@
-   
-    /* Let's see whether this adapter can support what we need.
-
-
-
+
+
+
+
-       goto ERROR0;
-
@@ -457 +458 @@
-    new_client->adapter = adapter;
-    new_client->driver = &foo_driver;
+    new_client->flags = 0;
-
-    /* Now, we do the remaining detection. If no `force' parameter is used. */
@@ -706 +708 @@
--------------------
-
-
+
+
-                             char read_write, u8 command, int size,
-                             union i2c_smbus_data * data);
@@ -713 +716 @@
-  in terms of it. Never use this function directly!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        u8 *values);
-

i2c/trunk/kernel/i2c-core.c

@@ -832 +832 @@
-/* ----------------------------------------------------
- * the i2c address scanning function
+ * Will not work for 10-bit addresses!
- * ----------------------------------------------------
- */
@@ -840 +841 @@
-  int addr,i,found,err;
-  int adap_id = i2c_adapter_id(adapter);
+
+  /* Forget it if we can't probe using SMBUS_QUICK */
+  if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
+    return -1;
-
-  for (addr = 0x00; 
@@ -857 +862 @@
-        DEB2(printk("i2c-core.o: found force parameter for adapter %d, addr %04x\n",
-               adap_id,addr));
-
+,0
-           return err;
-        found = 1;
@@ -944 +949 @@
-    /* OK, so we really should examine this address. First check
-       whether there is some client here at all! */
-write_quick(adapter,addr,0) >= 0
-
+xfer(adapter,addr,0,0,0,I2C_SMBUS_QUICK,NULL)
+0,
-        return err;
-  }
@@ -965 +970 @@
-/* The SMBus parts */
-
-adapter * adapter, u8 addr, 
-
-
-       return i2c_smbus_xfer(adapter,addr,
-
-
-adapter * adapter,u8 addr
+client * client, u8 value)
+
+
+                              
+
+
+client * client
-{
-        union i2c_smbus_data data;
-adapter,addr,I2C_SMBUS_READ,0,I2C_SMBUS_BYTE
-                         
+client->adapter,client->addr,client->flags
+                           I2C_SMBUS_READ,0,I2C_SMBUS_BYTE,
-                return -1;
-        else
@@ -981 +986 @@
-}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-{
-        union i2c_smbus_data data;
-adapter,addr,I2C_SMBUS_READ,command
-
+client->adapter,client->addr,client->flags
+READ,command, I2C_SMBUS_
-                return -1;
-        else
@@ -999 +1002 @@
-}
-
-adapter * adapter,
-   u8 addr, 
+client * client, 
+
-{
-        union i2c_smbus_data data;
-        data.byte = value;
-
+
+
-                              I2C_SMBUS_BYTE_DATA,&data);
-}
-
-
-
+
-{
-        union i2c_smbus_data data;
-adapter,addr,I2C_SMBUS_READ,command
-
+client->adapter,client->addr,client->flags
+READ,command, I2C_SMBUS_
-                return -1;
-        else
@@ -1019 +1022 @@
-}
-
-adapter * adapter
-       u8 addr, 
+client * client
+
-{
-        union i2c_smbus_data data;
-        data.word = value;
-
+
+
-                              I2C_SMBUS_WORD_DATA,&data);
-}
-
-adapter * adapter
-   u8 addr, 
+client * client
+
-{
-        union i2c_smbus_data data;
-        data.word = value;
-
+
+
-                           I2C_SMBUS_PROC_CALL, &data))
-                return -1;
@@ -1041 +1046 @@
-
-/* Returns the number of read bytes */
-adapter * adapter
-       u8 addr, 
+client * client
+
-{
-        union i2c_smbus_data data;
-        int i;
-
+
+
-                           I2C_SMBUS_BLOCK_DATA,&data))
-                return -1;
@@ -1056 +1062 @@
-}
-
-
-
-
+
+
-{
-        union i2c_smbus_data data;
@@ -1067 +1072 @@
-                data.block[i] = values[i-1];
-        data.block[0] = length;
-
+
+
-                              I2C_SMBUS_BLOCK_DATA,&data);
-}
@@ -1074 +1080 @@
-   No checking of parameters is done!  */
-static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u8 addr, 
+                                   unsigned short flags,
-                                   char read_write, u8 command, int size, 
-                                   union i2c_smbus_data * data)
@@ -1084 +1091 @@
-        unsigned char msgbuf1[33];
-        int num = read_write == I2C_SMBUS_READ?2:1;
-0
-
+flags
+flags | 
-                                };
-        int i;
@@ -1094 +1101 @@
-                msg[0].len = 0;
-                /* Special case: The read/write field is used as data */
-
+flags | 
-                num = 1;
-                break;
@@ -1100 +1107 @@
-                if (read_write == I2C_SMBUS_READ) {
-                        /* Special case: only a read! */
-
+ | flags
-                        num = 1;
-                }
@@ -1171 +1178 @@
-
-
-
-
+
+
+
-{
-        s32 res;
+        flags = flags & I2C_M_TEN;
-        if (adapter->algo->smbus_xfer) {
-                I2C_LOCK(adapter);
-
+flags,
-                                                command,size,data);
-                I2C_UNLOCK(adapter);
-        } else
-
-  
+flags,
+
-        return res;
-}

i2c/trunk/kernel/i2c-dev.c

@@ -330 +330 @@
-           (data_arg.read_write == I2C_SMBUS_WRITE)))
-        /* These are special: we do not use data */
-
+client->flags,
-                              data_arg.read_write, data_arg.command,
-                              data_arg.size, NULL);
@@ -365 +365 @@
-          (data_arg.read_write == I2C_SMBUS_WRITE))
-        copy_from_user(&temp,data_arg.data,datasize);
-
+
+
-                           data_arg.command,data_arg.size,&temp);
-      if (! res && ((data_arg.size == I2C_SMBUS_PROC_CALL) || 

i2c/trunk/kernel/i2c.h

@@ -98 +98 @@
-#define I2C_M_TENMASK   0x06
-#define I2C_M_RD        0x01
+#if 0
-#define I2C_M_PROBE     0x20
+#endif
-        short len;              /* msg length                           */
-        char *buf;              /* pointer to msg data                  */
@@ -110 +112 @@
-   smbus adapter to call this function. */
-extern s32 i2c_smbus_xfer (struct i2c_adapter * adapter, u8 addr, 
+                           unsigned short flags,
-                           char read_write, u8 command, int size,
-                           union i2c_smbus_data * data);
@@ -116 +119 @@
-   conventions of smbus_access. */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-/* Returns the number of read bytes */
-adapter * adapter
-addr, u8 
-adapter * adapter
-addr, u8 
+client * client
+
+client * client
+
-                                      u8 *values);
-
@@ -223 +222 @@
-        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], 
-                           int num);
-
+
+
-                           u8 command, int size, union i2c_smbus_data * data);
-
@@ -337 +337 @@
- */
-typedef int i2c_client_found_addr_proc (struct i2c_adapter *adapter,
-
+unsigned short flags,
-
-extern int i2c_probe(struct i2c_adapter *adapter,