X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fi2c.h;h=f7812d4ebbc3692e6d5d5d88d26f4cd45f46bf08;hb=b8b117e9bfea06d37acf7df7a7d7864d9e131c02;hp=1a0dbffedc64067e0af9600e2ccaad0ed939344b;hpb=fee98f3f227cdc2f98599335205f6a04fe6bf06a;p=bertos.git

diff --git a/bertos/drv/i2c.h b/bertos/drv/i2c.h
index 1a0dbffe..f7812d4e 100644
--- a/bertos/drv/i2c.h
+++ b/bertos/drv/i2c.h
@@ -37,6 +37,7 @@
  * $WIZ$ module_name = "i2c"
  * $WIZ$ module_configuration = "bertos/cfg/cfg_i2c.h"
  * $WIZ$ module_hw = "bertos/hw/hw_i2c_bitbang.h"
+ * $WIZ$ module_depends = "i2c_bitbang"
  * $WIZ$ module_supports = "not atmega103 and not atmega168 and not at91"
  */
 
@@ -54,25 +55,48 @@
 #define I2C_READBIT BV(0)
 
 #if COMPILER_C99
-	#define i2c_init(...)     PP_CAT(i2c_init ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+	#define i2c_init(...)           PP_CAT(i2c_init ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+	#define i2c_start_w(...)        PP_CAT(i2c_start_w ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+	#define i2c_start_r(...)        PP_CAT(i2c_start_r ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
 #else
-	#define i2c_init(args...)     PP_CAT(i2c_init ## _, COUNT_PARMS(args)) (args)
+	#define i2c_init(args...)       PP_CAT(i2c_init ## _, COUNT_PARMS(args)) (args)
+	#define i2c_start_w(args...)    PP_CAT(i2c_start_w ## _, COUNT_PARMS(args)) (args)
+	#define i2c_start_r(args...)    PP_CAT(i2c_start_r ## _, COUNT_PARMS(args)) (args)
 #endif
 
+
+/**
+ * \name I2C bitbang devices enum
+ */
+enum
+{
+	I2C_BITBANG_OLD = -1,
+	I2C_BITBANG0 = 1000,
+	I2C_BITBANG1,
+	I2C_BITBANG2,
+	I2C_BITBANG3,
+	I2C_BITBANG4,
+	I2C_BITBANG5,
+	I2C_BITBANG6,
+	I2C_BITBANG7,
+	I2C_BITBANG8,
+	I2C_BITBANG9,
+
+	I2C_BITBANG_CNT  /**< Number of serial ports */
+};
+
+#if !CONFIG_I2C_DISABLE_OLD_API
+
 /**
  * I2C Backends.
  * Sometimes your cpu does not have a builtin
  * i2c driver or you don't want, for some reason, to
  * use that.
  * With this you can choose, at compile time, which backend to use.
- *
- * $WIZ$ i2c_backend = "I2C_BACKEND_BUILTIN", "I2C_BACKEND_BITBANG"
  */
 #define I2C_BACKEND_BUILTIN 0 ///< Uses cpu builtin i2c driver
 #define I2C_BACKEND_BITBANG 1 ///< Uses emulated bitbang driver
 
-#if 0
-
 /**
  * I2c builtin prototypes.
  * Do NOT use these function directly, instead,
@@ -81,7 +105,6 @@
  * that you want the builtin backend.
  * \{
  */
-void i2c_builtin_init(void);
 bool i2c_builtin_start_w(uint8_t id);
 bool i2c_builtin_start_r(uint8_t id);
 void i2c_builtin_stop(void);
@@ -97,7 +120,6 @@ int i2c_builtin_get(bool ack);
  * that you want the bitbang backend.
  * \{
  */
-void i2c_bitbang_init(void);
 bool i2c_bitbang_start_w(uint8_t id);
 bool i2c_bitbang_start_r(uint8_t id);
 void i2c_bitbang_stop(void);
@@ -105,20 +127,22 @@ bool i2c_bitbang_put(uint8_t _data);
 int i2c_bitbang_get(bool ack);
 /*\}*/
 
+#ifndef CONFIG_I2C_BACKEND
+#define  CONFIG_I2C_BACKEND  I2C_BACKEND_BUILTIN
+#endif
+
 #if CONFIG_I2C_BACKEND == I2C_BACKEND_BUILTIN
-	#define i2c_init_0    i2c_builtin_init
-	#define i2c_start_w   i2c_builtin_start_w
-	#define i2c_start_r   i2c_builtin_start_r
-	#define i2c_stop      i2c_builtin_stop
-	#define i2c_put       i2c_builtin_put
-	#define i2c_get       i2c_builtin_get
+	#define i2c_start_w_1   i2c_builtin_start_w
+	#define i2c_start_r_1   i2c_builtin_start_r
+	#define i2c_stop        i2c_builtin_stop
+	#define i2c_put         i2c_builtin_put
+	#define i2c_get         i2c_builtin_get
 #elif CONFIG_I2C_BACKEND == I2C_BACKEND_BITBANG
-	#define i2c_init_0    i2c_bitbang_init
-	#define i2c_start_w   i2c_bitbang_start_w
-	#define i2c_start_r   i2c_bitbang_start_r
-	#define i2c_stop      i2c_bitbang_stop
-	#define i2c_put       i2c_bitbang_put
-	#define i2c_get       i2c_bitbang_get
+	#define i2c_start_w_1   i2c_bitbang_start_w
+	#define i2c_start_r_1   i2c_bitbang_start_r
+	#define i2c_stop        i2c_bitbang_stop
+	#define i2c_put         i2c_bitbang_put
+	#define i2c_get         i2c_bitbang_get
 #else
 	#error Unsupported i2c backend.
 #endif
@@ -127,24 +151,25 @@ int i2c_bitbang_get(bool ack);
 bool i2c_send(const void *_buf, size_t count);
 bool i2c_recv(void *_buf, size_t count);
 
-#endif
+#endif /* !CONFIG_I2C_DISABLE_OLD_API */
 
 /*
- * I2c new api
- *
+ * I2C error flags
  */
-#define I2C_OK               0
-#define I2C_ERR           BV(3)
-#define I2C_ARB_LOST      BV(2)
-#define I2C_START_TIMEOUT BV(0)
-#define I2C_NO_ACK        BV(1)
+#define I2C_OK               0     ///< I2C no errors flag
+#define I2C_DATA_NACK     BV(4)    ///< I2C generic error
+#define I2C_ERR           BV(3)    ///< I2C generic error
+#define I2C_ARB_LOST      BV(2)    ///< I2C arbitration lost error
+#define I2C_START_TIMEOUT BV(0)    ///< I2C timeout error on start
+#define I2C_NO_ACK        BV(1)    ///< I2C no ack for sla start
 
-
-
-#define I2C_NOSTOP           0
-#define I2C_STOP          BV(0)
-#define I2C_START_R       BV(1)
-#define I2C_START_W          0
+/*
+ * I2C command flags
+ */
+#define I2C_NOSTOP           0    ///< Do not program the stop for current transition
+#define I2C_STOP          BV(0)   ///< Program the stop for current transition
+#define I2C_START_R       BV(1)   ///< Start read command
+#define I2C_START_W          0    ///< Start write command
 
 
 #define I2C_TEST_START(flag)  ((flag) & I2C_START_R)
@@ -154,18 +179,18 @@ struct I2cHardware;
 struct I2c;
 
 typedef void (*i2c_start_t)(struct I2c *i2c, uint16_t slave_addr);
-typedef uint8_t (*i2c_get_t)(struct I2c *i2c);
-typedef void (*i2c_put_t)(struct I2c *i2c, uint8_t data);
-typedef void (*i2c_send_t)(struct I2c *i2c, const void *_buf, size_t count);
-typedef void (*i2c_recv_t)(struct I2c *i2c, void *_buf, size_t count);
+typedef uint8_t (*i2c_getc_t)(struct I2c *i2c);
+typedef void (*i2c_putc_t)(struct I2c *i2c, uint8_t data);
+typedef void (*i2c_write_t)(struct I2c *i2c, const void *_buf, size_t count);
+typedef void (*i2c_read_t)(struct I2c *i2c, void *_buf, size_t count);
 
 typedef struct I2cVT
 {
 	i2c_start_t start;
-	i2c_get_t   get;
-	i2c_put_t   put;
-	i2c_send_t  send;
-	i2c_recv_t  recv;
+	i2c_getc_t   getc;
+	i2c_putc_t   putc;
+	i2c_write_t  write;
+	i2c_read_t   read;
 } I2cVT;
 
 typedef struct I2c
@@ -180,11 +205,22 @@ typedef struct I2c
 
 #include CPU_HEADER(i2c)
 
+/*
+ * Low level i2c  init implementation prototype.
+ */
+void i2c_hw_init(I2c *i2c, int dev, uint32_t clock);
+void i2c_hw_bitbangInit(I2c *i2c, int dev);
+
+void i2c_genericWrite(I2c *i2c, const void *_buf, size_t count);
+void i2c_genericRead(I2c *i2c, void *_buf, size_t count);
+
 INLINE void i2c_start(I2c *i2c, uint16_t slave_addr, size_t size)
 {
 	ASSERT(i2c->vt);
 	ASSERT(i2c->vt->start);
-	ASSERT(i2c->xfer_size == 0);
+
+	if (!i2c->errors)
+		ASSERT(i2c->xfer_size == 0);
 
 	i2c->errors = 0;
 	i2c->xfer_size = size;
@@ -192,55 +228,62 @@ INLINE void i2c_start(I2c *i2c, uint16_t slave_addr, size_t size)
 	i2c->vt->start(i2c, slave_addr);
 }
 
-INLINE void i2c_start_r(I2c *i2c, uint16_t slave_addr, size_t size, int flags)
+INLINE void i2c_start_r_4(I2c *i2c, uint16_t slave_addr, size_t size, int flags)
 {
 	ASSERT(i2c);
 	i2c->flags = flags | I2C_START_R;
 	i2c_start(i2c, slave_addr, size);
 }
 
-INLINE void i2c_start_w(I2c *i2c, uint16_t slave_addr, size_t size, int flags)
+INLINE void i2c_start_w_4(I2c *i2c, uint16_t slave_addr, size_t size, int flags)
 {
 	ASSERT(i2c);
 	i2c->flags = flags & ~I2C_START_R;
 	i2c_start(i2c, slave_addr, size);
 }
 
-INLINE uint8_t i2c_get(I2c *i2c)
+INLINE uint8_t i2c_getc(I2c *i2c)
 {
 	ASSERT(i2c);
 	ASSERT(i2c->vt);
-	ASSERT(i2c->vt->get);
+	ASSERT(i2c->vt->getc);
 
-	ASSERT(i2c->xfer_size >=  1);
+	ASSERT(i2c->xfer_size);
 
 	ASSERT(I2C_TEST_START(i2c->flags) == I2C_START_R);
 
 	if (!i2c->errors)
-		return i2c->vt->get(i2c);
+	{
+		uint8_t data = i2c->vt->getc(i2c);
+		i2c->xfer_size--;
+		return data;
+	}
 	else
 		return 0xFF;
 }
 
-INLINE void i2c_put(I2c *i2c, uint8_t data)
+INLINE void i2c_putc(I2c *i2c, uint8_t data)
 {
 	ASSERT(i2c);
 	ASSERT(i2c->vt);
-	ASSERT(i2c->vt->put);
+	ASSERT(i2c->vt->putc);
 
-	ASSERT(i2c->xfer_size >=  1);
+	ASSERT(i2c->xfer_size);
 
 	ASSERT(I2C_TEST_START(i2c->flags) == I2C_START_W);
 
 	if (!i2c->errors)
-		i2c->vt->put(i2c, data);
+	{
+		i2c->vt->putc(i2c, data);
+		i2c->xfer_size--;
+	}
 }
 
-INLINE void i2c_send(I2c *i2c, const void *_buf, size_t count)
+INLINE void i2c_write(I2c *i2c, const void *_buf, size_t count)
 {
 	ASSERT(i2c);
 	ASSERT(i2c->vt);
-	ASSERT(i2c->vt->send);
+	ASSERT(i2c->vt->write);
 
 	ASSERT(_buf);
 	ASSERT(count);
@@ -249,15 +292,15 @@ INLINE void i2c_send(I2c *i2c, const void *_buf, size_t count)
 	ASSERT(I2C_TEST_START(i2c->flags) == I2C_START_W);
 
 	if (!i2c->errors)
-		i2c->vt->send(i2c, _buf, count);
+		i2c->vt->write(i2c, _buf, count);
 }
 
 
-INLINE void i2c_recv(I2c *i2c, void *_buf, size_t count)
+INLINE void i2c_read(I2c *i2c, void *_buf, size_t count)
 {
 	ASSERT(i2c);
 	ASSERT(i2c->vt);
-	ASSERT(i2c->vt->recv);
+	ASSERT(i2c->vt->read);
 
 	ASSERT(_buf);
 	ASSERT(count);
@@ -266,7 +309,7 @@ INLINE void i2c_recv(I2c *i2c, void *_buf, size_t count)
 	ASSERT(I2C_TEST_START(i2c->flags) == I2C_START_R);
 
 	if (!i2c->errors)
-		i2c->vt->recv(i2c, _buf, count);
+		i2c->vt->read(i2c, _buf, count);
 }
 
 INLINE int i2c_error(I2c *i2c)
@@ -274,12 +317,27 @@ INLINE int i2c_error(I2c *i2c)
 	ASSERT(i2c);
 	int err = i2c->errors;
 	i2c->errors = 0;
+
 	return err;
 }
 
-INLINE void i2c_init_3(I2c *i2c, int dev, uint32_t clock)
+#define i2c_init_3(i2c, dev, clock)   ((((dev) >= I2C_BITBANG0) | ((dev) == I2C_BITBANG_OLD)) ? \
+										i2c_hw_bitbangInit((i2c), (dev)) : i2c_hw_init((i2c), (dev), (clock)))
+
+#if !CONFIG_I2C_DISABLE_OLD_API
+
+extern I2c local_i2c_old_api;
+
+INLINE void i2c_init_0(void)
 {
-	i2c_hw_init(i2c, dev, clock);
+	#if CONFIG_I2C_BACKEND == I2C_BACKEND_BITBANG
+		i2c_init_3(&local_i2c_old_api, I2C_BITBANG_OLD, CONFIG_I2C_FREQ);
+	#else
+		i2c_init_3(&local_i2c_old_api, 0, CONFIG_I2C_FREQ);
+	#endif
 }
+#endif /* !CONFIG_I2C_DISABLE_OLD_API */
+
+
 
 #endif