Add configurable options for HD44780 LCD display columns and rows.

[bertos.git] / bertos / drv / i2c_bitbang.c

diff --git a/bertos/drv/i2c_bitbang.c b/bertos/drv/i2c_bitbang.c
index 71374e98583c343dcbaf67978eb09cfae45a6195..5e9dfb0c76c8ce1ad5012dc2fccbf2bda6751045 100644 (file)
--- a/bertos/drv/i2c_bitbang.c
+++ b/bertos/drv/i2c_bitbang.c
@@ -32,7 +32,6 @@
  *
  * \brief I2C bitbang driver (implementation)
  *
- * \version $Id: adc.c 1604 2008-08-10 17:19:51Z bernie $
  * \author Francesco Sacchi <batt@develer.com>
  */
 
@@ -43,21 +42,26 @@
 #define LOG_FORMAT I2C_LOG_FORMAT
 
 #include <cfg/log.h>
+#include <cfg/macros.h>
 #include <cfg/module.h>
 
+#include <drv/timer.h>
+#include <cpu/irq.h>
+
 #include "hw/hw_i2c_bitbang.h"
 
-INLINE bool i2c_start(void)
+INLINE bool i2c_bitbang_start(void)
 {
        SDA_HI;
        SCL_HI;
        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;
@@ -65,7 +69,7 @@ void i2c_stop(void)
        SDA_HI;
 }
 
-bool i2c_put(uint8_t _data)
+bool i2c_bitbang_put(uint8_t _data)
 {
        /* Add ACK bit */
        uint16_t data = (_data << 1) | 1;
@@ -89,7 +93,7 @@ bool i2c_put(uint8_t _data)
        return ack;
 }
 
-bool i2c_start_w(uint8_t id)
+bool i2c_bitbang_start_w(uint8_t id)
 {
        id &= ~I2C_READBIT;
        /*
@@ -99,9 +103,9 @@ 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_I2C_START_TIMEOUT))
                {
@@ -114,12 +118,12 @@ bool i2c_start_w(uint8_t id)
        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");
@@ -128,7 +132,7 @@ 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)
@@ -164,8 +168,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;