/*!
* \file
* <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999,2003 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 2003, 2004 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.
* -->
*
* \version $Id$
*
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \brief Buzzer driver (implementation)
*
- * \brief Buzzer driver
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
*/
-/*
- * $Log$
- * 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.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.10 2004/10/03 18:38:51 bernie
+ *#* Add missing AVR header; Fix header.
+ *#*
+ *#* 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 "hw.h"
-#include "kdebug.h"
-#include "timer.h"
#include "buzzer.h"
+
+#include <drv/timer.h>
#include <kern/event.h>
+#include <debug.h>
+#include <hw.h>
+#include <arch_config.h>
#if (ARCH & ARCH_EMUL)
#elif defined(__AVR__)
- #define IS_BUZZER_ON (PORTG & BV(PORTG0))
+ #include <avr/io.h>
+
+ #define IS_BUZZER_ON (PORTG & BV(PG0))
/*!
* Buzzer manipulation macros
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
- PORTG |= BV(PORTG0); \
+ PORTG |= BV(PG0); \
ENABLE_IRQRESTORE(_flags); \
} while (0)
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
- PORTG &= ~BV(PORTG0); \
+ PORTG &= ~BV(PG0); \
ENABLE_IRQRESTORE(_flags); \
} while (0)
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
- PORTG &= ~BV(PORTG0); \
- DDRG |= BV(PORTG0); \
+ PORTG &= ~BV(PG0); \
+ DDRG |= BV(PG0); \
ENABLE_IRQRESTORE(_flags); \
} while (0)
/* Local vars */
-static Timer *buz_timer;
+static Timer buz_timer;
static bool buz_timer_running;
static time_t buz_repeat_interval;
static time_t buz_repeat_duration;
if (buz_repeat_interval)
{
/* Wait for interval time */
- buz_timer->delay = buz_repeat_interval;
- timer_add(buz_timer);
+ buz_timer.delay = buz_repeat_interval;
+ timer_add(&buz_timer);
}
else
buz_timer_running = false;
{
/* Wait for beep time */
BUZZER_ON;
- buz_timer->delay = buz_repeat_duration;
- timer_add(buz_timer);
+ buz_timer.delay = buz_repeat_duration;
+ timer_add(&buz_timer);
}
else
buz_timer_running = false;
/* Remove the software interrupt if it was already queued */
DISABLE_IRQSAVE(flags);
if (buz_timer_running)
- timer_abort(buz_timer);
+ timer_abort(&buz_timer);
/* Turn on buzzer */
BUZZER_ON;
/* Add software interrupt to turn the buzzer off later */
buz_timer_running = true;
- buz_timer->delay = time;
- timer_add(buz_timer);
+ buz_timer.delay = time;
+ timer_add(&buz_timer);
ENABLE_IRQRESTORE(flags);
}
/* Remove the software interrupt if it was already queued */
if (buz_timer_running)
{
- timer_abort(buz_timer);
+ timer_abort(&buz_timer);
buz_timer_running = false;
}
BUZZER_INIT;
/* Inizializza software interrupt */
- buz_timer = timer_new();
- ASSERT(buz_timer != NULL);
- event_initSoftInt(&buz_timer->expire, (Hook)buz_softint, 0);
+ event_initSoftInt(&buz_timer.expire, (Hook)buz_softint, 0);
}