X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=drv%2Ftimer.c;h=3877fcf38212483ee8e3ed7a37726089008323ff;hb=1cd1b0fea245b38739d66bdcc4b0394422654595;hp=33188771e1e2711b046ebcf7a4db4e5a1fd09b06;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/drv/timer.c b/drv/timer.c
index 33188771..3877fcf3 100755
--- a/drv/timer.c
+++ b/drv/timer.c
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $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.
  *#*
@@ -284,9 +287,16 @@ DEFINE_TIMER_ISR
 #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;
 
+	/* Perform hw IRQ handling */
 	timer_hw_irq();
 
 	/* Update the master ms counter */