Rename project to insert it into nightly test.

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

diff --git a/bertos/drv/lm75.c b/bertos/drv/lm75.c
index 3a30aadddb8e93af7c8d417ec074182cbf232193..d1d0a257fc2f7e6b0b582ac44da716ffc0e0485e 100644 (file)
--- a/bertos/drv/lm75.c
+++ b/bertos/drv/lm75.c
@@ -55,17 +55,35 @@
 #include <drv/ntc.h> // Macro and data type to manage celsius degree
 
 #define SELECT_ADDRESS(addr)   LM75_ADDRESS_BYTE | (addr << 1)
+#define LM75_ADDRESS_BYTE    0x91
+#define LM75_PAD_BYTE        0x0
 
-deg_t lm75_read(addr_t sens_addr)
+
+#if !CONFIG_I2C_DISABLE_OLD_API
+
+deg_t lm75_read_1(uint8_t sens_addr)
+{
+       return lm75_read_2(&local_i2c_old_api, sens_addr);
+}
+#endif /* !CONFIG_I2C_DISABLE_OLD_API */
+
+
+/*
+ * New API
+ */
+deg_t lm75_read_2(I2c *i2c, uint8_t sens_addr)
 {
        uint8_t data[2];
        int16_t degree;
        int16_t deci_degree;
 
-       i2c_start_w(SELECT_ADDRESS(sens_addr));
-       i2c_put(LM75_PAD_BYTE);
-       i2c_start_r(SELECT_ADDRESS(sens_addr));
-       i2c_recv(data, sizeof(data));
+       i2c_start_w(i2c, SELECT_ADDRESS(sens_addr), 1, I2C_NOSTOP);
+       i2c_putc(i2c, LM75_PAD_BYTE);
+       i2c_start_r(i2c, SELECT_ADDRESS(sens_addr), sizeof(data), I2C_STOP);
+       i2c_read(i2c, data, sizeof(data));
+
+       if (i2c_error(i2c))
+               return EOF;
 
        degree = (int16_t)data[0];
        deci_degree = (int16_t)(((data[1] >> 7) & 1 ) * 5);
@@ -74,12 +92,3 @@ deg_t lm75_read(addr_t sens_addr)
 
        return degree * 10 + deci_degree;
 }
-
-void lm75_init(void)
-{
-       // Check dependence
-       MOD_CHECK(i2c);
-       LM75_HW_INIT();
-}
-
-