X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fi2c.h;h=f527f359d19d375998633260ba90453e65ea600a;hb=ec1f9b136d8b9ec44272ba7ab8ddc4b729589af2;hp=361bd49d6beb1a5664013e1c5061aa1000350a94;hpb=9867c74b90cf552650677bc88e883e15c25b6bab;p=bertos.git

diff --git a/bertos/drv/i2c.h b/bertos/drv/i2c.h
index 361bd49d..f527f359 100644
--- a/bertos/drv/i2c.h
+++ b/bertos/drv/i2c.h
@@ -134,9 +134,11 @@ bool i2c_recv(void *_buf, size_t count);
  *
  */
 #define I2C_OK               0
-#define I2C_START_ERR     BV(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_ARBLST        BV(2)
+
 
 
 #define I2C_NOSTOP           0
@@ -146,6 +148,7 @@ bool i2c_recv(void *_buf, size_t count);
 
 
 #define I2C_TEST_START(flag)  ((flag) & I2C_START_R)
+#define I2C_TEST_STOP(flag)   ((flag) & I2C_STOP)
 
 struct I2cHardware;
 struct I2c;
@@ -181,7 +184,9 @@ 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;
@@ -209,12 +214,16 @@ INLINE uint8_t i2c_get(I2c *i2c)
 	ASSERT(i2c->vt);
 	ASSERT(i2c->vt->get);
 
-	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->get(i2c);
+		i2c->xfer_size--;
+		return data;
+	}
 	else
 		return 0xFF;
 }
@@ -225,12 +234,15 @@ INLINE void i2c_put(I2c *i2c, uint8_t data)
 	ASSERT(i2c->vt);
 	ASSERT(i2c->vt->put);
 
-	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->xfer_size--;
+	}
 }
 
 INLINE void i2c_send(I2c *i2c, const void *_buf, size_t count)