Reformat.

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

diff --git a/bertos/drv/lm75.c b/bertos/drv/lm75.c
index 5d24e0ae520224b348727e016982d0d1b7a2e64d..fd44202492b2c0fe67ae1a2091a0eb26d3a23c0c 100644 (file)
--- a/bertos/drv/lm75.c
+++ b/bertos/drv/lm75.c
@@ -55,41 +55,40 @@
 #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(uint8_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;
 
-       if( !(i2c_start_w(SELECT_ADDRESS(sens_addr))
-               && i2c_put(LM75_PAD_BYTE)
-               && i2c_start_r(SELECT_ADDRESS(sens_addr))) )
-       {
-               i2c_stop();
-               return EOF;
-       }
+       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_recv(data, sizeof(data)) )
-       {
-               i2c_stop();
+       if (i2c_error(i2c))
                return EOF;
-       }
-       i2c_stop();
-
-       degree = (int16_t)data[0];
-       deci_degree = (int16_t)(((data[1] >> 7) & 1 ) * 5);
 
-       LOG_INFO("[%d.%d C]\n", degree, deci_degree);
+       deci_degree = ((data[0] << 8) | data[1]);
+       deci_degree >>= 7;
+       deci_degree *= 5;
 
-       return degree * 10 + deci_degree;
-}
+       LOG_INFO("[%d.%d C]\n", deci_degree / 10, ABS(deci_degree % 10));
 
-void lm75_init(void)
-{
-       // Check dependence
-       MOD_CHECK(i2c);
-       LM75_HW_INIT();
+       return deci_degree;
 }
-
-