Rename "activeLink" field of CCS to "next_context"
Modifies the name of this field to make its purpose clearer,
and to align with coding conventions.
Change-Id: I8de78df1a0459122067d650130e01078afb5af8a
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
diff --git a/arch/arc/core/context.c b/arch/arc/core/context.c
index 61bb3445..6d87cc3 100644
--- a/arch/arc/core/context.c
+++ b/arch/arc/core/context.c
@@ -85,7 +85,7 @@
*/
key = irq_lock_inline();
- pCcs->activeLink = _NanoKernel.contexts;
+ pCcs->next_context = _NanoKernel.contexts;
_NanoKernel.contexts = pCcs;
irq_unlock_inline(key);
}
diff --git a/arch/arc/include/nanok.h b/arch/arc/include/nanok.h
index c896165..84607809 100644
--- a/arch/arc/include/nanok.h
+++ b/arch/arc/include/nanok.h
@@ -185,7 +185,7 @@
struct coop coopReg;
struct preempt preempReg;
#ifdef CONFIG_CONTEXT_MONITOR
- struct s_CCS *activeLink; /* link to next context in the active list */
+ struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
#endif
};
diff --git a/arch/arm/core/nanocontext.c b/arch/arm/core/nanocontext.c
index 5faab6e..3620b8a 100644
--- a/arch/arm/core/nanocontext.c
+++ b/arch/arm/core/nanocontext.c
@@ -75,7 +75,7 @@
*/
key = irq_lock();
- pCcs->activeLink = _NanoKernel.contexts;
+ pCcs->next_context = _NanoKernel.contexts;
_NanoKernel.contexts = pCcs;
irq_unlock(key);
}
diff --git a/arch/arm/include/nanok.h b/arch/arm/include/nanok.h
index ab85746..75e89da 100644
--- a/arch/arm/include/nanok.h
+++ b/arch/arm/include/nanok.h
@@ -135,7 +135,7 @@
struct coop coopReg;
struct preempt preempReg;
#if defined(CONFIG_CONTEXT_MONITOR)
- struct s_CCS *activeLink; /* link to next context in the active list */
+ struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
#endif
};
diff --git a/arch/x86/core/nanocontext.c b/arch/x86/core/nanocontext.c
index e7ce839..968b83a 100644
--- a/arch/x86/core/nanocontext.c
+++ b/arch/x86/core/nanocontext.c
@@ -199,7 +199,7 @@
*/
imask = irq_lock();
- ccs->activeLink = _NanoKernel.contexts;
+ ccs->next_context = _NanoKernel.contexts;
_NanoKernel.contexts = ccs;
irq_unlock(imask);
}
diff --git a/arch/x86/include/nanok.h b/arch/x86/include/nanok.h
index 061fbf3..75248d0 100644
--- a/arch/x86/include/nanok.h
+++ b/arch/x86/include/nanok.h
@@ -684,7 +684,7 @@
tPreempReg preempReg; /* volatile integer register storage */
#if defined(CONFIG_CONTEXT_MONITOR)
- struct s_CCS *activeLink; /* link to next context in the active list */
+ struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */
#endif
#ifdef CONFIG_GDB_INFO
void *esfPtr; /* pointer to exception stack frame saved by */
diff --git a/kernel/nanokernel/core/nanocontextentry.c b/kernel/nanokernel/core/nanocontextentry.c
index 73c17f8..a34174c 100644
--- a/kernel/nanokernel/core/nanocontextentry.c
+++ b/kernel/nanokernel/core/nanocontextentry.c
@@ -74,15 +74,15 @@
*/
if (pContext == _NanoKernel.contexts) {
- _NanoKernel.contexts = _NanoKernel.contexts->activeLink;
+ _NanoKernel.contexts = _NanoKernel.contexts->next_context;
} else {
tCCS *pPrevContext;
pPrevContext = _NanoKernel.contexts;
- while (pContext != pPrevContext->activeLink) {
- pPrevContext = pPrevContext->activeLink;
+ while (pContext != pPrevContext->next_context) {
+ pPrevContext = pPrevContext->next_context;
}
- pPrevContext->activeLink = pContext->activeLink;
+ pPrevContext->next_context = pContext->next_context;
}
}
#endif /* CONFIG_CONTEXT_MONITOR */
diff --git a/kernel/nanokernel/include/offsets/common.h b/kernel/nanokernel/include/offsets/common.h
index 0f638ca..797fd96 100644
--- a/kernel/nanokernel/include/offsets/common.h
+++ b/kernel/nanokernel/include/offsets/common.h
@@ -58,7 +58,7 @@
/* arch-agnostic tCCS structure member offsets */
GEN_OFFSET_SYM(tCCS, link);
-GEN_OFFSET_SYM_HOST(tCCS, activeLink);
+GEN_OFFSET_SYM_HOST(tCCS, next_context);
GEN_OFFSET_SYM(tCCS, prio);
GEN_OFFSET_SYM(tCCS, flags);
GEN_OFFSET_SYM(tCCS, coopReg); /* start of coop register set */
