From f9d34ff899cd5ebceabacfa679cb1e9fddd39263 Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Thu, 4 Jun 2015 14:21:35 -0400 Subject: [PATCH] nanokernel: rename struct s_CCS to struct ccs Follow coding conventions. Change-Id: Ie398d66e6255b76b4546aa9c827997b5dfb0743c Signed-off-by: Benjamin Walsh --- arch/arc/core/context.c | 2 +- arch/arc/include/nanok.h | 6 +++--- arch/arm/core/nanocontext.c | 2 +- arch/arm/include/nanok.h | 6 +++--- arch/x86/include/nanok.h | 6 +++--- include/nanokernel.h | 4 ++-- kernel/nanokernel/include/nano_internal.h | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arc/core/context.c b/arch/arc/core/context.c index 77a3a61bcaf..e1fac8ba13a 100644 --- a/arch/arc/core/context.c +++ b/arch/arc/core/context.c @@ -71,7 +71,7 @@ tNANO _nanokernel = {0}; * RETURNS: N/A */ -static ALWAYS_INLINE void context_monitor_init(struct s_CCS *pCcs /* context */ +static ALWAYS_INLINE void context_monitor_init(struct ccs *pCcs /* context */ ) { unsigned int key; diff --git a/arch/arc/include/nanok.h b/arch/arc/include/nanok.h index c7047a447f0..072262a3466 100644 --- a/arch/arc/include/nanok.h +++ b/arch/arc/include/nanok.h @@ -172,8 +172,8 @@ typedef struct firq_regs tFirqRegs; #ifndef _ASMLANGUAGE -struct s_CCS { - struct s_CCS *link; /* node in singly-linked list +struct ccs { + struct ccs *link; /* node in singly-linked list * _nanokernel.fibers */ uint32_t flags; /* bitmask of flags above */ uint32_t intlock_key; /* interrupt key when relinquishing control */ @@ -186,7 +186,7 @@ struct s_CCS { struct coop coopReg; struct preempt preempReg; #ifdef CONFIG_CONTEXT_MONITOR - struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */ + struct 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 dcf7d7344b5..39588cf8356 100644 --- a/arch/arm/core/nanocontext.c +++ b/arch/arm/core/nanocontext.c @@ -61,7 +61,7 @@ tNANO _nanokernel = {0}; * RETURNS: N/A */ -static ALWAYS_INLINE void _context_monitor_init(struct s_CCS *pCcs /* context */ +static ALWAYS_INLINE void _context_monitor_init(struct ccs *pCcs /* context */ ) { unsigned int key; diff --git a/arch/arm/include/nanok.h b/arch/arm/include/nanok.h index 7b3abb70912..2bf6837c17d 100644 --- a/arch/arm/include/nanok.h +++ b/arch/arm/include/nanok.h @@ -125,8 +125,8 @@ typedef struct preempt tPreempt; #endif #ifndef _ASMLANGUAGE -struct s_CCS { - struct s_CCS *link; /* singly-linked list in _nanokernel.fibers */ +struct ccs { + struct ccs *link; /* singly-linked list in _nanokernel.fibers */ uint32_t flags; uint32_t basepri; int prio; @@ -136,7 +136,7 @@ struct s_CCS { struct coop coopReg; struct preempt preempReg; #if defined(CONFIG_CONTEXT_MONITOR) - struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */ + struct ccs *next_context; /* next item in list of ALL fiber+tasks */ #endif }; diff --git a/arch/x86/include/nanok.h b/arch/x86/include/nanok.h index f765f955f6e..7ac656b164e 100644 --- a/arch/x86/include/nanok.h +++ b/arch/x86/include/nanok.h @@ -628,7 +628,7 @@ typedef struct s_preempFloatReg { * _NewContext() call. */ -struct s_CCS { +struct ccs { /* * Link to next context in singly-linked context list (such as * prioritized @@ -636,7 +636,7 @@ struct s_CCS { * FIFO). */ - struct s_CCS *link; + struct ccs *link; /* * See the above flag definitions above for valid bit settings. This @@ -658,7 +658,7 @@ struct s_CCS { tPreempReg preempReg; /* volatile integer register storage */ #if defined(CONFIG_CONTEXT_MONITOR) - struct s_CCS *next_context; /* next item in list of ALL fiber+tasks */ + struct 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/include/nanokernel.h b/include/nanokernel.h index 0434ca460d6..37ca6cd6390 100644 --- a/include/nanokernel.h +++ b/include/nanokernel.h @@ -60,11 +60,11 @@ struct _nano_queue { void *tail; }; -struct s_CCS; +struct ccs; /* architecture-independent nanokernel public APIs */ -typedef struct s_CCS *nano_context_id_t; +typedef struct ccs *nano_context_id_t; typedef void (*nano_fiber_entry_t)(int i1, int i2); diff --git a/kernel/nanokernel/include/nano_internal.h b/kernel/nanokernel/include/nano_internal.h index bd2b011498a..eb5d1fe1e62 100644 --- a/kernel/nanokernel/include/nano_internal.h +++ b/kernel/nanokernel/include/nano_internal.h @@ -46,7 +46,7 @@ extern "C" { /* helper type alias for context control structure */ -typedef struct s_CCS tCCS; +typedef struct ccs tCCS; /* context entry point declarations */