Changeset 3737

Timestamp:

12/03/02 23:31:34 (10 years ago)

Author:

kmalkki

Message:

(Kyösti) Fix clock cycle high time when client device has pulled and

released SCL within the timeout period in sclhi().

Document I2C_M_IGNORE_NAK and I2C_M_NO_RD_ACK flags.
Fix I2C_M_NOSTART description and example.

Location:

i2c/trunk

Files:

• CHANGES (modified) (2 diffs)
• doc/i2c-protocol (modified) (2 diffs)
• kernel/i2c-algo-bit.c (modified) (2 diffs)
• kernel/i2c.h (modified) (2 diffs)

i2c/trunk/CHANGES

@@ -20 +20 @@
 2.7.0 (200211??)
   drivers (several): C99 initializers (sync w/ kernel 2.5.49); HZ fixes
-  i2c.h: Add I2C_M_IGNORE_NAK.
+  i2c.h: Add I2C_M_IGNORE_NAK, I2C_M_NO_RD_ACK to flags.
   i2c-algo-bit.c: Support I2C_M_IGNORE_NAK. Use time_after() with jiffies.
-           Debug message improvements.     
+           Debug message improvements. Fix clock high time in sclhi().
   i2c-algo-8xx.c: Several updates and cleanups
   i2c-algo-ibm_ocp.[ch], i2c-adap-ibm_ocp.c: Rename i2c_iic_[add,del]_bus to
@@ -32 +32 @@
   i2c-proc.h: Add SENSORS_INSMOD_8; add naming for new dummy adapters
   mkpatch: Fix export-objs
+  doc/i2c-protocol: Comment new client flags, fix I2C_M_NOSTART samples.
   Makefile: Take kernel source location from /lib/modules/x.x.x/build
 

i2c/trunk/doc/i2c-protocol

@@ -53 +53 @@
 
   Flag I2C_M_NOSTART: 
-    In a combined transaction, no 'S Addr' is generated at some point.
-    For example, setting I2C_M_NOSTART on the second partial message
+    In a combined transaction, no 'S Addr Wr/Rd [A]' is generated at some
+    point. For example, setting I2C_M_NOSTART on the second partial message
     generates something like:
-      S Addr Rd [A] [Data] NA Wr [A] Data [A] P
+      S Addr Rd [A] [Data] NA Data [A] P
     If you set the I2C_M_NOSTART variable for the first partial message,
     we do not generate Addr, but we do generate the startbit S. This will
@@ -66 +66 @@
     flag. For example:
       S Addr Rd [A] Data [A] Data [A] ... [A] Data [A] P
-                      
+
+  Flags I2C_M_IGNORE_NAK
+    Normally message is interrupted immediately if there is [NA] from the
+    client. Setting this flag treats any [NA] as [A], and all of
+    message is sent.
+    These messages may still fail to SCL lo->hi timeout.
+
+  Flags I2C_M_NO_RD_ACK
+    In a read message, master A/NA bit is skipped.

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

@@ -103 +103 @@
 
         setscl(adap,1);
-        udelay(adap->udelay);
 
         /* Not all adapters have scl sense line... */
@@ -127 +126 @@
         }
         DEBSTAT(printk(KERN_DEBUG "needed %ld jiffies\n", jiffies-start));
+        udelay(adap->udelay);
 #ifdef SLO_IO
         SLO_IO

i2c/trunk/kernel/i2c.h

@@ -398 +398 @@
 #define I2C_M_NOSTART   0x4000
 #define I2C_M_REV_DIR_ADDR      0x2000
-#define I2C_M_IGNORE_NAK        0x1000   
+#define I2C_M_IGNORE_NAK        0x1000
+#define I2C_M_NO_RD_ACK         0x0800
         short len;              /* msg length                           */
         char *buf;              /* pointer to msg data                  */
@@ -407 +408 @@
 #define I2C_FUNC_I2C                    0x00000001
 #define I2C_FUNC_10BIT_ADDR             0x00000002
-#define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART} */
+#define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */
 #define I2C_FUNC_SMBUS_HWPEC_CALC       0x00000008 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_READ_WORD_DATA_PEC  0x00000800 /* SMBus 2.0 */