riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/tmp006: adapt to new i2c API

Browse Source
This commit is contained in:
Hyungsin 2018-06-28 13:32:02 -07:00 committed by dylad
parent 79430a208a
commit f2a05ec8bc
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/tmp006/tmp006.c
View File

@ -58,7 +58,6 @@
#define TMP006_MID_VALUE (0x5449) /**< Manufacturer ID */
#define TMP006_DID_VALUE (0x0067) /**< Device ID */
#define I2C_SPEED I2C_SPEED_FAST
#define BUS (dev->p.i2c)
#define ADDR (dev->p.addr)
@ -78,15 +77,9 @@ int tmp006_init(tmp006_t *dev, const tmp006_params_t *params)
return -TMP006_ERROR_CONF;
}
/* setup the I2C bus */
i2c_acquire(BUS);
if (i2c_init_master(BUS, I2C_SPEED) < 0) {
i2c_release(BUS);
LOG_ERROR("tmp006_init: error initializing I2C bus\n");
return -TMP006_ERROR_BUS;
}
/* test device id */
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_DEVICE_ID, reg, 2) != 2) {
i2c_acquire(BUS);
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_DEVICE_ID, reg, 2, 0) < 0) {
i2c_release(BUS);
LOG_ERROR("tmp006_init: error reading device ID!\n");
return -TMP006_ERROR_BUS;
@ -99,7 +92,7 @@ int tmp006_init(tmp006_t *dev, const tmp006_params_t *params)
tmp = TMP006_CONFIG_CR(dev->p.rate);
reg[0] = (tmp >> 8);
reg[1] = tmp;
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
LOG_ERROR("tmp006_init: error setting conversion rate!\n");
return -TMP006_ERROR_BUS;
@ -118,7 +111,7 @@ int tmp006_reset(const tmp006_t *dev)
/* Acquire exclusive access to the bus. */
i2c_acquire(BUS);
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
@ -131,13 +124,13 @@ int tmp006_set_active(const tmp006_t *dev)
uint8_t reg[2];
i2c_acquire(BUS);
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
reg[0] |= (TMP006_CONFIG_MOD(TMP006_CONFIG_MOD_CC) >> 8);
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
@ -150,13 +143,13 @@ int tmp006_set_standby(const tmp006_t *dev)
uint8_t reg[2];
i2c_acquire(BUS);
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
reg[0] &= ~(TMP006_CONFIG_MOD(TMP006_CONFIG_MOD_CC) >> 8);
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_write_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
@ -170,7 +163,7 @@ int tmp006_read(const tmp006_t *dev, int16_t *rawv, int16_t *rawt, uint8_t *drdy
i2c_acquire(BUS);
/* Register bytes are sent MSB first. */
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2) != 2) {
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_CONFIG, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
@ -183,7 +176,7 @@ int tmp006_read(const tmp006_t *dev, int16_t *rawv, int16_t *rawt, uint8_t *drdy
}
i2c_acquire(BUS);
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_V_OBJECT, reg, 2) != 2) {
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_V_OBJECT, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}
@ -192,7 +185,7 @@ int tmp006_read(const tmp006_t *dev, int16_t *rawv, int16_t *rawt, uint8_t *drdy
*rawv = ((uint16_t)reg[0] << 8) | reg[1];
i2c_acquire(BUS);
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_T_AMBIENT, reg, 2) != 2) {
if (i2c_read_regs(BUS, ADDR, TMP006_REGS_T_AMBIENT, reg, 2, 0) < 0) {
i2c_release(BUS);
return -TMP006_ERROR_BUS;
}