X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fi2c.h;fp=bertos%2Fdrv%2Fi2c.h;h=c7fa9587f8aa960767a375c059c53b23af41f54d;hb=f062d0cd413c738978ac8781da89a12301615754;hp=bfbf8ba052d84b8319ee4b960a1cfb594637b116;hpb=6603c2b445fbcf90b45c07f302cb993b4908a601;p=bertos.git

diff --git a/bertos/drv/i2c.h b/bertos/drv/i2c.h
index bfbf8ba0..c7fa9587 100644
--- a/bertos/drv/i2c.h
+++ b/bertos/drv/i2c.h
@@ -54,9 +54,13 @@
 #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
 
 /**
@@ -71,8 +75,6 @@
 #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,
@@ -106,19 +108,19 @@ int i2c_bitbang_get(bool ack);
 /*\}*/
 
 #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_init_0      i2c_builtin_init
+	#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_init_0      i2c_bitbang_init
+	#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,7 +129,6 @@ int i2c_bitbang_get(bool ack);
 bool i2c_send(const void *_buf, size_t count);
 bool i2c_recv(void *_buf, size_t count);
 
-#endif
 
 /*
  * I2c new api
@@ -159,18 +160,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
@@ -190,8 +191,8 @@ typedef struct I2c
  */
 void i2c_hw_init(I2c *i2c, int dev, uint32_t clock);
 
-void i2c_swSend(struct I2c *i2c, const void *_buf, size_t count);
-void i2c_swRecv(struct I2c *i2c, void *_buf, size_t count);
+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)
 {
@@ -207,25 +208,25 @@ 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);
 
@@ -233,7 +234,7 @@ INLINE uint8_t i2c_get(I2c *i2c)
 
 	if (!i2c->errors)
 	{
-		uint8_t data = i2c->vt->get(i2c);
+		uint8_t data = i2c->vt->getc(i2c);
 		i2c->xfer_size--;
 		return data;
 	}
@@ -241,11 +242,11 @@ INLINE uint8_t i2c_get(I2c *i2c)
 		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);
 
@@ -253,16 +254,16 @@ INLINE void i2c_put(I2c *i2c, uint8_t data)
 
 	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);
@@ -271,15 +272,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);
@@ -288,7 +289,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)