sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some compilation error when both TICKLESS mode and the SPORADIC scheduler are enabled

Browse Source
This commit is contained in:
Gregory Nutt 2015-07-24 14:35:07 -06:00
parent ed031388ad
commit 1d88dc1fb6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sched/sched/sched_timerexpiration.c
View File

@ -73,7 +73,7 @@
#define KEEP_ALIVE_HACK 1 #define KEEP_ALIVE_HACK 1
#ifdef CONFIG_RR_INTERVAL > 0 #if CONFIG_RR_INTERVAL > 0
# define KEEP_ALIVE_TICKS MSEC2TICK(CONFIG_RR_INTERVAL) # define KEEP_ALIVE_TICKS MSEC2TICK(CONFIG_RR_INTERVAL)
#else #else
# define KEEP_ALIVE_TICKS MSEC2TICK(50) # define KEEP_ALIVE_TICKS MSEC2TICK(50)
@ -284,7 +284,7 @@ static inline uint32_t sched_process_scheduler(uint32_t ticks, bool noswitches)
if (rtcb != ntcb) if (rtcb != ntcb)
{ {
return sched_process_scheduler(0, true) return sched_process_scheduler(0, true);
} }
/* Returning zero means that there is no interesting event to be timed */ /* Returning zero means that there is no interesting event to be timed */
@ -294,9 +294,9 @@ static inline uint32_t sched_process_scheduler(uint32_t ticks, bool noswitches)
{ {
/* Apply the keep alive hack */ /* Apply the keep alive hack */
return KEEP_ALIVE_TICKS return KEEP_ALIVE_TICKS;
} }
#else #endif
return ret; return ret;
} }

2
sched/sched/sched_unlock.c
View File

@ -156,7 +156,7 @@ int sched_unlock(void)
* change the currently active task. * change the currently active task.
*/ */
if (rtcb = (FAR struct tcb_s*)g_readytorun.head) if (rtcb == (FAR struct tcb_s*)g_readytorun.head)
{ {
sched_timer_reassess(); sched_timer_reassess();
} }