X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fi2c_bitbang.c;h=07dd2c04f32ba888305abc0bd14b022cd4e9e87b;hb=8b2b3759daf3222963cbb3cd4364fef556622e87;hp=ef7c95851975b7823949392b5059ea0c214e808a;hpb=18d992e2630742a2bb49b6f9267515fd8ae6c886;p=bertos.git

diff --git a/bertos/drv/i2c_bitbang.c b/bertos/drv/i2c_bitbang.c
index ef7c9585..07dd2c04 100644
--- a/bertos/drv/i2c_bitbang.c
+++ b/bertos/drv/i2c_bitbang.c
@@ -37,51 +37,64 @@
  */
 
 #include "i2c.h"
-#include "timer.h"
-#include "hw/hw_i2c_bitbang.h"
+#include "cfg/cfg_i2c.h"
+
+#define LOG_LEVEL  I2C_LOG_LEVEL
+#define LOG_FORMAT I2C_LOG_FORMAT
+
+#include <cfg/log.h>
+#include <cfg/macros.h>
+#include <cfg/module.h>
 
-#define I2C_PERIOD DIV_ROUND(500000UL / CONFIG_I2C_FREQ)
+#include <drv/timer.h>
+#include <cpu/irq.h>
 
-INLINE bool i2c_start(void)
+#include "hw/hw_i2c_bitbang.h"
+
+INLINE bool i2c_bitbang_start(void)
 {
 	SDA_HI;
 	SCL_HI;
-	timer_udelay(I2C_PERIOD);
-	SDA_LOW;
-	timer_udelay(I2C_PERIOD);
-	return !SDA;
+	I2C_HALFBIT_DELAY();
+	SDA_LO;
+	I2C_HALFBIT_DELAY();
+	ASSERT(!SDA_IN);
+	return !SDA_IN;
 }
 
-void i2c_stop(void)
+void i2c_bitbang_stop(void)
 {
+	SDA_LO;
 	SCL_HI;
-	timer_udelay(I2C_PERIOD);
+	I2C_HALFBIT_DELAY();
 	SDA_HI;
 }
 
-bool i2c_put(uint8_t _data)
+bool i2c_bitbang_put(uint8_t _data)
 {
+	/* Add ACK bit */
 	uint16_t data = (_data << 1) | 1;
-	for (uint16_t i = 0x100; i >= 0; i >>= 1)
+
+	for (uint16_t i = 0x100; i != 0; i >>= 1)
 	{
 		SCL_LO;
-		timer_udelay(I2C_PERIOD);
 		if (data & i)
 			SDA_HI;
 		else
 			SDA_LO;
+		I2C_HALFBIT_DELAY();
+
 		SCL_HI;
-		timer_udelay(I2C_PERIOD);
-		ASSERT(SDA == (data & i));
+		I2C_HALFBIT_DELAY();
 	}
-	bool ack = !SDA;
-	ASSERT(ack);
+
+	bool ack = !SDA_IN;
 	SCL_LO;
-	timer_udelay(I2C_PERIOD);
+	I2C_HALFBIT_DELAY();
 	return ack;
 }
 
-bool i2c_start_w(uint8_t id)
+bool i2c_bitbang_start_w(uint8_t id)
 {
 	id &= ~I2C_READBIT;
 	/*
@@ -91,26 +104,27 @@ bool i2c_start_w(uint8_t id)
 	 * keep trying until the deveice responds with an ACK.
 	 */
 	ticks_t start = timer_clock();
-	while (i2c_start())
+	while (i2c_bitbang_start())
 	{
-		if (i2c_put(id))
+		if (i2c_bitbang_put(id))
 			return true;
-		else if (timer_clock() - start > ms_to_ticks(CONFIG_TWI_START_TIMEOUT))
+		else if (timer_clock() - start > ms_to_ticks(CONFIG_I2C_START_TIMEOUT))
 		{
 			LOG_ERR("Timeout on I2C start write\n");
 			break;
 		}
+		//LOG_INFO("Rep start\n");
 	}
 
 	return false;
 }
 
-bool i2c_start_r(uint8_t id)
+bool i2c_bitbang_start_r(uint8_t id)
 {
 	id |= I2C_READBIT;
-	if (i2c_start())
+	if (i2c_bitbang_start())
 	{
-		if (i2c_put(id))
+		if (i2c_bitbang_put(id))
 			return true;
 
 		LOG_ERR("NACK on I2c start read\n");
@@ -119,27 +133,33 @@ bool i2c_start_r(uint8_t id)
 	return false;
 }
 
-int i2c_get(bool ack)
+int i2c_bitbang_get(bool ack)
 {
 	uint8_t data = 0;
-	for (uint8_t i = 0x80; i >= 0; i >>= 1)
+	for (uint8_t i = 0x80; i != 0; i >>= 1)
 	{
 		SCL_LO;
-		timer_udelay(I2C_PERIOD);
+		I2C_HALFBIT_DELAY();
 		SCL_HI;
-		timer_udelay(I2C_PERIOD);
-		if (SDA)
+		if (SDA_IN)
 			data |= i;
+		else
+			data &= ~i;
+
+		I2C_HALFBIT_DELAY();
 	}
 	SCL_LO;
-	timer_udelay(I2C_PERIOD);
 
 	if (ack)
 		SDA_LO;
 	else
 		SDA_HI;
 
+	I2C_HALFBIT_DELAY();
 	SCL_HI;
+	I2C_HALFBIT_DELAY();
+	SCL_LO;
+	SDA_HI;
 	/* avoid sign extension */
 	return (int)(uint8_t)data;
 }
@@ -149,8 +169,9 @@ MOD_DEFINE(i2c);
 /**
  * Initialize i2c module.
  */
-void i2c_init(void)
+void i2c_bitbang_init(void)
 {
+	MOD_CHECK(timer);
 	I2C_BITBANG_HW_INIT;
 	SDA_HI;
 	SCL_HI;