michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename nanoTimerList to _nano_timer_list

Browse source 
Updating global variable's name to follow a consistent naming convention.

Change accomplished with the following script:

   #!/bin/bash
   echo "Searching for ${1} to replace with ${2}"
   find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: I2e501394b7fa4264d9854659e2dd008e5c94b540
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-04-27 10:28:22 -05:00 • committed by Anas Nashif
commit c4bd9cc6ab
8 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/arc/timer/arcv2_timer0.c
View file

@ -152,14 +152,14 @@ void _timer_int_handler(void *unused)
_nano_ticks++;
if (nanoTimerList) {
nanoTimerList->ticks--;
if (_nano_timer_list) {
_nano_timer_list->ticks--;
while (nanoTimerList && (!nanoTimerList->ticks)) {
struct nano_timer *expired = nanoTimerList;
while (_nano_timer_list && (!_nano_timer_list->ticks)) {
struct nano_timer *expired = _nano_timer_list;
struct nano_lifo *lifo = &expired->lifo;
nanoTimerList = expired->link;
_nano_timer_list = expired->link;
nano_fiber_lifo_put(lifo, expired->userData);
}
}

10
arch/arm/timer/systick.c
View file

@ -380,13 +380,13 @@ void _TIMER_INT_HANDLER(void *unused)
#else
_nano_ticks++;
if (nanoTimerList) {
nanoTimerList->ticks--;
if (_nano_timer_list) {
_nano_timer_list->ticks--;
while (nanoTimerList && (!nanoTimerList->ticks)) {
struct nano_timer *expired = nanoTimerList;
while (_nano_timer_list && (!_nano_timer_list->ticks)) {
struct nano_timer *expired = _nano_timer_list;
struct nano_lifo *chan = &expired->lifo;
nanoTimerList = expired->link;
_nano_timer_list = expired->link;
nano_isr_lifo_put(chan, expired->userData);
}
}

10
arch/x86/timer/hpet.c
View file

@ -343,13 +343,13 @@ void _timer_int_handler(void *unused)
#else
_nano_ticks++; /* increment nanokernel ticks var */
if (nanoTimerList) {
nanoTimerList->ticks--;
if (_nano_timer_list) {
_nano_timer_list->ticks--;
while (nanoTimerList && (!nanoTimerList->ticks)) {
struct nano_timer *expired = nanoTimerList;
while (_nano_timer_list && (!_nano_timer_list->ticks)) {
struct nano_timer *expired = _nano_timer_list;
struct nano_lifo *chan = &expired->lifo;
nanoTimerList = expired->link;
_nano_timer_list = expired->link;
nano_fiber_lifo_put(chan, expired->userData);
}
}

10
arch/x86/timer/loApicTimer.c
View file

@ -349,13 +349,13 @@ void _timer_int_handler(void *unused /* parameter is not used */
_nano_ticks++; /* increment nanokernel ticks var */
if (nanoTimerList != NULL) {
nanoTimerList->ticks--;
if (_nano_timer_list != NULL) {
_nano_timer_list->ticks--;
while ((nanoTimerList != NULL) && (!nanoTimerList->ticks)) {
struct nano_timer *expired = nanoTimerList;
while ((_nano_timer_list != NULL) && (!_nano_timer_list->ticks)) {
struct nano_timer *expired = _nano_timer_list;
struct nano_lifo *chan = &expired->lifo;
nanoTimerList = expired->link;
_nano_timer_list = expired->link;
nano_fiber_lifo_put(chan, expired->userData);
}
}

10
drivers/timer/i8253.c
View file

@ -330,13 +330,13 @@ void _timer_int_handler(void *unusedArg /* not used */
#if defined(CONFIG_NANOKERNEL)
_nano_ticks++; /* increment nanokernel ticks var */
if (nanoTimerList) {
nanoTimerList->ticks--;
if (_nano_timer_list) {
_nano_timer_list->ticks--;
while (nanoTimerList && (!nanoTimerList->ticks)) {
struct nano_timer *expired = nanoTimerList;
while (_nano_timer_list && (!_nano_timer_list->ticks)) {
struct nano_timer *expired = _nano_timer_list;
struct nano_lifo *chan = &expired->lifo;
nanoTimerList = expired->link;
_nano_timer_list = expired->link;
nano_fiber_lifo_put(chan, expired->userData);
}
}

2
include/clock_vars.h
View file

@ -79,7 +79,7 @@ extern int sys_clock_hw_cycles_per_tick;
#ifdef CONFIG_NANOKERNEL
extern uint32_t _nano_ticks;
extern struct nano_timer *nanoTimerList;
extern struct nano_timer *_nano_timer_list;
#endif /* CONFIG_NANOKERNEL */
#endif /* !_ASMLANGUAGE */

14
kernel/nanokernel/core/nano_timer.c
View file

@ -34,7 +34,7 @@
#include <nanok.h>
extern struct nano_timer *nanoTimerList;
extern struct nano_timer *_nano_timer_list;
/*******************************************************************************
*
@ -109,7 +109,7 @@ void _timer_start(struct nano_timer *timer, /* timer to start */
imask = irq_lock_inline();
cur = nanoTimerList;
cur = _nano_timer_list;
while (cur && (timer->ticks > cur->ticks)) {
timer->ticks -= cur->ticks;
@ -124,7 +124,7 @@ void _timer_start(struct nano_timer *timer, /* timer to start */
if (prev != NULL)
prev->link = timer;
else
nanoTimerList = timer;
_nano_timer_list = timer;
irq_unlock_inline(imask);
}
@ -149,7 +149,7 @@ static void _timer_stop(struct nano_timer *timer /* timer to stop */
imask = irq_lock_inline();
cur = nanoTimerList;
cur = _nano_timer_list;
/* find prev */
while (cur && cur != timer) {
@ -161,10 +161,10 @@ static void _timer_stop(struct nano_timer *timer /* timer to stop */
if (cur) {
/* if it was first */
if (prev == NULL) {
nanoTimerList = timer->link;
_nano_timer_list = timer->link;
/* if not last */
if (nanoTimerList)
nanoTimerList->ticks += timer->ticks;
if (_nano_timer_list)
_nano_timer_list->ticks += timer->ticks;
} else {
prev->link = timer->link;
/* if not last */

2
kernel/nanokernel/core/nanotime.c
View file

@ -44,7 +44,7 @@ int sys_clock_hw_cycles_per_tick =
sys_clock_hw_cycles_per_sec / sys_clock_ticks_per_sec;
uint32_t _nano_ticks = 0;
struct nano_timer *nanoTimerList = NULL;
struct nano_timer *_nano_timer_list = NULL;
/*******************************************************************************
*