andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I2C. Code clean ups. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3151 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
barthess 2011-07-11 19:49:14 +00:00
parent caeaf6536e
commit 0ada09b542
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
os/hal/src/i2c.c
View File

@ -165,18 +165,8 @@ void i2cMasterTransmit(I2CDriver *i2cp,
/* init slave config field in driver */ /* init slave config field in driver */
i2cp->id_slave_config = i2cscfg; i2cp->id_slave_config = i2cscfg;
#if CH_DBG_ENABLE_ASSERTS
i2c_lld_wait_bus_free(i2cp); i2c_lld_wait_bus_free(i2cp);
if(i2c_lld_bus_is_busy(i2cp)) { /* Probably slave locks up and need reset. */ chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)), "i2cMasterReceive(), #1", "time is out");
#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(i2cp->id_state == I2C_READY, chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterTransmit(), #1", "not ready"); "i2cMasterTransmit(), #1", "not ready");
@ -212,17 +202,8 @@ void i2cMasterReceive(I2CDriver *i2cp,
/* init slave config field in driver */ /* init slave config field in driver */
i2cp->id_slave_config = i2cscfg; i2cp->id_slave_config = i2cscfg;
#if CH_DBG_ENABLE_ASSERTS
i2c_lld_wait_bus_free(i2cp); i2c_lld_wait_bus_free(i2cp);
if(i2c_lld_bus_is_busy(i2cp)) { chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)), "i2cMasterReceive(), #1", "time is out");
#ifdef PRINTTRACE
print("I2C Bus busy!\n");
return;
#else
chDbgAssert(FALSE, "i2cMasterReceive(), #1", "time is out");
#endif /* PRINTTRACE */
};
#endif /* CH_DBG_ENABLE_ASSERTS */
chDbgAssert(i2cp->id_state == I2C_READY, chDbgAssert(i2cp->id_state == I2C_READY,
"i2cMasterReceive(), #1", "not ready"); "i2cMasterReceive(), #1", "not ready");