X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Flm75.c;h=d1d0a257fc2f7e6b0b582ac44da716ffc0e0485e;hb=4446c1118772ed59e7d5d1f895952441aacb7b0f;hp=d1ed17ac10bf6d6f9eebecd5d6091e0f94942133;hpb=e2238a91f56b0d4f79b39e51b2823f555f0ad7e6;p=bertos.git diff --git a/bertos/drv/lm75.c b/bertos/drv/lm75.c index d1ed17ac..d1d0a257 100644 --- 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); - return degree * 10 + deci_degree; -} +#if !CONFIG_I2C_DISABLE_OLD_API -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 @@ -118,11 +92,3 @@ deg_t lm75_read_2(I2c *i2c, uint8_t sens_addr) return degree * 10 + deci_degree; } - -void lm75_init_1(I2c *i2c) -{ - ASSERT(i2c); - - // Check dependence - LM75_HW_INIT(); -}