projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some review issues.
[bertos.git]
/
drv
/
timer.c
diff --git
a/drv/timer.c
b/drv/timer.c
index 33188771e1e2711b046ebcf7a4db4e5a1fd09b06..3877fcf38212483ee8e3ed7a37726089008323ff 100755
(executable)
--- a/
drv/timer.c
+++ b/
drv/timer.c
@@
-14,6
+14,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.32 2007/10/08 12:14:32 batt
+ *#* Fix some review issues.
+ *#*
*#* Revision 1.31 2006/07/19 12:56:26 bernie
*#* Convert to new Doxygen style.
*#*
*#* Revision 1.31 2006/07/19 12:56:26 bernie
*#* Convert to new Doxygen style.
*#*
@@
-284,9
+287,16
@@
DEFINE_TIMER_ISR
#ifndef CONFIG_TIMER_DISABLE_EVENTS
Timer *timer;
#endif
#ifndef CONFIG_TIMER_DISABLE_EVENTS
Timer *timer;
#endif
+ /*
+ * On systems sharing IRQ line and vector, this check is needed
+ * to ensure that IRQ is generated by timer source.
+ */
+ if (!timer_hw_triggered())
+ return;
TIMER_STROBE_ON;
TIMER_STROBE_ON;
+ /* Perform hw IRQ handling */
timer_hw_irq();
/* Update the master ms counter */
timer_hw_irq();
/* Update the master ms counter */