Reformat.

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

diff --git a/bertos/drv/lm75.c b/bertos/drv/lm75.c
index d1ed17ac10bf6d6f9eebecd5d6091e0f94942133..fd44202492b2c0fe67ae1a2091a0eb26d3a23c0c 100644 (file)
--- a/bertos/drv/lm75.c
+++ b/bertos/drv/lm75.c
@@ -58,41 +58,15 @@
 #define LM75_ADDRESS_BYTE    0x91
 #define LM75_PAD_BYTE        0x0
 
-deg_t lm75_read_1(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;
-       }
-
-       if ( !i2c_recv(data, sizeof(data)) )
-       {
-               i2c_stop();
-               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);
+#if !CONFIG_I2C_DISABLE_OLD_API
 
-       return degree * 10 + deci_degree;
-}
-
-void lm75_init_0(void)
+deg_t lm75_read_1(uint8_t sens_addr)
 {
-       // Check dependence
-       MOD_CHECK(i2c);
-       LM75_HW_INIT();
+       return lm75_read_2(&local_i2c_old_api, sens_addr);
 }
+#endif /* !CONFIG_I2C_DISABLE_OLD_API */
+
 
 /*
  * New API
@@ -100,7 +74,6 @@ void lm75_init_0(void)
 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(i2c, SELECT_ADDRESS(sens_addr), 1, I2C_NOSTOP);
@@ -111,18 +84,11 @@ deg_t lm75_read_2(I2c *i2c, uint8_t sens_addr)
        if (i2c_error(i2c))
                return EOF;
 
-       degree = (int16_t)data[0];
-       deci_degree = (int16_t)(((data[1] >> 7) & 1 ) * 5);
+       deci_degree = ((data[0] << 8) | data[1]);
+       deci_degree >>= 7;
+       deci_degree *= 5;
 
-       LOG_INFO("[%d.%d C]\n", degree, deci_degree);
-
-       return degree * 10 + deci_degree;
-}
-
-void lm75_init_1(I2c *i2c)
-{
-       ASSERT(i2c);
+       LOG_INFO("[%d.%d C]\n", deci_degree / 10, ABS(deci_degree % 10));
 
-       // Check dependence
-       LM75_HW_INIT();
+       return deci_degree;
 }