From 56a9ba32e86fe98c173f4278427aa8c56392a8f8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 26 Aug 2013 14:08:25 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6228
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/osal/chibios/osal.h             | 11 +++++++----
 os/hal/platforms/STM32/USBv1/usb_lld.c |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'os/hal')

diff --git a/os/hal/osal/chibios/osal.h b/os/hal/osal/chibios/osal.h
index b03681f09..7ae97f92b 100644
--- a/os/hal/osal/chibios/osal.h
+++ b/os/hal/osal/chibios/osal.h
@@ -397,11 +397,12 @@ static inline void osalSysUnlockFromISR(void) {
 }
 
 /**
- * @brief   Returns the execution context and enters the kernel lock mode.
+ * @brief   Returns the execution status and enters a critical zone.
  * @details This functions enters into a critical zone and can be called
  *          from any context. Because its flexibility it is less efficient
  *          than @p chSysLock() which is preferable when the calling context
  *          is known.
+ * @post    The system is in a critical zone.
  *
  * @return              The previous system status, the encoding of this
  *                      status word is architecture-dependent and opaque.
@@ -414,15 +415,17 @@ static inline syssts_t osalSysGetStatusAndLockX(void)  {
 }
 
 /**
- * @brief   Restores the specified execution status.
+ * @brief   Restores the specified execution status and leaves a critical zone.
+ * @note    A call to @p chSchRescheduleS() is automatically performed
+ *          if exiting the critical zone and if not in ISR context.
  *
  * @param[in] sts       the system status to be restored.
  *
  * @xclass
  */
-static inline void osalSysRestoreLockAndRescheduleX(syssts_t sts) {
+static inline void osalSysRestoreStatusX(syssts_t sts) {
 
-  chSysRestoreLockAndRescheduleX(sts);
+  chSysRestoreStatusX(sts);
 }
 
 /**
diff --git a/os/hal/platforms/STM32/USBv1/usb_lld.c b/os/hal/platforms/STM32/USBv1/usb_lld.c
index b1e721556..1a44a678f 100644
--- a/os/hal/platforms/STM32/USBv1/usb_lld.c
+++ b/os/hal/platforms/STM32/USBv1/usb_lld.c
@@ -253,7 +253,7 @@ static void usb_packet_write_from_queue(stm32_usb_descriptor_t *udp,
   oqp->q_counter += n;
   osalQueueWakeupAllI(&oqp->q_waiting, Q_OK);
 
-  osalSysRestoreLockAndRescheduleX(sts);
+  osalSysRestoreStatusX(sts);
 }
 
 /*===========================================================================*/
-- 
cgit v1.2.3