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

drivers/fxos8700: adapt to new i2c API

Browse Source
This commit is contained in:
Joakim Nohlgård 2018-06-02 00:21:25 +02:00 committed by dylad
parent f2a05ec8bc
commit 21bd356d8d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/fxos8700/fxos8700.c
View File

@ -29,7 +29,7 @@
static int fxos8700_read_regs(const fxos8700_t* dev, uint8_t reg, uint8_t* data, size_t len)
{
i2c_acquire(dev->p.i2c);
if (i2c_read_regs(dev->p.i2c, dev->p.addr, reg, (char*) data, len) <= 0) {
if (i2c_read_regs(dev->p.i2c, dev->p.addr, reg, (char*) data, len, 0) < 0) {
DEBUG("[fxos8700] Can't read register 0x%x\n", reg);
i2c_release(dev->p.i2c);
return FXOS8700_BUSERR;
@ -42,7 +42,7 @@ static int fxos8700_read_regs(const fxos8700_t* dev, uint8_t reg, uint8_t* data,
static int fxos8700_write_regs(const fxos8700_t* dev, uint8_t reg, uint8_t* data, size_t len)
{
i2c_acquire(dev->p.i2c);
if (i2c_write_regs(dev->p.i2c, dev->p.addr, reg, (char*) data, len) <= 0) {
if (i2c_write_regs(dev->p.i2c, dev->p.addr, reg, (char*) data, len, 0) < 0) {
DEBUG("[fxos8700] Can't write to register 0x%x\n", reg);
i2c_release(dev->p.i2c);
return FXOS8700_BUSERR;
@ -66,13 +66,8 @@ int fxos8700_init(fxos8700_t* dev, const fxos8700_params_t *params)
dev->p.renew_interval = params->renew_interval;
i2c_acquire(dev->p.i2c);
if (i2c_init_master(dev->p.i2c, I2C_SPEED) != 0) {
DEBUG("[fxos8700] Can't initialize I2C master\n");
i2c_release(dev->p.i2c);
return FXOS8700_NOBUS;
}
if (i2c_read_regs(dev->p.i2c, dev->p.addr, FXOS8700_REG_WHO_AM_I, &config, 1) <= 0) {
if (i2c_read_regs(dev->p.i2c, dev->p.addr, FXOS8700_REG_WHO_AM_I, &config, 1, 0) < 0) {
i2c_release(dev->p.i2c);
DEBUG("[fxos8700] Could not read WHOAMI\n");
return FXOS8700_NOBUS;