Changeset 3750

Timestamp:

12/29/02 22:56:44 (10 years ago)

Author:

kmalkki

Message:

(Kyösti) Moved code sections from .h to .c as there was no reason to

keep them inlined.

Fix protocol byte dump. Compile bit-level protocol dump in by default.

Location:

i2c/trunk/kernel

Files:

• i2c-algo-biths.c (modified) (7 diffs)
• i2c-algo-biths.h (modified) (2 diffs)

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

@@ -51 +51 @@
 #define ALL_MSG         4
 #define ALL_PROTOCOL    5
+#define BIT_LEVEL       9
 
 #define DEB1(x)         if (i2c_debug>=MODULE_STATUS) (x);
@@ -56 +57 @@
 static void proto_x(char *d, const char *x, unsigned char y) { while (*d) d++; sprintf(d, x, y); }
 #define PROTO_S(x)      if (adap->dstr) proto_s(adap->dstr, x)
+#define PROTO_B(x)      if ((adap->dstr) && (i2c_debug>=BIT_LEVEL)) proto_s(adap->dstr, x)
 #define PROTO_X(x,y)    if (adap->dstr) proto_x(adap->dstr, x, y)
 
-#if 1
-#define PROTO_B(x)
-#define PROTO_MAX_DUMP 512  // upto 50 x " [xx] [xx]"
-#else
-#define PROTO_B(x) PROTO_S(x)
 #define PROTO_MAX_DUMP 1024  // 50 x ".oooooooo [xx] .i[xx]"
-#endif
 
 /* ----- global variables --------------------------------------------- */
@@ -83 +79 @@
 #define _sf(a)          adap->ctrl|=(a)
 #define _cf(a)          adap->ctrl&=~(a)
-#define ___setscl(b)    if (b) _sf(_HS_SCL); else _cf(_HS_SCL);\
-                        adap->setstate(adap); adap->setscl(adap) 
-#define ___setsda(b)    if (b) _sf(_HS_SDA); else _cf(_HS_SDA);\
-                        adap->setstate(adap); adap->setsda(adap)
+#define ___setscl(b)    if (b) _sf(_HS_SCL); else _cf(_HS_SCL); i2c_setscl(adap)
+#define ___setsda(b)    if (b) _sf(_HS_SDA); else _cf(_HS_SDA); i2c_setsda(adap)
 
 #define __setdt(x,dt)   if (dt) _sf(dt); x; if (dt) _cf(dt)
-#define __setscl(b,dt)  __setdt(___setscl(b),dt);
-#define __setsda(b,dt)  __setdt(___setsda(b),dt);
-#define __getscl()      adap->getscl(adap)
-#define __getsda()      adap->getsda(adap)
-
+#define __setscl(b,dt)  __setdt(___setscl(b),dt)
+#define __setsda(b,dt)  __setdt(___setsda(b),dt)
+#define __getscl()      i2c_getscl(adap)
+#define __getsda()      i2c_getsda(adap)
 
 #define RETURN_ON_FAILURE(x)            x; if (adap->errors) return
@@ -108 +101 @@
 #define _sdalo(dt)      _setsda(0,dt)
 
-/* --- other auxiliary functions -------------------------------------- */
+/* --- setting states on the bus with the right timing: --------------- */
+
+static int i2c_sda_set(struct i2c_algo_biths_data *adap, int rdcount)
+{
+    int sda;
+    /* allow some rise/fall time */
+    while ( rdcount-- ) {
+        sda = adap->getsda(adap->hw_data);
+        if (adap->ctrl & _HS_SDA) {
+            if (sda)
+                return 0;
+            if (!rdcount) {
+                adap->errors |= _HS_SDA_ARB;
+                return -1;
+            }
+        } else { /* !(adap->ctrl & _HS_SDA) */
+            if (!sda)
+                return 0;
+            if (!rdcount) {
+                adap->errors |= _HS_HW_FAIL;
+                return -1;
+            }
+        }
+    }
+    return 0;
+}
+
+static void i2c_setsda(struct i2c_algo_biths_data *adap)
+{
+    adap->setstate(adap); 
+    adap->setsda(adap->hw_data, adap->hw_state);
+    if ( !(adap->ctrl & _HS_SDA_FREE) && ! i2c_sda_set(adap, 10)) {
+        return;
+    }
+    adap->set_timer(adap);
+    adap->run_timer(adap);
+}
+
+static int i2c_getscl(struct i2c_algo_biths_data *adap)
+{
+    return adap->getscl(adap->hw_data);
+}
+
+static int i2c_getsda(struct i2c_algo_biths_data *adap)
+{
+    return adap->getsda(adap->hw_data);
+}
+/*
+ * Raise scl line, and do check for delays. This is necessary for slower
+ * devices.
+ */
+
+static void i2c_setscl(struct i2c_algo_biths_data *adap)
+{
+#ifndef HW_CANNOT_READ_SCL /* Not all adapters have scl sense line... */
+    int rdcount = 10;
+    adap->setstate(adap);
+    adap->setscl(adap->hw_data, adap->hw_state);
+    if (adap->ctrl & _HS_SCL) {
+        unsigned long start;
+        /* allow some rise time */
+        while (rdcount && !adap->getscl(adap->hw_data)) rdcount--;
+        /* else clock synchronisation, give more time */
+        start = jiffies;
+        while (!rdcount && !adap->getscl(adap->hw_data)) {
+            if ( time_after(jiffies, start+adap->timeout) ) {
+                adap->errors |= _HS_TIMEOUT; /* scl undef */
+                return;
+            }
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+            if (current->need_resched)
+                schedule();
+#else
+            cond_resched();
+#endif
+        }
+        adap->set_timer(adap);
+        /* test for SDA arbitration when SCL is high */
+        if ( !(adap->ctrl & _HS_SDA_FREE) && ! i2c_sda_set(adap, 1)) {
+            return;
+        }
+    } else {
+        /* allow some fall time */
+        while (rdcount && adap->getscl(adap->hw_data)) rdcount--;
+        if ( !rdcount ) {
+            adap->errors |= _HS_HW_FAIL;
+            return;
+        }
+        adap->set_timer(adap);
+    }
+#else
+    adap->setstate(adap);
+    adap->setscl(adap->hw_data, adap->hw_state);
+    adap->set_timer(adap);
+#endif /* HW_CANNOT_READ_SCL */
+    adap->run_timer(adap);
+}
+
+
 /* start, repstart */
 static void i2c_start(struct i2c_algo_biths_data *adap)
@@ -175 +266 @@
 {
         while (*count) {
-            adap->shiftreg = *buf++;
+            adap->shiftreg = *buf;
             TRY(i2c_outbits(adap, 8));
-            PROTO_X(" %02X ", adap->shiftreg);
+            PROTO_X(" %02X ", *buf);
+            buf++;
             
             /* read ack: SDA should be pulled down by slave */
@@ -200 +292 @@
         while (*count) {
             TRY(i2c_inbits(adap, 8));
-            *buf++ = adap->shiftreg;
-            PROTO_X(" [%02X] ", adap->shiftreg);
+            *buf = adap->shiftreg;
+            PROTO_X(" [%02X] ", *buf);
+            buf++;
             
             if (! (flags & I2C_M_NO_RD_ACK)) {
@@ -512 +605 @@
 #include "i2c-algo-bit.h"
 
-static inline void _hw_setscl(struct i2c_algo_bit_data *old, int state)
-{
-        old->setscl(old->data, state & _HS_SCL);
-}
-
-static inline void _hw_setsda(struct i2c_algo_bit_data *old, int state)
-{
-        old->setsda(old->data, state & _HS_SDA);
-}
-
-static inline int _hw_getscl(struct i2c_algo_bit_data *old)
-{
+static _HS_ATTR_ void _old_setscl(void *hw_data, int hw_state)
+{
+        struct i2c_algo_bit_data *old = hw_data;
+        old->setscl(old->data, hw_state & _HS_SCL);
+}
+static _HS_ATTR_ void _old_setsda(void *hw_data, int hw_state)
+{
+        struct i2c_algo_bit_data *old = hw_data;
+        old->setsda(old->data, hw_state & _HS_SDA);
+}
+static _HS_ATTR_ int _old_getscl(void *hw_data)
+{
+        struct i2c_algo_bit_data *old = hw_data;
         return old->getscl(old->data);
 }
-
-static inline int _hw_getsda(struct i2c_algo_bit_data *old)
-{
+static _HS_ATTR_ int _old_getsda(void *hw_data)
+{
+        struct i2c_algo_bit_data *old = hw_data;
         return old->getsda(old->data);
 }
 
-#define INCLUDE_BITHS_INLINES
-#include "i2c-algo-biths.h"
-static  _HS_ATTR_ void _old_setstate(struct i2c_algo_biths_data *adap)
+static _HS_ATTR_ void _old_setstate(struct i2c_algo_biths_data *adap)
 {
         adap->hw_state = adap->ctrl;
-}
-
-static _HS_ATTR_ void _old_setscl(struct i2c_algo_biths_data *adap)
-{
-        i2c_bit_setscl(adap);
-}
-static _HS_ATTR_ void _old_setsda(struct i2c_algo_biths_data *adap)
-{
-        i2c_bit_setsda(adap);
-}
-static _HS_ATTR_ int _old_getscl(struct i2c_algo_biths_data *adap)
-{
-        return i2c_bit_getscl(adap);
-}
-static _HS_ATTR_ int _old_getsda(struct i2c_algo_biths_data *adap)
-{
-        return i2c_bit_getsda(adap);
 }
 

i2c/trunk/kernel/i2c-algo-biths.h

@@ -51 +51 @@
         void *hw_data;          /* private data for lowlevel routines */
         int hw_state;
-        void (*setscl)(struct i2c_algo_biths_data *adap) _HS_ATTR_ ;
-        void (*setsda)(struct i2c_algo_biths_data *adap) _HS_ATTR_ ;
-        int (*getscl) (struct i2c_algo_biths_data *adap) _HS_ATTR_ ;
-        int (*getsda) (struct i2c_algo_biths_data *adap) _HS_ATTR_ ;
+        void (*setscl)(void *hw_data, int hw_state) _HS_ATTR_ ;
+        void (*setsda)(void *hw_data, int hw_state) _HS_ATTR_ ;
+        int (*getscl) (void *hw_data) _HS_ATTR_ ;
+        int (*getsda) (void *hw_data) _HS_ATTR_ ;
 
         void (*setstate)(struct i2c_algo_biths_data *adap) _HS_ATTR_ ;
@@ -91 +91 @@
 
 #endif /* I2C_ALGO_BITHS_H */
-
-#ifdef INCLUDE_BITHS_INLINES
-
-/* --- setting states on the bus with the right timing: --------------- */
-
-#define _hw_timer_set(adap) adap->set_timer(adap)
-#define _hw_timer_run(adap) adap->run_timer(adap)
-
-static inline int sda_not_set(struct i2c_algo_biths_data *adap, int rdcount)
-{
-    int sda;
-    /* allow some rise/fall time */
-    while ( rdcount-- ) {
-        sda = _hw_getsda(adap->hw_data);
-        if (adap->ctrl & _HS_SDA) {
-            if (sda)
-                return 0;
-            if (!rdcount) {
-                adap->errors |= _HS_SDA_ARB;
-                return -1;
-            }
-        } else { /* !(adap->ctrl & _HS_SDA) */
-            if (!sda)
-                return 0;
-            if (!rdcount) {
-                adap->errors |= _HS_HW_FAIL;
-                return -1;
-            }
-        }
-    }
-    return 0;
-}
-
-static inline void i2c_bit_setsda(struct i2c_algo_biths_data *adap)
-{
-    _hw_setsda(adap->hw_data, adap->hw_state);
-    if ( !(adap->ctrl & _HS_SDA_FREE) && sda_not_set(adap, 10)) {
-        return;
-    }
-    _hw_timer_set(adap);
-    _hw_timer_run(adap);
-}
-
-/*
- * Raise scl line, and do check for delays. This is necessary for slower
- * devices.
- */
-
-static inline void i2c_bit_setscl(struct i2c_algo_biths_data *adap)
-{
-#ifndef HW_CANNOT_READ_SCL /* Not all adapters have scl sense line... */
-    int rdcount = 10;
-    _hw_setscl(adap->hw_data, adap->hw_state);
-    if (adap->ctrl & _HS_SCL) {
-        unsigned long start;
-        /* allow some rise time */
-        while (rdcount && !_hw_getscl(adap->hw_data)) rdcount--;
-        /* else clock synchronisation, give more time */
-        start = jiffies;
-        while (!rdcount && !_hw_getscl(adap->hw_data)) {
-            if ( time_after(jiffies, start+adap->timeout) ) {
-                adap->errors |= _HS_TIMEOUT; /* scl undef */
-                return;
-            }
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-            if (current->need_resched)
-                schedule();
-#else
-            cond_resched();
-#endif
-        }
-        _hw_timer_set(adap);
-        /* test for SDA arbitration when SCL is high */
-        if ( !(adap->ctrl & _HS_SDA_FREE) && sda_not_set(adap, 1)) {
-            return;
-        }
-    } else {
-        /* allow some fall time */
-        while (rdcount && _hw_getscl(adap->hw_data)) rdcount--;
-        if ( !rdcount ) {
-            adap->errors |= _HS_HW_FAIL;
-            return;
-        }
-        _hw_timer_set(adap);
-    }
-#else
-    _hw_setscl(adap->hw_data, adap->hw_state);
-    _hw_timer_set(adap);
-#endif /* HW_CANNOT_READ_SCL */
-    _hw_timer_run(adap);
-}
-
-static inline int i2c_bit_getscl(struct i2c_algo_biths_data *adap)
-{
-    return _hw_getscl(adap->hw_data);
-}
-
-static inline int i2c_bit_getsda(struct i2c_algo_biths_data *adap)
-{
-    return _hw_getsda(adap->hw_data);
-}
-
-#endif