Changeset 3748

Timestamp:

12/20/02 15:13:18 (10 years ago)

Author:

kmalkki

Message:

(Kyösti)

Combatibility code with i2c-algo-bit. There is no need to modify
adapter code, but the feature is not compiled by default to avoid
collision in exported symbol names.

Files:

• i2c/trunk/kernel/i2c-algo-biths.c (modified) (3 diffs)

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

@@ -39 +39 @@
 /* ----- global defines ----------------------------------------------- */
 
+/* If non-zero, adapter code written for original i2c-algo-bit can be used unmodified. 
+ * As this export same symbols, you should either remove i2c-algo-bit.o from depmod
+ * directories, or load this module manually.
+ */
+#define ALGO_BIT_COMPATIBILITY 0
+
 #define FATAL_BUS       0
 #define MODULE_STATUS   1
@@ -242 +248 @@
 
         case -ENODEV:
-            return "SCL/SDA failure, cannot pull low";
+            return "SCL/SDA failure";
 
         default:
@@ -507 +513 @@
 };
 
+
+#if ALGO_BIT_COMPATIBILITY 
+#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)
+{
+    return old->getscl(old->data);
+}
+
+static inline int _hw_getsda(struct i2c_algo_bit_data *old)
+{
+    return old->getsda(old->data);
+}
+
+static inline void _hw_timer(int dt)
+{
+    udelay(dt);
+}
+
+#define INCLUDE_BITHS_INLINES
+#include "i2c-algo-biths.h"
+static void _ba_setscl(struct i2c_algo_biths_data *adap)
+{
+    adap->state = adap->flags;
+    i2c_bit_setscl(adap);
+}
+static void _ba_setsda(struct i2c_algo_biths_data *adap)
+{
+    adap->state = adap->flags;
+    i2c_bit_setsda(adap);
+}
+static int _ba_getscl(struct i2c_algo_biths_data *adap)
+{
+    return i2c_bit_getscl(adap);
+}
+static int _ba_getsda(struct i2c_algo_biths_data *adap)
+{
+    return i2c_bit_getsda(adap);
+}
+
+static struct i2c_algo_biths_data _ba_template = {
+        setsda:  _ba_setsda,
+        setscl:  _ba_setscl,
+        getsda:  _ba_getsda,
+        getscl:  _ba_getscl,
+};
+
+/* 
+ * registering functions to load algorithms at runtime 
+ */
+int i2c_bit_add_bus(struct i2c_adapter *i2c_adap)
+{
+        int i;
+        struct i2c_algo_bit_data *old_adap = i2c_adap->algo_data;
+        struct i2c_algo_biths_data *adap;
+
+        adap = kmalloc(sizeof(struct i2c_algo_biths_data), GFP_KERNEL);
+        if (adap==NULL)
+            return -ENOMEM;
+
+        memcpy(adap, &_ba_template, sizeof(struct i2c_algo_biths_data));
+        adap->data = old_adap;
+        adap->udelay = (old_adap->udelay+1)>>1; /* 1/4 vs 1/2 cycle */
+        adap->timeout = old_adap->timeout;
+        i2c_adap->algo_data = adap;
+
+        return i2c_biths_add_bus(i2c_adap);
+}
+
+
+int i2c_bit_del_bus(struct i2c_adapter *i2c_adap)
+{
+        int res;
+
+        if ((res = i2c_biths_del_bus(i2c_adap)) < 0)
+            return res;
+
+        kfree(i2c_adap->algo_data);
+        return 0;
+}
+
+EXPORT_SYMBOL(i2c_bit_add_bus);
+EXPORT_SYMBOL(i2c_bit_del_bus);
+
+#endif
+
 /* 
  * registering functions to load algorithms at runtime