X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fi2c.h;h=180e7310a335bed1dc2763341f7c70645373cfaf;hb=72528d250ecbba9c5eba87ce95f7b2590a1db855;hp=dff995ccd11ba5ee7bc14f50f23d1e2deee00c48;hpb=4d0bb5f77cf16b3c153b3acb280376d0d3c86d58;p=bertos.git

diff --git a/bertos/drv/i2c.h b/bertos/drv/i2c.h
index dff995cc..180e7310 100644
--- a/bertos/drv/i2c.h
+++ b/bertos/drv/i2c.h
@@ -44,10 +44,16 @@
 #define DRV_I2C_H
 
 #include "cfg/cfg_i2c.h"
+
 #include <cfg/compiler.h>
+#include <cfg/macros.h>
+
+#include <cpu/attr.h>
 
 #define I2C_READBIT BV(0)
 
+#define i2c_init(FN_ARGS) PP_CAT(i2c_init ## _, COUNT_PARMS(FN_ARGS)) (FN_ARGS)
+
 /**
  * I2C Backends.
  * Sometimes your cpu does not have a builtin
@@ -94,19 +100,19 @@ int i2c_bitbang_get(bool ack);
 /*\}*/
 
 #if CONFIG_I2C_BACKEND == I2C_BACKEND_BUILTIN
-	#define i2c_init    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   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
 #elif CONFIG_I2C_BACKEND == I2C_BACKEND_BITBANG
-	#define i2c_init    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   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
 #else
 	#error Unsupported i2c backend.
 #endif
@@ -114,4 +120,107 @@ int i2c_bitbang_get(bool ack);
 bool i2c_send(const void *_buf, size_t count);
 bool i2c_recv(void *_buf, size_t count);
 
+
+/*
+ * I2c new api
+ *
+ */
+
+struct I2cHardware;
+struct I2c;
+
+typedef int (*i2c_writeRope_t)(struct I2c *i2c, uint16_t slave_addr, int flags, const void *buf, size_t len, ...);
+typedef int (*i2c_readRope_t)(struct I2c *i2c, uint16_t slave_addr, int flags, void *buf, size_t len, ...);
+
+typedef struct I2c
+{
+	int dev;
+	i2c_writeRope_t write;
+	i2c_readRope_t read;
+
+	struct I2cHardware* hw;
+} I2c;
+
+
+#include CPU_HEADER(i2c)
+
+INLINE void i2c_init_3(I2c *i2c, int dev, uint32_t clock)
+{
+	i2c_hw_init(i2c, dev, clock);
+}
+
+#define i2c_write(FN_ARGS) PP_CAT(i2c_write ## _, COUNT_PARMS(FN_ARGS)) (FN_ARGS)
+#define i2c_read(FN_ARGS) PP_CAT(i2c_read ## _, COUNT_PARMS(FN_ARGS)) (FN_ARGS)
+
+/*
+ * Overloaded functions definition.
+ */
+INLINE int i2c_write_5(I2c *i2c, uint16_t slave_addr, int flags, const void *buf, size_t len)
+{
+	return i2c->write(i2c, slave_addr, flags, buf, len, NULL);
+}
+
+INLINE int i2c_read_5(I2c *i2c, uint16_t slave_addr, int flags, void *buf, size_t len)
+{
+	return i2c->read(i2c, slave_addr, flags, buf, len, NULL);
+}
+
+
+INLINE int i2c_write_7(I2c *i2c, uint16_t slave_addr, int flags, const void *buf, size_t len,
+														  const void *buf1, size_t len1)
+{
+	return i2c->write(i2c, slave_addr, flags, buf, len,
+											  buf1, len1, NULL);
+}
+
+INLINE int i2c_read_7(I2c *i2c, uint16_t slave_addr, int flags, void *buf, size_t len,
+														 void *buf1, size_t len1)
+
+{
+	return i2c->read(i2c, slave_addr, flags, buf, len,
+											 buf1, len1, NULL);
+}
+
+
+INLINE int i2c_write_9(I2c *i2c, uint16_t slave_addr, int flags, const void *buf, size_t len,
+														  const void *buf1, size_t len1,
+														  const void *buf2, size_t len2)
+{
+	return i2c->write(i2c, slave_addr, flags, buf, len,
+											  buf1, len1,
+											  buf2, len2, NULL);
+}
+
+INLINE int i2c_read_9(I2c *i2c, uint16_t slave_addr, int flags, void *buf, size_t len,
+														 void *buf1, size_t len1,
+														 void *buf2, size_t len2)
+{
+	return i2c->read(i2c, slave_addr, flags, buf, len,
+											  buf1, len1,
+											  buf2, len2, NULL);
+}
+
+INLINE int i2c_write_11(I2c *i2c, uint16_t slave_addr, int flags, const void *buf, size_t len,
+														  const void *buf1, size_t len1,
+														  const void *buf2, size_t len2,
+														  const void *buf3, size_t len3)
+{
+	return i2c->write(i2c, slave_addr, flags, buf, len,
+											  buf1, len1,
+											  buf2, len2,
+											  buf3, len3, NULL);
+}
+
+INLINE int i2c_read_11(I2c *i2c, uint16_t slave_addr, int flags, void *buf, size_t len,
+														 void *buf1, size_t len1,
+														 void *buf2, size_t len2,
+														 void *buf3, size_t len3)
+
+{
+	return i2c->read(i2c, slave_addr, flags, buf, len,
+											  buf1, len1,
+											  buf2, len2,
+											  buf3, len3, NULL);
+}
+
 #endif