diff options
| author | James Churchill <pelrun@gmail.com> | 2019-03-13 03:23:28 +1000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-03-12 10:23:28 -0700 |
| commit | 37932c293c15011f883a91e91ee02631ead44a2e (patch) | |
| tree | f1b4b3b44f816240b06580658b42b3646f121025 /drivers/arm/i2c_master.c | |
| parent | 25bb059e4e42ed2637202230ff3d8b765e1295cd (diff) | |
| download | qmk_firmware-37932c293c15011f883a91e91ee02631ead44a2e.tar.gz qmk_firmware-37932c293c15011f883a91e91ee02631ead44a2e.zip | |
Next set of split_common changes (#4974)
* Update split_common to use standard i2c drivers
* Eliminate RGB_DIRTY/BACKLIT_DIRTY
* Fix avr i2c_master error handling
* Fix i2c_slave addressing
* Remove unneeded timeout on i2c_stop()
* Fix RGB I2C transfers
* Remove incorrect comment
Diffstat (limited to 'drivers/arm/i2c_master.c')
| -rw-r--r-- | drivers/arm/i2c_master.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/arm/i2c_master.c b/drivers/arm/i2c_master.c index 50a30ebce..0e5edcc38 100644 --- a/drivers/arm/i2c_master.c +++ b/drivers/arm/i2c_master.c | |||
| @@ -101,8 +101,7 @@ uint8_t i2c_readReg(uint8_t devaddr, uint8_t* regaddr, uint8_t* data, uint16_t l | |||
| 101 | return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), regaddr, 1, data, length, MS2ST(timeout)); | 101 | return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), regaddr, 1, data, length, MS2ST(timeout)); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | // This is usually not needed. It releases the driver to allow pins to become GPIO again. | 104 | uint8_t i2c_stop(void) |
| 105 | uint8_t i2c_stop(uint16_t timeout) | ||
| 106 | { | 105 | { |
| 107 | i2cStop(&I2C_DRIVER); | 106 | i2cStop(&I2C_DRIVER); |
| 108 | return 0; | 107 | return 0; |