projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from kseries
[bertos.git]
/
drv
/
timer.c
diff --git
a/drv/timer.c
b/drv/timer.c
index f471cb57ad7ac3824ddda0429153430542d5b08d..24287cb982569748ea4e0165355aa1865ae0174b 100755
(executable)
--- a/
drv/timer.c
+++ b/
drv/timer.c
@@
-15,6
+15,9
@@
/*
* $Log$
/*
* $Log$
+ * Revision 1.11 2004/08/02 20:20:29 aleph
+ * Merge from project_ks
+ *
* Revision 1.10 2004/07/30 14:15:53 rasky
* Nuovo supporto unificato per detect della CPU
*
* Revision 1.10 2004/07/30 14:15:53 rasky
* Nuovo supporto unificato per detect della CPU
*
@@
-216,7
+219,7
@@
DEFINE_TIMER_ISR
REMOVE((Node *)timer);
/* Execute the associated event */
REMOVE((Node *)timer);
/* Execute the associated event */
- event_do
Intr
(&timer->expire);
+ event_do(&timer->expire);
}
#endif /* CONFIG_TIMER_DISABLE_EVENTS */
}
#endif /* CONFIG_TIMER_DISABLE_EVENTS */