diff options
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/src/i2c.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/os/hal/src/i2c.c b/os/hal/src/i2c.c index 4c9a46e5e..cd12d42eb 100644 --- a/os/hal/src/i2c.c +++ b/os/hal/src/i2c.c @@ -165,18 +165,8 @@ void i2cMasterTransmit(I2CDriver *i2cp, /* init slave config field in driver */
i2cp->id_slave_config = i2cscfg;
-#if CH_DBG_ENABLE_ASSERTS
i2c_lld_wait_bus_free(i2cp);
- if(i2c_lld_bus_is_busy(i2cp)) { /* Probably slave locks up and need reset. */
-#ifdef PRINTTRACE
- print("I2C Bus busy!\n");
- return;
-#else
- /* the time is out. Probably slave locks up. */
- chDbgAssert(FALSE, "i2cMasterTransmit(), #1", "time is out");
-#endif /* PRINTTRACE */
- };
-#endif /* CH_DBG_ENABLE_ASSERTS */
+ chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)), "i2cMasterReceive(), #1", "time is out");
chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterTransmit(), #1", "not ready");
@@ -212,17 +202,8 @@ void i2cMasterReceive(I2CDriver *i2cp, /* init slave config field in driver */
i2cp->id_slave_config = i2cscfg;
-#if CH_DBG_ENABLE_ASSERTS
i2c_lld_wait_bus_free(i2cp);
- if(i2c_lld_bus_is_busy(i2cp)) {
-#ifdef PRINTTRACE
- print("I2C Bus busy!\n");
- return;
-#else
- chDbgAssert(FALSE, "i2cMasterReceive(), #1", "time is out");
-#endif /* PRINTTRACE */
- };
-#endif /* CH_DBG_ENABLE_ASSERTS */
+ chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)), "i2cMasterReceive(), #1", "time is out");
chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterReceive(), #1", "not ready");
|