Module: xenomai-2.6
Branch: master
Commit: e36d0dd992f590858c59bc725820a910d148a23b
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=e36d0dd992f590858c59bc725820a910d148a23b

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Mon Dec  3 22:22:37 2012 +0100

nucleus: rename XNSWLOCK -> XNINSW

---

 include/nucleus/pod.h   |    4 ++--
 include/nucleus/sched.h |    2 +-
 ksrc/nucleus/pod.c      |    4 ++--
 ksrc/nucleus/sched.c    |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/nucleus/pod.h b/include/nucleus/pod.h
index 06361ff..8a7f23e 100644
--- a/include/nucleus/pod.h
+++ b/include/nucleus/pod.h
@@ -277,11 +277,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/nucleus/sched.h b/include/nucleus/sched.h
index 6ce9228..59dece9 100644
--- a/include/nucleus/sched.h
+++ b/include/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/ksrc/nucleus/pod.c b/ksrc/nucleus/pod.c
index 7c56abc..af53f6e 100644
--- a/ksrc/nucleus/pod.c
+++ b/ksrc/nucleus/pod.c
@@ -1203,7 +1203,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
@@ -2086,7 +2086,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/ksrc/nucleus/sched.c b/ksrc/nucleus/sched.c
index 3f4068b..61957e6 100644
--- a/ksrc/nucleus/sched.c
+++ b/ksrc/nucleus/sched.c
@@ -357,7 +357,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

Reply via email to