/*!
* \file
* <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
* Copyright 1999, 2003 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
* -->
*
* \version $Id$
/*#*
*#* $Log$
+ *#* Revision 1.14 2005/04/11 19:10:27 bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.13 2005/02/18 11:20:15 bernie
+ *#* Use mware/event.h; Update copyright info.
+ *#*
+ *#* Revision 1.12 2004/12/13 12:07:06 bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
*#* Revision 1.11 2004/12/08 09:11:53 bernie
*#* Rename time_t to mtime_t.
*#*
*#*
*#* Revision 1.9 2004/09/14 21:01:25 bernie
*#* Use new AVR port pin names.
- *#*
- *#* Revision 1.8 2004/08/25 14:12:08 rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.7 2004/08/24 16:53:43 bernie
- *#* Add missing headers.
- *#*
- *#* Revision 1.6 2004/06/07 18:10:06 aleph
- *#* Remove free pool of timers; use user-provided Timer structure instead
- *#*
- *#* Revision 1.5 2004/06/07 15:54:23 aleph
- *#* Update to new event.h naming
- *#*
- *#* Revision 1.4 2004/06/06 16:09:22 bernie
- *#* Reformat (from project_ks).
- *#*
- *#* Revision 1.3 2004/06/03 11:27:09 bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.2 2004/05/23 18:21:53 bernie
- *#* Trim CVS logs and cleanup header info.
- *#*
*#*/
#include "buzzer.h"
#include <drv/timer.h>
-#include <kern/event.h>
-#include <debug.h>
+#include <mware/event.h>
+
+#include <cfg/macros.h> /* BV() */
+#include <cfg/debug.h>
#include <hw.h>
-#include <arch_config.h>
+#include <cfg/arch_config.h>
#if (ARCH & ARCH_EMUL)
#define IS_BUZZER_ON (PORTG & BV(PG0))
/*!
- * Buzzer manipulation macros
+ * \name Buzzer manipulation macros.
*
* \note Some PORTG functions are being used from
* interrupt code, so we must be careful to
* avoid race conditions.
+ * \{
*/
- #define BUZZER_ON \
- do { \
- cpuflags_t _flags; \
- DISABLE_IRQSAVE(_flags); \
- PORTG |= BV(PG0); \
- ENABLE_IRQRESTORE(_flags); \
- } while (0)
-
- #define BUZZER_OFF \
- do { \
- cpuflags_t _flags; \
- DISABLE_IRQSAVE(_flags); \
- PORTG &= ~BV(PG0); \
- ENABLE_IRQRESTORE(_flags); \
- } while (0)
-
- #define BUZZER_INIT \
- do { \
- cpuflags_t _flags; \
- DISABLE_IRQSAVE(_flags); \
- PORTG &= ~BV(PG0); \
- DDRG |= BV(PG0); \
- ENABLE_IRQRESTORE(_flags); \
- } while (0)
+ #define BUZZER_ON ATOMIC(PORTG |= BV(PG0))
+ #define BUZZER_OFF ATOMIC(PORTG &= ~BV(PG0))
+ #define BUZZER_INIT ATOMIC(PORTG &= ~BV(PG0); DDRG |= BV(PG0);)
+ /*\}*/
#elif defined(__IAR_SYSTEMS_ICC) || defined(__IAR_SYSTEMS_ICC__) /* 80C196 */
void buz_beep(mtime_t time)
{
cpuflags_t flags;
+ IRQ_SAVE_DISABLE(flags);
/* Remove the software interrupt if it was already queued */
- DISABLE_IRQSAVE(flags);
if (buz_timer_running)
timer_abort(&buz_timer);
buz_timer.delay = time;
timer_add(&buz_timer);
- ENABLE_IRQRESTORE(flags);
+ IRQ_RESTORE(flags);
}
void buz_repeat_stop(void)
{
cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
+ IRQ_SAVE_DISABLE(flags);
/* Remove the software interrupt if it was already queued */
if (buz_timer_running)
buz_repeat_interval = 0;
BUZZER_OFF;
- ENABLE_IRQRESTORE(flags);
+ IRQ_RESTORE(flags);
}