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

drivers/at30tse75x: adapt to new I2C api

Browse Source
This commit is contained in:
Alexandre Abadie 2018-05-29 17:21:40 +02:00 committed by dylad
parent 21e728123d
commit 7a12293eb1
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/at30tse75x/at30tse75x.c
View File

@ -40,7 +40,7 @@ static int at30tse75x_get_register(const at30tse75x_t *dev, uint8_t reg, uint16_
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if (i2c_read_regs(dev->i2c, dev->addr, reg, data, 2) <= 0) { if (i2c_read_regs(dev->i2c, dev->addr, reg, data, 2, 0) < 0) {
DEBUG("[at30tse75x] Can't read register 0x%x\n", reg); DEBUG("[at30tse75x] Can't read register 0x%x\n", reg);
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
@ -54,7 +54,7 @@ static int at30tse75x_set_register(const at30tse75x_t *dev, uint8_t reg, uint16_
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if (i2c_write_regs(dev->i2c, dev->addr, reg, data, 2) <= 0) { if (i2c_write_regs(dev->i2c, dev->addr, reg, data, 2, 0) < 0) {
DEBUG("[at30tse75x] Can't write to register 0x%x\n", reg); DEBUG("[at30tse75x] Can't write to register 0x%x\n", reg);
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
@ -68,7 +68,7 @@ static int at30tse75x_reset(const at30tse75x_t *dev)
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if (i2c_write_byte(dev->i2c, 0x00, AT30TSE75X_CMD__GENERAL_CALL_RESET) != 1) { if (i2c_write_byte(dev->i2c, 0x00, AT30TSE75X_CMD__GENERAL_CALL_RESET, 0) < 0) {
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
} }
@ -82,7 +82,7 @@ int at30tse75x_get_config(const at30tse75x_t *dev, uint8_t *data)
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if (i2c_read_reg(dev->i2c, dev->addr, AT30TSE75X_REG__CONFIG, data) <= 0) { if (i2c_read_reg(dev->i2c, dev->addr, AT30TSE75X_REG__CONFIG, data, 0) < 0) {
DEBUG("[at30tse75x] Can't read CONFIG register\n"); DEBUG("[at30tse75x] Can't read CONFIG register\n");
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
@ -96,7 +96,7 @@ int at30tse75x_set_config(const at30tse75x_t *dev, uint8_t data)
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if (i2c_write_reg(dev->i2c, dev->addr, AT30TSE75X_REG__CONFIG, data) <= 0) { if (i2c_write_reg(dev->i2c, dev->addr, AT30TSE75X_REG__CONFIG, data, 0) < 0) {
DEBUG("[at30tse75x] Can't write to CONFIG register\n"); DEBUG("[at30tse75x] Can't write to CONFIG register\n");
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
@ -213,7 +213,7 @@ int at30tse75x_save_config(const at30tse75x_t *dev)
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if(i2c_write_byte(dev->i2c, dev->addr, AT30TSE75X_CMD__SAVE_TO_NVRAM) != 1) { if(i2c_write_byte(dev->i2c, dev->addr, AT30TSE75X_CMD__SAVE_TO_NVRAM, 0) < 0) {
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
} }
@ -227,7 +227,7 @@ int at30tse75x_restore_config(const at30tse75x_t *dev)
{ {
i2c_acquire(dev->i2c); i2c_acquire(dev->i2c);
xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS); xtimer_spin(AT30TSE75X_BUS_FREE_TIME_TICKS);
if(i2c_write_byte(dev->i2c, dev->addr, AT30TSE75X_CMD__RESTORE_FROM_NVRAM) != 1) { if(i2c_write_byte(dev->i2c, dev->addr, AT30TSE75X_CMD__RESTORE_FROM_NVRAM, 0) < 0) {
i2c_release(dev->i2c); i2c_release(dev->i2c);
return -1; return -1;
} }
@ -273,7 +273,7 @@ int at30tse75x_get_temperature(const at30tse75x_t *dev, float *temperature)
return 0; return 0;
} }
int at30tse75x_init(at30tse75x_t *dev, i2c_t i2c, i2c_speed_t speed, uint8_t addr) int at30tse75x_init(at30tse75x_t *dev, i2c_t i2c, uint8_t addr)
{ {
uint8_t config; uint8_t config;
@ -285,14 +285,6 @@ int at30tse75x_init(at30tse75x_t *dev, i2c_t i2c, i2c_speed_t speed, uint8_t add
} }
dev->addr = addr; dev->addr = addr;
i2c_acquire(dev->i2c);
if(i2c_init_master(dev->i2c, speed) != 0) {
DEBUG("[at30tse75x] Can't initialize I2C master\n");
i2c_release(dev->i2c);
return -1;
}
i2c_release(dev->i2c);
/* Reset the device */ /* Reset the device */
if(at30tse75x_reset(dev) != 0) { if(at30tse75x_reset(dev) != 0) {
return -1; return -1;

3
drivers/include/at30tse75x.h
View File

@ -162,7 +162,6 @@ typedef struct {
* *
* @param[out] dev device descriptor * @param[out] dev device descriptor
* @param[in] i2c I2C bus the device is connected to * @param[in] i2c I2C bus the device is connected to
* @param[in] speed I2C speed to use
* @param[in] addr I2C address of the device * @param[in] addr I2C address of the device
* *
* The valid address range is 0x48 - 0x4f depending on the configuration of the * The valid address range is 0x48 - 0x4f depending on the configuration of the
@ -172,7 +171,7 @@ typedef struct {
* @return -1 on error * @return -1 on error
* @return -2 on invalid address * @return -2 on invalid address
*/ */
int at30tse75x_init(at30tse75x_t* dev, i2c_t i2c, i2c_speed_t speed, uint8_t addr); int at30tse75x_init(at30tse75x_t* dev, i2c_t i2c, uint8_t addr);
/** /**
* @brief Save configuration register to non-volatile backup register * @brief Save configuration register to non-volatile backup register

2
sys/shell/commands/sc_at30tse75x.c
View File

@ -57,7 +57,7 @@ int _at30tse75x_handler(int argc, char **argv)
} }
} }
error = at30tse75x_init(&dev, i2c_dev, I2C_SPEED_NORMAL, addr); error = at30tse75x_init(&dev, i2c_dev, addr);
if (error) { if (error) {
printf("Error initializing AT30TSE75x sensor on I2C #%u @ 0x%x\n", i2c_dev, addr); printf("Error initializing AT30TSE75x sensor on I2C #%u @ 0x%x\n", i2c_dev, addr);
initialized = false; initialized = false;