X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fi2c_bitbang.c;h=9456d362aabc5aa52f8c8f53e69ca1aa7689ed63;hb=15810459b8f5fb09b12cef6f8e4d4e64d167087b;hp=2f2b7e009123f9cdc3cb5b68c4a8d0288d7ce1f2;hpb=19bf822bb4a66a3f9e41e701735021b5ebdb6a18;p=bertos.git

diff --git a/bertos/drv/i2c_bitbang.c b/bertos/drv/i2c_bitbang.c
index 2f2b7e00..9456d362 100644
--- a/bertos/drv/i2c_bitbang.c
+++ b/bertos/drv/i2c_bitbang.c
@@ -169,74 +169,122 @@ int i2c_bitbang_get(bool ack)
 	return (int)(uint8_t)data;
 }
 
-MOD_DEFINE(i2c);
-
-/**
- * Initialize i2c module.
- */
-void i2c_bitbang_init(void)
-{
-	MOD_CHECK(timer);
-	I2C_BITBANG_HW_INIT;
-	SDA_HI;
-	SCL_HI;
-	MOD_INIT(i2c);
-}
 #endif /* !CONFIG_I2C_DISABLE_OLD_API */
 
 /*
  * New I2C API
  */
+static bool old_api = false;
 #define I2C_DEV(i2c)            ((int)((i2c)->hw))
 
 static void i2c_bitbang_stop_1(struct I2c *i2c)
 {
-	i2c_sdaLo(I2C_DEV(i2c));
-	i2c_sclHi(I2C_DEV(i2c));
-	i2c_halfbitDelay(I2C_DEV(i2c));
-	i2c_sdaHi(I2C_DEV(i2c));
+	if (old_api)
+	{
+		SDA_LO;
+		SCL_HI;
+		I2C_HALFBIT_DELAY();
+		SDA_HI;
+	}
+	else
+	{
+		i2c_sdaLo(I2C_DEV(i2c));
+		i2c_sclHi(I2C_DEV(i2c));
+		i2c_halfbitDelay(I2C_DEV(i2c));
+		i2c_sdaHi(I2C_DEV(i2c));
+	}
 }
 
 INLINE bool i2c_bitbang_start_1(struct I2c *i2c)
 {
-	i2c_sdaHi(I2C_DEV(i2c));
-	i2c_sclHi(I2C_DEV(i2c));
-	i2c_halfbitDelay(I2C_DEV(i2c));
-	i2c_sdaLo(I2C_DEV(i2c));
-	i2c_halfbitDelay(I2C_DEV(i2c));
+	bool ret;
+	/* Clear all error, we restart */
+	i2c->errors &= ~(I2C_NO_ACK | I2C_ARB_LOST);
+
+	if (old_api)
+	{
+		SDA_HI;
+		SCL_HI;
+		I2C_HALFBIT_DELAY();
+		SDA_LO;
+		I2C_HALFBIT_DELAY();
+
+		ret = !SDA_IN;
+	}
+	else
+	{
+		i2c_sdaHi(I2C_DEV(i2c));
+		i2c_sclHi(I2C_DEV(i2c));
+		i2c_halfbitDelay(I2C_DEV(i2c));
+		i2c_sdaLo(I2C_DEV(i2c));
+		i2c_halfbitDelay(I2C_DEV(i2c));
 
-	return !i2c_sdaIn(I2C_DEV(i2c));
+		ret = !i2c_sdaIn(I2C_DEV(i2c));
+	}
+
+	return ret;
 }
 
 
 static uint8_t i2c_bitbang_getc(struct I2c *i2c)
 {
 	uint8_t data = 0;
-	for (uint8_t i = 0x80; i != 0; i >>= 1)
+	if (old_api)
 	{
-		i2c_sclLo(I2C_DEV(i2c));
-		i2c_halfbitDelay(I2C_DEV(i2c));
-		i2c_sclHi(I2C_DEV(i2c));
-		if (i2c_sdaIn(I2C_DEV(i2c)))
-			data |= i;
+		for (uint8_t i = 0x80; i != 0; i >>= 1)
+		{
+			SCL_LO;
+			I2C_HALFBIT_DELAY();
+			SCL_HI;
+			if (SDA_IN)
+				data |= i;
+			else
+				data &= ~i;
+
+			I2C_HALFBIT_DELAY();
+		}
+		SCL_LO;
+
+		/* Generate ACK/NACK */
+		if (i2c->xfer_size > 1)
+			SDA_LO;
 		else
-			data &= ~i;
+			SDA_HI;
 
-		i2c_halfbitDelay(I2C_DEV(i2c));
+		I2C_HALFBIT_DELAY();
+		SCL_HI;
+		I2C_HALFBIT_DELAY();
+		SCL_LO;
+		SDA_HI;
 	}
-	i2c_sclLo(I2C_DEV(i2c));
-
-	/* Generate ACK/NACK */
-	if (i2c->xfer_size > 1)
-		i2c_sdaLo(I2C_DEV(i2c));
 	else
-		i2c_sdaHi(I2C_DEV(i2c));
+	{
+		for (uint8_t i = 0x80; i != 0; i >>= 1)
+		{
+			i2c_sclLo(I2C_DEV(i2c));
+			i2c_halfbitDelay(I2C_DEV(i2c));
+			i2c_sclHi(I2C_DEV(i2c));
+			if (i2c_sdaIn(I2C_DEV(i2c)))
+				data |= i;
+			else
+				data &= ~i;
+
+			i2c_halfbitDelay(I2C_DEV(i2c));
+		}
+		i2c_sclLo(I2C_DEV(i2c));
 
-	i2c_halfbitDelay(I2C_DEV(i2c));
-	i2c_sclHi(I2C_DEV(i2c));
-	i2c_halfbitDelay(I2C_DEV(i2c));
-	i2c_sclLo(I2C_DEV(i2c));
-	i2c_sdaHi(I2C_DEV(i2c));
+		/* Generate ACK/NACK */
+		if (i2c->xfer_size > 1)
+			i2c_sdaLo(I2C_DEV(i2c));
+		else
+			i2c_sdaHi(I2C_DEV(i2c));
+
+		i2c_halfbitDelay(I2C_DEV(i2c));
+		i2c_sclHi(I2C_DEV(i2c));
+		i2c_halfbitDelay(I2C_DEV(i2c));
+		i2c_sclLo(I2C_DEV(i2c));
+		i2c_sdaHi(I2C_DEV(i2c));
+	}
 
 	/* Generate stop condition (if requested) */
 	if ((i2c->xfer_size == 1) && (i2c->flags & I2C_STOP))
@@ -245,39 +293,64 @@ static uint8_t i2c_bitbang_getc(struct I2c *i2c)
 	return data;
 }
 
-static void i2c_bitbang_putc(struct I2c *i2c, uint8_t _data)
+INLINE void i2c_bitbang_putcStop(struct I2c *i2c, uint8_t _data, bool stop)
 {
 	/* Add ACK bit */
 	uint16_t data = (_data << 1) | 1;
+	bool ack;
 
-	for (uint16_t i = 0x100; i != 0; i >>= 1)
+	if (old_api)
 	{
-		i2c_sclLo(I2C_DEV(i2c));
-		if (data & i)
-			i2c_sdaHi(I2C_DEV(i2c));
-		else
-			i2c_sdaLo(I2C_DEV(i2c));
-		i2c_halfbitDelay(I2C_DEV(i2c));
+		for (uint16_t i = 0x100; i != 0; i >>= 1)
+		{
+			SCL_LO;
+			if (data & i)
+				SDA_HI;
+			else
+				SDA_LO;
+			I2C_HALFBIT_DELAY();
+
+			SCL_HI;
+			I2C_HALFBIT_DELAY();
+		}
 
-		i2c_sclHi(I2C_DEV(i2c));
-		i2c_halfbitDelay(I2C_DEV(i2c));
+		ack = !SDA_IN;
+		SCL_LO;
+		I2C_HALFBIT_DELAY();
 	}
+	else
+	{
+		for (uint16_t i = 0x100; i != 0; i >>= 1)
+		{
+			i2c_sclLo(I2C_DEV(i2c));
+			if (data & i)
+				i2c_sdaHi(I2C_DEV(i2c));
+			else
+				i2c_sdaLo(I2C_DEV(i2c));
+			i2c_halfbitDelay(I2C_DEV(i2c));
+
+			i2c_sclHi(I2C_DEV(i2c));
+			i2c_halfbitDelay(I2C_DEV(i2c));
+		}
+		ack = !i2c_sdaIn(I2C_DEV(i2c));
 
-	bool ack = !i2c_sdaIn(I2C_DEV(i2c));
-	i2c_sclLo(I2C_DEV(i2c));
-	i2c_halfbitDelay(I2C_DEV(i2c));
+		i2c_sclLo(I2C_DEV(i2c));
+		i2c_halfbitDelay(I2C_DEV(i2c));
+	}
 
 	if (!ack)
-	{
-		LOG_ERR("NO ACK received\n");
 		i2c->errors |= I2C_NO_ACK;
-	}
 
 	/* Generate stop condition (if requested) */
-	if (((i2c->xfer_size == 1) && (i2c->flags & I2C_STOP)) || i2c->errors)
+	if (stop || i2c->errors)
 		i2c_bitbang_stop_1(i2c);
 }
 
+static void i2c_bitbang_putc(struct I2c *i2c, uint8_t data)
+{
+	i2c_bitbang_putcStop(i2c, data,
+		(i2c->xfer_size == 1) && (i2c->flags & I2C_STOP));
+}
 
 static void i2c_bitbang_start_2(struct I2c *i2c, uint16_t slave_addr)
 {
@@ -290,12 +363,12 @@ static void i2c_bitbang_start_2(struct I2c *i2c, uint16_t slave_addr)
 	 * Loop on the select write sequence: when the device is busy
 	 * writing previously sent data it will reply to the SLA_W
 	 * control byte with a NACK.  In this case, we must
-	 * keep trying until the deveice responds with an ACK.
+	 * keep trying until the device responds with an ACK.
 	 */
 	ticks_t start = timer_clock();
 	while (i2c_bitbang_start_1(i2c))
 	{
-		i2c_bitbang_putc(i2c, slave_addr);
+		i2c_bitbang_putcStop(i2c, slave_addr, false);
 
 		if (!(i2c->errors & I2C_NO_ACK))
 			return;
@@ -331,11 +404,24 @@ static const I2cVT i2c_bitbang_vt =
 void i2c_hw_bitbangInit(I2c *i2c, int dev)
 {
 	MOD_CHECK(timer);
-	i2c->hw = (struct I2cHardware *)(dev - I2C_BITBANG0);
+	if (dev == I2C_BITBANG_OLD)
+		old_api = true;
+	else
+		i2c->hw = (struct I2cHardware *)(dev - I2C_BITBANG0);
+
 	i2c->vt = &i2c_bitbang_vt;
 
-	i2c_bitbang_init(I2C_DEV(i2c));
-	i2c_sdaHi(I2C_DEV(i2c));
-	i2c_sclHi(I2C_DEV(i2c));
+	if (old_api)
+	{
+		I2C_BITBANG_HW_INIT;
+		SDA_HI;
+		SCL_HI;
+	}
+	else
+	{
+		i2c_bitbangInit(I2C_DEV(i2c));
+		i2c_sdaHi(I2C_DEV(i2c));
+		i2c_sclHi(I2C_DEV(i2c));
+	}
 }