diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-26 14:08:25 +0000 | 
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-26 14:08:25 +0000 | 
| commit | 56a9ba32e86fe98c173f4278427aa8c56392a8f8 (patch) | |
| tree | 47e727aa697c36191d0be8600d83e0d8dd6a44aa /os/rt/src/chsys.c | |
| parent | b1f3465325055a224238cd24d2e7c2126f582039 (diff) | |
| download | ChibiOS-56a9ba32e86fe98c173f4278427aa8c56392a8f8.tar.gz ChibiOS-56a9ba32e86fe98c173f4278427aa8c56392a8f8.tar.bz2 ChibiOS-56a9ba32e86fe98c173f4278427aa8c56392a8f8.zip  | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6228 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chsys.c')
| -rw-r--r-- | os/rt/src/chsys.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c index c4e31c76c..4ddbe41ce 100644 --- a/os/rt/src/chsys.c +++ b/os/rt/src/chsys.c @@ -216,7 +216,7 @@ void chSysTimerHandlerI(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
 @@ -241,15 +241,15 @@ syssts_t chSysGetStatusAndLockX(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
 - *          is exiting the critical zone and if in proper context.
 + *          if exiting the critical zone and if not in ISR context.
   *
   * @param[in] sts       the system status to be restored.
   *
   * @xclass
   */
 -void chSysRestoreLockAndRescheduleX(syssts_t sts) {
 +void chSysRestoreStatusX(syssts_t sts) {
    if (port_irq_enabled(sts)) {
      if (port_is_isr_context())
  | 
