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, 4 insertions, 0 deletions

diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index df71d1cc6..7d5bbe15e 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -114,6 +114,7 @@ void chMtxLock(Mutex *mp) {
 void chMtxLockS(Mutex *mp) {

   Thread *ctp = currp;

 

+  chDbgCheckClassS();

   chDbgCheck(mp != NULL, "chMtxLockS");

 

   /* Ia the mutex already locked? */

@@ -157,6 +158,7 @@ void chMtxLockS(Mutex *mp) {
 #endif

         /* Re-enqueues tp with its new priority on the ready list.*/

         chSchReadyI(dequeue(tp));

+        break;

       }

       break;

     }

@@ -224,6 +226,7 @@ bool_t chMtxTryLock(Mutex *mp) {
  */

 bool_t chMtxTryLockS(Mutex *mp) {

 

+  chDbgCheckClassS();

   chDbgCheck(mp != NULL, "chMtxTryLockS");

 

   if (mp->m_owner != NULL)

@@ -308,6 +311,7 @@ Mutex *chMtxUnlockS(void) {
   Thread *ctp = currp;

   Mutex *ump, *mp;

 

+  chDbgCheckClassS();

   chDbgAssert(ctp->p_mtxlist != NULL,

               "chMtxUnlockS(), #1",

               "owned mutexes list empty");