3 files changed, 9 insertions, 9 deletions
diff --git a/os/various/cpp_wrappers/ch.hpp b/os/various/cpp_wrappers/ch.hpp
index ec8656612..d658086df 100644
--- a/os/various/cpp_wrappers/ch.hpp
+++ b/os/various/cpp_wrappers/ch.hpp
@@ -1655,7 +1655,7 @@ namespace chibios_rt {
      */
     msg_t post(T msg, systime_t time) {
 
-      return chMBPost(&mb, reinterpret_cast<msg_t>(msg), time);
+      return chMBPostTimeout(&mb, reinterpret_cast<msg_t>(msg), time);
     }
 
     /**
@@ -1678,7 +1678,7 @@ namespace chibios_rt {
      */
     msg_t postS(T msg, systime_t time) {
 
-      return chMBPostS(&mb, reinterpret_cast<msg_t>(msg), time);
+      return chMBPostTimeoutS(&mb, reinterpret_cast<msg_t>(msg), time);
     }
 
     /**
@@ -1719,7 +1719,7 @@ namespace chibios_rt {
      */
     msg_t postAhead(T msg, systime_t time) {
 
-      return chMBPostAhead(&mb, reinterpret_cast<msg_t>(msg), time);
+      return chMBPostAheadTimeout(&mb, reinterpret_cast<msg_t>(msg), time);
     }
 
     /**
@@ -1742,7 +1742,7 @@ namespace chibios_rt {
      */
     msg_t postAheadS(T msg, systime_t time) {
 
-      return chMBPostAheadS(&mb, reinterpret_cast<msg_t>(msg), time);
+      return chMBPostAheadTimeoutS(&mb, reinterpret_cast<msg_t>(msg), time);
     }
 
     /**
@@ -1783,7 +1783,7 @@ namespace chibios_rt {
      */
     msg_t fetch(T *msgp, systime_t time) {
 
-      return chMBFetch(&mb, reinterpret_cast<msg_t*>(msgp), time);
+      return chMBFetchTimeout(&mb, reinterpret_cast<msg_t*>(msgp), time);
     }
 
     /**
@@ -1806,7 +1806,7 @@ namespace chibios_rt {
      */
     msg_t fetchS(T *msgp, systime_t time) {
 
-      return chMBFetchS(&mb, reinterpret_cast<msg_t*>(msgp), time);
+      return chMBFetchTimeoutS(&mb, reinterpret_cast<msg_t*>(msgp), time);
     }
 
     /**
diff --git a/os/various/lwip_bindings/readme.txt b/os/various/lwip_bindings/readme.txt
index c2df4cdc7..07544e27e 100644
--- a/os/various/lwip_bindings/readme.txt
+++ b/os/various/lwip_bindings/readme.txt
@@ -1,6 +1,6 @@
-This directory contains the ChibiOS/RT "official" bindings with the lwIP
+This directory contains the ChibiOS "official" bindings with the lwIP
 TCP/IP stack: http://savannah.nongnu.org/projects/lwip
 
 In order to use lwIP within ChibiOS/RT project, unzip lwIP under
-./ext/lwip-1.4.0 then include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
+./ext/lwip then include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
 in your makefile.
diff --git a/os/various/lwip_bindings/static_lwipopts.h b/os/various/lwip_bindings/static_lwipopts.h
index 3f3e9b3da..a59d4b41a 100644
--- a/os/various/lwip_bindings/static_lwipopts.h
+++ b/os/various/lwip_bindings/static_lwipopts.h
@@ -31,7 +31,7 @@
 
 #define LWIP_TCPIP_CORE_LOCKING         1
 #define LWIP_TCPIP_CORE_LOCKING_INPUT   0
-#define LWIP_COMPAT_MUTEX_ALLOWED
+#define LWIP_COMPAT_MUTEX_ALLOWED       1
 
 #define SYS_LIGHTWEIGHT_PROT            0