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 /drivers/arm/i2c_master.h | |
| parent | 4e375aa1f536e979a587534df0b6951fa39e8a30 (diff) | |
| download | qmk_firmware-5fa0a274eaf6c3f2b1dbd4e6e23a4c3b884f1d44.tar.gz qmk_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 'drivers/arm/i2c_master.h')
| -rw-r--r-- | drivers/arm/i2c_master.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/arm/i2c_master.h b/drivers/arm/i2c_master.h index 2f40d4985..c8afa31e2 100644 --- a/drivers/arm/i2c_master.h +++ b/drivers/arm/i2c_master.h | |||
| @@ -106,5 +106,5 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, | |||
| 106 | i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout); | 106 | i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout); |
| 107 | i2c_status_t i2c_transmit_receive(uint8_t address, uint8_t * tx_body, uint16_t tx_length, uint8_t * rx_body, uint16_t rx_length); | 107 | i2c_status_t i2c_transmit_receive(uint8_t address, uint8_t * tx_body, uint16_t tx_length, uint8_t * rx_body, uint16_t rx_length); |
| 108 | i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout); | 108 | i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout); |
| 109 | i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t* regaddr, uint8_t* data, uint16_t length, uint16_t timeout); | 109 | i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout); |
| 110 | void i2c_stop(void); | 110 | void i2c_stop(void); |