You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/09/24 20:02:55 UTC
[GitHub] vrahane closed pull request #1424: Add hal_i2c_clear_bus to I2C
timeout recovery
vrahane closed pull request #1424: Add hal_i2c_clear_bus to I2C timeout recovery
URL: https://github.com/apache/mynewt-core/pull/1424
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
index 85c18fecb4..b925394a3a 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
@@ -203,28 +203,28 @@ read_gpio_inbuffer(int pin)
* This should reset state from (most of) the devices on the other end.
*/
static void
-hal_i2c_clear_bus(const struct nrf52_hal_i2c_cfg *cfg)
+hal_i2c_clear_bus(int scl_pin, int sda_pin)
{
int i;
NRF_GPIO_Type *scl_port, *sda_port;
/* Resolve which GPIO port these pins belong to */
- scl_port = HAL_GPIO_PORT(cfg->scl_pin);
- sda_port = HAL_GPIO_PORT(cfg->sda_pin);
+ scl_port = HAL_GPIO_PORT(scl_pin);
+ sda_port = HAL_GPIO_PORT(sda_pin);
/* Input connected, standard-low disconnected-high, pull-ups */
- scl_port->PIN_CNF[cfg->scl_pin] = NRF52_SCL_PIN_CONF;
- sda_port->PIN_CNF[cfg->sda_pin] = NRF52_SDA_PIN_CONF;
+ scl_port->PIN_CNF[scl_pin] = NRF52_SCL_PIN_CONF;
+ sda_port->PIN_CNF[sda_pin] = NRF52_SDA_PIN_CONF;
- hal_gpio_write(cfg->scl_pin, 1);
- hal_gpio_write(cfg->sda_pin, 1);
+ hal_gpio_write(scl_pin, 1);
+ hal_gpio_write(sda_pin, 1);
- scl_port->PIN_CNF[cfg->scl_pin] = NRF52_SCL_PIN_CONF_CLR;
- sda_port->PIN_CNF[cfg->sda_pin] = NRF52_SDA_PIN_CONF_CLR;
+ scl_port->PIN_CNF[scl_pin] = NRF52_SCL_PIN_CONF_CLR;
+ sda_port->PIN_CNF[sda_pin] = NRF52_SDA_PIN_CONF_CLR;
hal_i2c_delay_us(4);
for (i = 0; i < 9; i++) {
- if (read_gpio_inbuffer(cfg->sda_pin)) {
+ if (read_gpio_inbuffer(sda_pin)) {
if (i == 0) {
/*
* Nothing to do here.
@@ -234,23 +234,23 @@ hal_i2c_clear_bus(const struct nrf52_hal_i2c_cfg *cfg)
break;
}
}
- hal_gpio_write(cfg->scl_pin, 0);
+ hal_gpio_write(scl_pin, 0);
hal_i2c_delay_us(4);
- hal_gpio_write(cfg->scl_pin, 1);
+ hal_gpio_write(scl_pin, 1);
hal_i2c_delay_us(4);
}
/*
* Send STOP.
*/
- hal_gpio_write(cfg->sda_pin, 0);
+ hal_gpio_write(sda_pin, 0);
hal_i2c_delay_us(4);
- hal_gpio_write(cfg->sda_pin, 1);
+ hal_gpio_write(sda_pin, 1);
ret:
/* Restore GPIO config */
- scl_port->PIN_CNF[cfg->scl_pin] = NRF52_SCL_PIN_CONF;
- sda_port->PIN_CNF[cfg->sda_pin] = NRF52_SDA_PIN_CONF;
+ scl_port->PIN_CNF[scl_pin] = NRF52_SCL_PIN_CONF;
+ sda_port->PIN_CNF[sda_pin] = NRF52_SDA_PIN_CONF;
}
int
@@ -288,7 +288,7 @@ hal_i2c_init(uint8_t i2c_num, void *usercfg)
goto err;
}
- hal_i2c_clear_bus(cfg);
+ hal_i2c_clear_bus(cfg->scl_pin, cfg->sda_pin);
/* Resolve which GPIO port these pins belong to */
scl_port = HAL_GPIO_PORT(cfg->scl_pin);
@@ -373,11 +373,14 @@ hal_i2c_master_write(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
regs->ERRORSRC = nrf_status;
rc = hal_i2c_convert_status(nrf_status);
} else if (rc == HAL_I2C_ERR_TIMEOUT) {
- /* Some I2C slave peripherals cause a glitch on the bus when they
- * reset which puts the TWI in an unresponsive state. Disabling and
- * re-enabling the TWI returns it to normal operation.
- */
+ /* Some I2C slave peripherals cause a glitch on the bus when they
+ * reset which puts the TWI in an unresponsive state. Disabling and
+ * re-enabling the TWI returns it to normal operation.
+ * A clear operation is performed in case one of the devices on
+ * the bus is in a bad state.
+ */
regs->ENABLE = TWI_ENABLE_ENABLE_Disabled;
+ hal_i2c_clear_bus(regs->PSELSCL, regs->PSELSDA);
regs->ENABLE = TWI_ENABLE_ENABLE_Enabled;
}
@@ -458,8 +461,11 @@ hal_i2c_master_read(uint8_t i2c_num, struct hal_i2c_master_data *pdata,
/* Some I2C slave peripherals cause a glitch on the bus when they
* reset which puts the TWI in an unresponsive state. Disabling and
* re-enabling the TWI returns it to normal operation.
+ * A clear operation is performed in case one of the devices on
+ * the bus is in a bad state.
*/
regs->ENABLE = TWI_ENABLE_ENABLE_Disabled;
+ hal_i2c_clear_bus(regs->PSELSCL, regs->PSELSDA);
regs->ENABLE = TWI_ENABLE_ENABLE_Enabled;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services