Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
1d88dc1f
Commit
1d88dc1f
authored
9 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix some compilation error when both TICKLESS mode and the SPORADIC scheduler are enabled
parent
ed031388
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sched/sched/sched_timerexpiration.c
+4
-4
4 additions, 4 deletions
sched/sched/sched_timerexpiration.c
sched/sched/sched_unlock.c
+1
-1
1 addition, 1 deletion
sched/sched/sched_unlock.c
with
5 additions
and
5 deletions
sched/sched/sched_timerexpiration.c
+
4
−
4
View file @
1d88dc1f
...
...
@@ -73,7 +73,7 @@
#define KEEP_ALIVE_HACK 1
#if
def
CONFIG_RR_INTERVAL > 0
#if CONFIG_RR_INTERVAL > 0
# define KEEP_ALIVE_TICKS MSEC2TICK(CONFIG_RR_INTERVAL)
#else
# 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
)
{
return
sched_process_scheduler
(
0
,
true
)
return
sched_process_scheduler
(
0
,
true
)
;
}
/* 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 */
return
KEEP_ALIVE_TICKS
return
KEEP_ALIVE_TICKS
;
}
#e
lse
#e
ndif
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
sched/sched/sched_unlock.c
+
1
−
1
View file @
1d88dc1f
...
...
@@ -156,7 +156,7 @@ int sched_unlock(void)
* 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
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment