mbed-rtos // fixed error.h
Fork of mbed-rtos by
Diff: rtx/rt_System.c
- Revision:
- 31:015df9e602b6
- Parent:
- 11:db1fc233faa9
diff -r 3761f69dbbb2 -r 015df9e602b6 rtx/rt_System.c --- a/rtx/rt_System.c Tue May 27 08:30:16 2014 +0100 +++ b/rtx/rt_System.c Tue Jun 03 11:30:14 2014 +0100 @@ -15,19 +15,19 @@ * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * - Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without + * - Neither the name of ARM nor the names of its contributors may be used + * to endorse or promote products derived from this software without * specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. *---------------------------------------------------------------------------*/ @@ -77,9 +77,9 @@ U32 rt_suspend (void) { /* Suspend OS scheduler */ U32 delta = 0xFFFF; - + rt_tsk_lock(); - + if (os_dly.p_dlnk) { delta = os_dly.delta_time; } @@ -88,7 +88,7 @@ if (os_tmr.tcnt < delta) delta = os_tmr.tcnt; } #endif - + return (delta); } @@ -124,7 +124,7 @@ } else { os_time += sleep_time; } - + #ifndef __CMSIS_RTOS /* Check the user timers. */ if (os_tmr.next) { @@ -274,7 +274,7 @@ #else rt_tmr_tick (); #endif - + /* Switch back to highest ready task */ next = rt_get_first (&os_rdy); rt_switch_req (next);