projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer: Amend previous commit (and Subversion sucks)
[bertos.git]
/
bertos
/
drv
/
timer.c
diff --git
a/bertos/drv/timer.c
b/bertos/drv/timer.c
index 333d6cd83282ed7886b728b43c68861cbeeb697d..bfc4feb2c1a02a619a3acb02ee25473353afa145 100644
(file)
--- a/
bertos/drv/timer.c
+++ b/
bertos/drv/timer.c
@@
-74,9
+74,6
@@
#endif
#if CONFIG_KERNEL
#endif
#if CONFIG_KERNEL
- #if CONFIG_KERN_PREEMPTIVE
- #include <hw/switch.h>
- #endif
#if CONFIG_KERN_SIGNALS
#include <kern/signal.h> /* sig_wait(), sig_check() */
#include <kern/proc.h> /* proc_current() */
#if CONFIG_KERN_SIGNALS
#include <kern/signal.h> /* sig_wait(), sig_check() */
#include <kern/proc.h> /* proc_current() */
@@
-106,7
+103,7
@@
volatile ticks_t _clock;
volatile ticks_t _clock;
-#if
ndef CONFIG_TIMER_DISABLE
_EVENTS
+#if
CONFIG_TIMER
_EVENTS
/**
* List of active asynchronous timers.
/**
* List of active asynchronous timers.
@@
-175,7
+172,7
@@
Timer *timer_abort(Timer *timer)
return timer;
}
return timer;
}
-#endif /* CONFIG_TIMER_
DISABLE_
EVENTS */
+#endif /* CONFIG_TIMER_EVENTS */
/**
/**
@@
-211,7
+208,7
@@
void timer_delayTicks(ticks_t delay)
}
}
-#if
ndef CONFIG_TIMER_DISABLE
_UDELAY
+#if
CONFIG_TIMER
_UDELAY
/**
* Busy wait until the specified amount of high-precision ticks have elapsed.
/**
* Busy wait until the specified amount of high-precision ticks have elapsed.
@@
-257,7
+254,7
@@
void timer_delayHp(hptime_t delay)
timer_busyWait(delay);
}
timer_busyWait(delay);
}
-#endif /* CONFIG_TIMER_
DISABLE_
UDELAY */
+#endif /* CONFIG_TIMER_UDELAY */
/**
/**
@@
-275,9
+272,10
@@
DEFINE_TIMER_ISR
#pragma interrupt saveall
#endif
#pragma interrupt saveall
#endif
-#if
ndef CONFIG_TIMER_DISABLE
_EVENTS
+#if
CONFIG_TIMER
_EVENTS
Timer *timer;
#endif
Timer *timer;
#endif
+
/*
* On systems sharing IRQ line and vector, this check is needed
* to ensure that IRQ is generated by timer source.
/*
* On systems sharing IRQ line and vector, this check is needed
* to ensure that IRQ is generated by timer source.
@@
-293,7
+291,7
@@
DEFINE_TIMER_ISR
/* Update the master ms counter */
++_clock;
/* Update the master ms counter */
++_clock;
-#if
ndef CONFIG_TIMER_DISABLE
_EVENTS
+#if
CONFIG_TIMER
_EVENTS
/*
* Check the first timer request in the list and process
* it when it has expired. Repeat this check until the
/*
* Check the first timer request in the list and process
* it when it has expired. Repeat this check until the
@@
-314,7
+312,7
@@
DEFINE_TIMER_ISR
/* Execute the associated event */
event_do(&timer->expire);
}
/* Execute the associated event */
event_do(&timer->expire);
}
-#endif /* CONFIG_TIMER_
DISABLE_
EVENTS */
+#endif /* CONFIG_TIMER_EVENTS */
TIMER_STROBE_OFF;
}
TIMER_STROBE_OFF;
}
@@
-328,7
+326,7
@@
void timer_init(void)
{
TIMER_STROBE_INIT;
{
TIMER_STROBE_INIT;
-#if
ndef CONFIG_TIMER_DISABLE
_EVENTS
+#if
CONFIG_TIMER
_EVENTS
LIST_INIT(&timers_queue);
#endif
LIST_INIT(&timers_queue);
#endif