Module: xenomai-forge
Branch: master
Commit: b6957314c860db2a18a2443259ecf60566187ce0
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=b6957314c860db2a18a2443259ecf60566187ce0
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Mon Dec 3 22:22:37 2012 +0100
nucleus: rename XNSWLOCK -> XNINSW
---
include/cobalt/nucleus/pod.h | 4 ++--
include/cobalt/nucleus/sched.h | 2 +-
kernel/cobalt/nucleus/pod.c | 4 ++--
kernel/cobalt/nucleus/sched.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/cobalt/nucleus/pod.h b/include/cobalt/nucleus/pod.h
index 1cf2e42..00fc5ad 100644
--- a/include/cobalt/nucleus/pod.h
+++ b/include/cobalt/nucleus/pod.h
@@ -266,11 +266,11 @@ static inline void xnpod_schedule(void)
* unlocked context switch.
*/
#if XENO_DEBUG(NUCLEUS)
- if (testbits(sched->status | sched->lflags, XNKCOUT|XNINIRQ|XNSWLOCK))
+ if (testbits(sched->status | sched->lflags, XNKCOUT|XNINIRQ|XNINSW))
return;
#else /* !XENO_DEBUG(NUCLEUS) */
if (testbits(sched->status | sched->lflags,
- XNKCOUT|XNINIRQ|XNSWLOCK|XNRESCHED) != XNRESCHED)
+ XNKCOUT|XNINIRQ|XNINSW|XNRESCHED) != XNRESCHED)
return;
#endif /* !XENO_DEBUG(NUCLEUS) */
diff --git a/include/cobalt/nucleus/sched.h b/include/cobalt/nucleus/sched.h
index 0f72448..b032608 100644
--- a/include/cobalt/nucleus/sched.h
+++ b/include/cobalt/nucleus/sched.h
@@ -40,7 +40,7 @@
/* Sched status flags */
#define XNKCOUT 0x80000000 /* Sched callout context */
#define XNINTCK 0x40000000 /* In master tick handler
context */
-#define XNSWLOCK 0x20000000 /* In context switch */
+#define XNINSW 0x20000000 /* In context switch */
#define XNRESCHED 0x10000000 /* Needs rescheduling */
/* Sched local flags */
diff --git a/kernel/cobalt/nucleus/pod.c b/kernel/cobalt/nucleus/pod.c
index fa26b31..9a548fb 100644
--- a/kernel/cobalt/nucleus/pod.c
+++ b/kernel/cobalt/nucleus/pod.c
@@ -1090,7 +1090,7 @@ void xnpod_delete_thread(xnthread_t *thread)
xnsched_set_resched(sched);
xnpod_schedule();
#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
- } else if (!testbits(sched->status, XNSWLOCK) &&
+ } else if (!testbits(sched->status, XNINSW) &&
!xnthread_test_state(thread, XNMIGRATE)) {
/*
* When killing a thread in the course of a context
@@ -1947,7 +1947,7 @@ static inline void xnpod_switch_to(xnsched_t *sched,
{
#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
sched->last = prev;
- __setbits(sched->status, XNSWLOCK);
+ __setbits(sched->status, XNINSW);
xnlock_clear_irqon(&nklock);
#endif /* !CONFIG_XENO_HW_UNLOCKED_SWITCH */
diff --git a/kernel/cobalt/nucleus/sched.c b/kernel/cobalt/nucleus/sched.c
index 06b47c5..803a852 100644
--- a/kernel/cobalt/nucleus/sched.c
+++ b/kernel/cobalt/nucleus/sched.c
@@ -285,7 +285,7 @@ struct xnsched *xnsched_finish_unlocked_switch(struct
xnsched *sched)
#endif /* CONFIG_SMP */
last = sched->last;
- __clrbits(sched->status, XNSWLOCK);
+ __clrbits(sched->status, XNINSW);
/* Detect a thread which called xnpod_migrate_thread */
if (last->sched != sched) {
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
