From 6f6e1a6401eda000dce198150937c7919b4c9855 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 23 Feb 2011 18:59:39 +0000
Subject: Improved messages subsystem.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2759 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'os/kernel/src/chmtx.c')

diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index b84c4d57e..826ef27fe 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -141,7 +141,7 @@ void chMtxLockS(Mutex *mp) {
       case THD_STATE_WTSEM:
 #endif
 #if CH_USE_MESSAGES_PRIORITY
-      case THD_STATE_SNDMSG:
+      case THD_STATE_SNDMSGQ:
 #endif
         /* Re-enqueues tp with its new priority on the queue.*/
         prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp);
-- 
cgit v1.2.3


From e7e79a6ccb4f3e320b2b8b7bad1b14d65218641d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 18 Mar 2011 18:38:08 +0000
Subject: License updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2827 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'os/kernel/src/chmtx.c')

diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index 826ef27fe..af2b7f347 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
-- 
cgit v1.2.3


From 807c5f1882224c2afd471a44889b83c2adf80589 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 18 May 2011 17:54:55 +0000
Subject: Fixed bug 3303908.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2972 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/kernel/src/chmtx.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'os/kernel/src/chmtx.c')

diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c
index af2b7f347..df71d1cc6 100644
--- a/os/kernel/src/chmtx.c
+++ b/os/kernel/src/chmtx.c
@@ -134,14 +134,16 @@ void chMtxLockS(Mutex *mp) {
         prio_insert(dequeue(tp), (ThreadsQueue *)tp->p_u.wtobjp);
         tp = ((Mutex *)tp->p_u.wtobjp)->m_owner;
         continue;
-#if CH_USE_CONDVARS | CH_USE_SEMAPHORES_PRIORITY | CH_USE_MESSAGES_PRIORITY
+#if CH_USE_CONDVARS |                                                       \
+    (CH_USE_SEMAPHORES && CH_USE_SEMAPHORES_PRIORITY) |                     \
+    (CH_USE_MESSAGES && CH_USE_MESSAGES_PRIORITY)
 #if CH_USE_CONDVARS
       case THD_STATE_WTCOND:
 #endif
-#if CH_USE_SEMAPHORES_PRIORITY
+#if CH_USE_SEMAPHORES && CH_USE_SEMAPHORES_PRIORITY
       case THD_STATE_WTSEM:
 #endif
-#if CH_USE_MESSAGES_PRIORITY
+#if CH_USE_MESSAGES && CH_USE_MESSAGES_PRIORITY
       case THD_STATE_SNDMSGQ:
 #endif
         /* Re-enqueues tp with its new priority on the queue.*/
-- 
cgit v1.2.3