From 73037040c1e642ddc06f56ea0db6793d67d56023 Mon Sep 17 00:00:00 2001 From: bernie Date: Tue, 19 Oct 2004 08:56:49 +0000 Subject: [PATCH] TIMER_STROBE_ON, TIMER_STROBE_OFF, TIMER_STROBE_INIT: Move from timer_avr.h to timer.h, where they really belong. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@247 38d2e660-2303-0410-9eaa-f027e97ec537 --- drv/timer.c | 22 ++++++++++++++++++++++ drv/timer_avr.h | 20 +++----------------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/drv/timer.c b/drv/timer.c index 101a468d..5a62332f 100755 --- a/drv/timer.c +++ b/drv/timer.c @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.19 2004/10/19 08:56:49 bernie + *#* TIMER_STROBE_ON, TIMER_STROBE_OFF, TIMER_STROBE_INIT: Move from timer_avr.h to timer.h, where they really belong. + *#* *#* Revision 1.18 2004/10/14 23:14:05 bernie *#* Fix longstanding problem with wrap-arounds. *#* @@ -69,6 +72,7 @@ #include "timer.h" #include +#include #include CPU_HEADER(timer) #include @@ -76,6 +80,24 @@ #include #endif + +/*! + * \def CONFIG_TIMER_STROBE + * + * This is a debug facility that can be used to + * monitor timer interrupt activity on an external pin. + * + * To use strobes, redefine the macros TIMER_STROBE_ON, + * TIMER_STROBE_OFF and TIMER_STROBE_INIT and set + * CONFIG_TIMER_STROBE to 1. + */ +#if !defined(CONFIG_TIMER_STROBE) || !CONFIG_TIMER_STROBE + #define TIMER_STROBE_ON do {/*nop*/} while(0) + #define TIMER_STROBE_OFF do {/*nop*/} while(0) + #define TIMER_STROBE_INIT do {/*nop*/} while(0) +#endif + + //! Master system clock (1ms accuracy) volatile time_t _clock; diff --git a/drv/timer_avr.h b/drv/timer_avr.h index f8dbaa3d..a5301364 100755 --- a/drv/timer_avr.h +++ b/drv/timer_avr.h @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.19 2004/10/19 08:56:41 bernie + *#* TIMER_STROBE_ON, TIMER_STROBE_OFF, TIMER_STROBE_INIT: Move from timer_avr.h to timer.h, where they really belong. + *#* *#* Revision 1.18 2004/09/20 03:31:03 bernie *#* Fix racy racy code. *#* @@ -70,23 +73,6 @@ #define TIMER_ON_OUTPUT_COMPARE2 3 -/*! - * \def CONFIG_TIMER_STROBE - * - * This is a debug facility that can be used to - * monitor timer interrupt activity on an external pin. - * - * To use strobes, redefine the macros TIMER_STROBE_ON, - * TIMER_STROBE_OFF and TIMER_STROBE_INIT and set - * CONFIG_TIMER_STROBE to 1. - */ -#if !defined(CONFIG_TIMER_STROBE) || !CONFIG_TIMER_STROBE - #define TIMER_STROBE_ON do {/*nop*/} while(0) - #define TIMER_STROBE_OFF do {/*nop*/} while(0) - #define TIMER_STROBE_INIT do {/*nop*/} while(0) -#endif - - /* Not needed, IRQ timer flag cleared automatically */ #define timer_hw_irq() do {} while (0) -- 2.25.1