CONFIG_TIMER_STROBE: be tolerant with missing optional macro.

[bertos.git] / drv / timer_avr.h

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index 96be9da6610394cc026654b00669e526db9a81f7..2cfb016aeb11c9bd2dc0d6efd9e05aba1804f604 100755 (executable)
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -1,7 +1,7 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
  * This file is part of DevLib - See devlib/README for information.
  * -->
@@ -13,52 +13,36 @@
  * \brief Low-level timer module for AVR
  */
 
-/*
- * $Log$
- * Revision 1.13  2004/08/24 14:30:11  bernie
- * Use new-style config macros for drv/timer.c
- *
- * Revision 1.12  2004/08/10 06:59:45  bernie
- * CONFIG_TIMER_STROBE: Define no-op default macros.
- *
- * Revision 1.11  2004/08/03 15:53:17  aleph
- * Fix spacing
- *
- * Revision 1.10  2004/08/02 20:20:29  aleph
- * Merge from project_ks
- *
- * Revision 1.9  2004/07/22 02:01:14  bernie
- * Use TIMER_PRESCALER consistently.
- *
- * Revision 1.8  2004/07/20 23:50:20  bernie
- * Also define TIMER_PRESCALER.
- *
- * Revision 1.7  2004/07/20 23:49:40  bernie
- * Compute value of OCR_DIVISOR from CLOCK_FREQ.
- *
- * Revision 1.6  2004/07/20 23:48:16  bernie
- * Finally remove redundant protos.
- *
- * Revision 1.5  2004/07/18 22:16:35  bernie
- * Add missing header; Prevent warning for project_ks-specific code.
- *
- * Revision 1.4  2004/06/27 15:22:15  aleph
- * Fix spacing
- *
- * Revision 1.3  2004/06/07 15:57:40  aleph
- * Update to latest AVR timer code
- *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 18:23:30  bernie
- * Import drv/timer module.
- *
- */
-
+/*#*
+ *#* $Log$
+ *#* Revision 1.16  2004/09/06 21:49:26  bernie
+ *#* CONFIG_TIMER_STROBE: be tolerant with missing optional macro.
+ *#*
+ *#* Revision 1.15  2004/08/25 14:12:08  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.14  2004/08/24 16:27:01  bernie
+ *#* Add missing headers.
+ *#*
+ *#* Revision 1.13  2004/08/24 14:30:11  bernie
+ *#* Use new-style config macros for drv/timer.c
+ *#*
+ *#* Revision 1.12  2004/08/10 06:59:45  bernie
+ *#* CONFIG_TIMER_STROBE: Define no-op default macros.
+ *#*
+ *#* Revision 1.11  2004/08/03 15:53:17  aleph
+ *#* Fix spacing
+ *#*
+ *#* Revision 1.10  2004/08/02 20:20:29  aleph
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.9  2004/07/22 02:01:14  bernie
+ *#* Use TIMER_PRESCALER consistently.
+ *#*/
 #ifndef DRV_TIMER_AVR_H
 #define DRV_TIMER_AVR_H
 
+#include <arch_config.h> // ARCH_BOARD_KC
 #include <avr/wdt.h>
 #include <avr/signal.h>
 
@@ -88,7 +72,7 @@
  * TIMER_STROBE_OFF and TIMER_STROBE_INIT and set
  * CONFIG_TIMER_STROBE to 1.
  */
-#ifndef CONFIG_TIMER_STROBE
+#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)