aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2020-02-24 10:08:00 +1100
committerGitHub <noreply@github.com>2020-02-24 10:08:00 +1100
commit716c29881c0f91e3998e1fc5c49740bd6e65876f (patch)
tree20e06d4d9fc0e9f4379f2b59f9f583fe9e9fe80f /drivers
parentf76f9c7d2abd1901be45431c5b2ea435c8c472b2 (diff)
downloadfirmware-716c29881c0f91e3998e1fc5c49740bd6e65876f.tar.gz
firmware-716c29881c0f91e3998e1fc5c49740bd6e65876f.tar.bz2
firmware-716c29881c0f91e3998e1fc5c49740bd6e65876f.zip
Rollback PR #7967 in preference of fixing I2C start/stop properly, in a followup PR. (#8173)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/arm/i2c_master.c63
1 files changed, 12 insertions, 51 deletions
diff --git a/drivers/arm/i2c_master.c b/drivers/arm/i2c_master.c
index b3fabb05e..21aefd497 100644
--- a/drivers/arm/i2c_master.c
+++ b/drivers/arm/i2c_master.c
@@ -29,6 +29,8 @@
#include <string.h>
#include <hal.h>
+static uint8_t i2c_address;
+
static const I2CConfig i2cconfig = {
#ifdef USE_I2CV1
I2C1_OPMODE,
@@ -69,49 +71,27 @@ __attribute__((weak)) void i2c_init(void) {
}
i2c_status_t i2c_start(uint8_t address) {
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cAcquireBus(&I2C_DRIVER);
-#endif
-
+ i2c_address = address;
i2cStart(&I2C_DRIVER, &i2cconfig);
return I2C_STATUS_SUCCESS;
}
i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout) {
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cAcquireBus(&I2C_DRIVER);
-#endif
-
+ i2c_address = address;
i2cStart(&I2C_DRIVER, &i2cconfig);
- msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (address >> 1), data, length, 0, 0, MS2ST(timeout));
-
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cReleaseBus(&I2C_DRIVER);
-#endif
-
+ msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, MS2ST(timeout));
return chibios_to_qmk(&status);
}
i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) {
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cAcquireBus(&I2C_DRIVER);
-#endif
-
+ i2c_address = address;
i2cStart(&I2C_DRIVER, &i2cconfig);
- msg_t status = i2cMasterReceiveTimeout(&I2C_DRIVER, (address >> 1), data, length, MS2ST(timeout));
-
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cReleaseBus(&I2C_DRIVER);
-#endif
-
+ msg_t status = i2cMasterReceiveTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, MS2ST(timeout));
return chibios_to_qmk(&status);
}
i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout) {
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cAcquireBus(&I2C_DRIVER);
-#endif
-
+ i2c_address = devaddr;
i2cStart(&I2C_DRIVER, &i2cconfig);
uint8_t complete_packet[length + 1];
@@ -120,34 +100,15 @@ i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data,
}
complete_packet[0] = regaddr;
- msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (devaddr >> 1), complete_packet, length + 1, 0, 0, MS2ST(timeout));
-
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cReleaseBus(&I2C_DRIVER);
-#endif
-
+ msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 1, 0, 0, MS2ST(timeout));
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) {
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cAcquireBus(&I2C_DRIVER);
-#endif
-
+ i2c_address = devaddr;
i2cStart(&I2C_DRIVER, &i2cconfig);
- msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (devaddr >> 1), &regaddr, 1, data, length, MS2ST(timeout));
-
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cReleaseBus(&I2C_DRIVER);
-#endif
-
+ msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), &regaddr, 1, data, length, MS2ST(timeout));
return chibios_to_qmk(&status);
}
-void i2c_stop(void) {
- i2cStop(&I2C_DRIVER);
-
-#if I2C_USE_MUTUAL_EXCLUSION
- i2cReleaseBus(&I2C_DRIVER);
-#endif
-}
+void i2c_stop(void) { i2cStop(&I2C_DRIVER); }