drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Align ARM i2c_readReg with AVR (#6314)

Browse source 
* Align arm i2c_readReg with avr

* Align arm i2c_readReg with avr - fix cannonkeys
This commit is contained in:
Joel Challis 2019-07-16 09:36:23 +01:00 • committed by skullydazed
parent 4e375aa1f5
commit 5fa0a274ea
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/arm/i2c_master.c
View file

@ -117,11 +117,11 @@ i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data,
return chibios_to_qmk(&status);
}
i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t* regaddr, uint8_t* data, uint16_t length, uint16_t timeout)
i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)
{
i2c_address = devaddr;
i2cStart(&I2C_DRIVER, &i2cconfig);
msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), regaddr, 1, data, length, MS2ST(timeout));
msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), &regaddr, 1, data, length, MS2ST(timeout));
return chibios_to_qmk(&status);
}