projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer_gettick(): Rename to timer_ticks() and add backwards compatibility inline.
[bertos.git]
/
drv
/
timer.c
diff --git
a/drv/timer.c
b/drv/timer.c
index 24287cb982569748ea4e0165355aa1865ae0174b..b2caf90d9706526aed8ba8f065c40a2a7e5c4ee6 100755
(executable)
--- a/
drv/timer.c
+++ b/
drv/timer.c
@@
-15,6
+15,12
@@
/*
* $Log$
/*
* $Log$
+ * Revision 1.13 2004/08/10 06:59:09 bernie
+ * timer_gettick(): Rename to timer_ticks() and add backwards compatibility inline.
+ *
+ * Revision 1.12 2004/08/08 05:59:37 bernie
+ * Remove a few useless casts.
+ *
* Revision 1.11 2004/08/02 20:20:29 aleph
* Merge from project_ks
*
* Revision 1.11 2004/08/02 20:20:29 aleph
* Merge from project_ks
*
@@
-91,7
+97,7
@@
void timer_add(Timer *timer)
node = (Timer *)timers_queue.head;
while (node->link.succ)
{
node = (Timer *)timers_queue.head;
while (node->link.succ)
{
- /* Stop just after the insert point */
+ /* Stop just after the insert
ion
point */
if (node->tick > timer->tick)
break;
if (node->tick > timer->tick)
break;
@@
-100,7
+106,7
@@
void timer_add(Timer *timer)
}
/* Enqueue timer request into the list */
}
/* Enqueue timer request into the list */
- INSERTBEFORE(
(Node *)timer, (Node *)node
);
+ INSERTBEFORE(
&timer->link, &node->link
);
ENABLE_IRQRESTORE(flags);
}
ENABLE_IRQRESTORE(flags);
}
@@
-113,7
+119,7
@@
Timer *timer_abort(Timer *timer)
{
cpuflags_t flags;
DISABLE_IRQSAVE(flags);
{
cpuflags_t flags;
DISABLE_IRQSAVE(flags);
- REMOVE(
(Node *)timer
);
+ REMOVE(
&timer->link
);
ENABLE_IRQRESTORE(flags);
return timer;
ENABLE_IRQRESTORE(flags);
return timer;
@@
-138,10
+144,10
@@
void timer_delay(time_t time)
#else /* !CONFIG_KERN_SIGNALS */
#else /* !CONFIG_KERN_SIGNALS */
- time_t start = timer_
gettick
();
+ time_t start = timer_
ticks
();
/* Busy wait */
/* Busy wait */
- while (timer_
gettick
() - start < time) { /* nop */ }
+ while (timer_
ticks
() - start < time) { /* nop */ }
#endif /* !CONFIG_KERN_SIGNALS */
}
#endif /* !CONFIG_KERN_SIGNALS */
}
@@
-157,7
+163,7
@@
void timer_delay(time_t time)
*/
void timer_udelay(utime_t usec_delay)
{
*/
void timer_udelay(utime_t usec_delay)
{
- if (
usec_delay > 1000
)
+ if (
UNLIKELY(usec_delay > 1000)
)
{
timer_delay(usec_delay / 1000);
usec_delay %= 1000;
{
timer_delay(usec_delay / 1000);
usec_delay %= 1000;
@@
-216,7
+222,7
@@
DEFINE_TIMER_ISR
break;
/* Retreat the expired timer */
break;
/* Retreat the expired timer */
- REMOVE(
(Node *)timer
);
+ REMOVE(
&timer->link
);
/* Execute the associated event */
event_do(&timer->expire);
/* Execute the associated event */
event_do(&timer->expire);