Changeset 3392

Timestamp:

09/27/99 18:30:01 (9 years ago)

Author:

frodo

Message:

Better 10-bit addresses support

* 10-bit addresses are now passes just like 7-bit addresses; we had to

enlarge address fields to 16 bits at some places. A single bit in
client->flags now determines whether this is a 10-bit address

* i2c-dev now supports the 10-bit IOCTL again
* Documentation updates

Files:

• i2c/trunk/doc/dev-interface (modified) (1 diff)
• i2c/trunk/doc/writing-clients (modified) (2 diffs)
• 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) (4 diffs)
• i2c/trunk/kernel/i2c-dev.c (modified) (1 diff)
• i2c/trunk/kernel/i2c.h (modified) (5 diffs)

i2c/trunk/doc/dev-interface

@@ -78 +78 @@
-(see also i2c-dev.h and i2c.h):
-
-__u8
+u16
-  Change slave address. The address is passed in the 7 lower bits of the
- the 8
+ed in the 10
-  case).
-
-
-
-
-
+
+
+
-
-Other values are NOT supported at this moment, except for I2C_SMBUS,

i2c/trunk/doc/writing-clients

@@ -375 +375 @@
-detection just fails for this address, return 0.
-
+For now, you can ignore the `flags' parameter. It is there for future use.
+
-  /* Unique ID allocation */
-  static int foo_id = 0;
-
-
+
+
-  {
-    int err = 0;
@@ -708 +711 @@
--------------------
-
-8
+16
-                             unsigned short flags,
-                             char read_write, u8 command, int size,

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

@@ -443 +443 @@
-        if ( (flags & I2C_M_TEN)  ) { 
-                /* a ten bit address */
- flags & I2C_M_TENMASK 
+( msg->addr >> 7) & 0x03
-                DEB2(printk("addr0: %d\n",addr));
-                /* try extended address code...*/
@@ -452 +452 @@
-                }
-                /* the remaining 8 bit address */
-
+ & 0x7f
-                if (ret != 1) {
-                        printk("died at 2nd address code.\n");

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

@@ -384 +384 @@
-        if ( (flags & I2C_M_TEN)  ) { 
-                /* a ten bit address */
-               addr = 0xf0 | ( flags & I2C_M_TENMASK 
+                addr = 0xf0 | (( msg->addr >> 7) & 0x03
-                DEB2(printk("addr0: %d\n",addr));
-                /* try extended address code...*/
@@ -393 +393 @@
-                }
-                /* the remaining 8 bit address */
-
+ & 0x7f
-/* Status check comes here */
-                if (ret != 1) {

i2c/trunk/kernel/i2c-core.c

@@ -753 +753 @@
-        if (client->adapter->algo->master_xfer) {
-                msg.addr   = client->addr;
-( I2C_M_TEN|I2C_M_TENMASK )
+I2C_M_TEN
-                msg.len = count;
-                (const char *)msg.buf = buf;
@@ -782 +782 @@
-        if (client->adapter->algo->master_xfer) {
-                msg.addr   = client->addr;
-( I2C_M_TEN|I2C_M_TENMASK )
+I2C_M_TEN
-                msg.flags |= I2C_M_RD;
-                msg.len = count;
@@ -1079 +1079 @@
-/* Simulate a SMBus command using the i2c protocol 
-   No checking of parameters is done!  */
-8
+16
-                                   unsigned short flags,
-                                   char read_write, u8 command, int size, 
@@ -1178 +1178 @@
-
-
-8
+16
-                   char read_write, u8 command, int size, 
-                   union i2c_smbus_data * data)

i2c/trunk/kernel/i2c-dev.c

@@ -277 +277 @@
-  switch ( cmd ) {
-    case I2C_SLAVE:
-arg > 0x7f
+(arg > 0x3ff) || (((client->flags & I2C_M_TEN) == 0) && arg > 0x7f)
-        return -EINVAL;
-      client->addr = arg;
-      return 0;
-    case I2C_TENBIT:
-
-
+
+
+
+
+
-    case I2C_SMBUS:
-      if (! arg) {

i2c/trunk/kernel/i2c.h

@@ -89 +89 @@
- */
-struct i2c_msg {
-nsigned char
+16
-        unsigned short flags;           
-#define I2C_M_TEN       0x10    /* we have a ten bit chip address       */
-#define I2C_M_TEN0      0x10    /* herein lie the first 2 bits          */
-#define I2C_M_TEN1      0x12
-#define I2C_M_TEN2      0x14
-#define I2C_M_TEN3      0x16
-#define I2C_M_TENMASK   0x06
-#define I2C_M_RD        0x01
-#if 0
@@ -111 +106 @@
-   Note that we use i2c_adapter here, because you do not need a specific
-   smbus adapter to call this function. */
-8
+16
-                           unsigned short flags,
-                           char read_write, u8 command, int size,
@@ -194 +189 @@
-                                        /* addresses are stored in the  */
-                                        /* _LOWER_ 7 bits of this char  */
-                                        /* 10 bit addresses use the full*/
-                                        /* 8 bits & the flags like in   */
-                                        /* i2c_msg                      */
-        /* addr: unsigned int to make lm_sensors i2c-isa adapter work
-           more cleanly. It does not take any more memory space, due to
@@ -222 +214 @@
-        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], 
-                           int num);
-8
+16
-                           unsigned short flags, char read_write,
-                           u8 command, int size, union i2c_smbus_data * data);
@@ -437 +429 @@
-/* this is for i2c-dev.c        */
-#define I2C_SLAVE       0x0703  /* Change slave address                 */
-
-
-
-
-
-
+
+
-
-#define I2C_ACK_TEST    0x0710  /* See if a slave is at a specific adress */