diff options
| author | Joel Challis <git@zvecr.com> | 2019-07-16 09:36:23 +0100 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-16 01:36:23 -0700 |
| commit | 5fa0a274eaf6c3f2b1dbd4e6e23a4c3b884f1d44 (patch) | |
| tree | de8c97069301a4fd10e253e527505a667e3ac5f2 /keyboards/cannonkeys | |
| parent | 4e375aa1f536e979a587534df0b6951fa39e8a30 (diff) | |
| download | firmware-5fa0a274eaf6c3f2b1dbd4e6e23a4c3b884f1d44.tar.gz firmware-5fa0a274eaf6c3f2b1dbd4e6e23a4c3b884f1d44.tar.bz2 firmware-5fa0a274eaf6c3f2b1dbd4e6e23a4c3b884f1d44.zip | |
Align ARM i2c_readReg with AVR (#6314)
* Align arm i2c_readReg with avr
* Align arm i2c_readReg with avr - fix cannonkeys
Diffstat (limited to 'keyboards/cannonkeys')
| -rw-r--r-- | keyboards/cannonkeys/satisfaction75/i2c_master.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/cannonkeys/satisfaction75/i2c_master.c b/keyboards/cannonkeys/satisfaction75/i2c_master.c index 56e810d32..0e3adbbf1 100644 --- a/keyboards/cannonkeys/satisfaction75/i2c_master.c +++ b/keyboards/cannonkeys/satisfaction75/i2c_master.c @@ -110,11 +110,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), ®addr, 1, data, length, MS2ST(timeout)); return chibios_to_qmk(status); } |