I2C. 1 - Merge code from trunk. 2 - Fix driver problems detected by the CH_DBG_SYSTEM_STATE_CHECK

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3249 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 8 insertions, 0 deletions

diff --git a/os/kernel/src/chqueues.c b/os/kernel/src/chqueues.c
index 8532f8307..cf3d21732 100644
--- a/os/kernel/src/chqueues.c
+++ b/os/kernel/src/chqueues.c
@@ -108,6 +108,8 @@ void chIQInit(InputQueue *iqp, uint8_t *bp, size_t size, qnotify_t infy) {
  */

 void chIQResetI(InputQueue *iqp) {

 

+  chDbgCheckClassI();

+

   iqp->q_rdptr = iqp->q_wrptr = iqp->q_buffer;

   iqp->q_counter = 0;

   while (notempty(&iqp->q_waiting))

@@ -129,6 +131,8 @@ void chIQResetI(InputQueue *iqp) {
  */

 msg_t chIQPutI(InputQueue *iqp, uint8_t b) {

 

+  chDbgCheckClassI();

+

   if (chIQIsFullI(iqp))

     return Q_FULL;

 

@@ -284,6 +288,8 @@ void chOQInit(OutputQueue *oqp, uint8_t *bp, size_t size, qnotify_t onfy) {
  */

 void chOQResetI(OutputQueue *oqp) {

 

+  chDbgCheckClassI();

+

   oqp->q_rdptr = oqp->q_wrptr = oqp->q_buffer;

   oqp->q_counter = chQSizeI(oqp);

   while (notempty(&oqp->q_waiting))

@@ -349,6 +355,8 @@ msg_t chOQPutTimeout(OutputQueue *oqp, uint8_t b, systime_t time) {
 msg_t chOQGetI(OutputQueue *oqp) {

   uint8_t b;

 

+  chDbgCheckClassI();

+

   if (chOQIsEmptyI(oqp))

     return Q_EMPTY;