projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer_delay(): Add a sanity check to avoid sleeping forever.
[bertos.git]
/
drv
/
buzzer.c
diff --git
a/drv/buzzer.c
b/drv/buzzer.c
index 1f8f15d9c3e752549438f85cb3b102a7ec1ce364..dedc4fa81dc732fc242ea79d0fcfad789cf630e2 100755
(executable)
--- a/
drv/buzzer.c
+++ b/
drv/buzzer.c
@@
-1,20
+1,27
@@
/*!
* \file
* <!--
/*!
* \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$
*
* 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$
*/
/*#*
*#* $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.8 2004/08/25 14:12:08 rasky
*#* Aggiornato il comment block dei log RCS
*#*
@@
-41,8
+48,8
@@
#include "buzzer.h"
#include <drv/timer.h>
#include "buzzer.h"
#include <drv/timer.h>
-#include <drv/kdebug.h>
#include <kern/event.h>
#include <kern/event.h>
+#include <debug.h>
#include <hw.h>
#include <arch_config.h>
#include <hw.h>
#include <arch_config.h>
@@
-61,7
+68,9
@@
#elif defined(__AVR__)
#elif defined(__AVR__)
- #define IS_BUZZER_ON (PORTG & BV(PORTG0))
+ #include <avr/io.h>
+
+ #define IS_BUZZER_ON (PORTG & BV(PG0))
/*!
* Buzzer manipulation macros
/*!
* Buzzer manipulation macros
@@
-74,7
+83,7
@@
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
- PORTG |= BV(P
ORT
G0); \
+ PORTG |= BV(PG0); \
ENABLE_IRQRESTORE(_flags); \
} while (0)
ENABLE_IRQRESTORE(_flags); \
} while (0)
@@
-82,7
+91,7
@@
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
- PORTG &= ~BV(P
ORT
G0); \
+ PORTG &= ~BV(PG0); \
ENABLE_IRQRESTORE(_flags); \
} while (0)
ENABLE_IRQRESTORE(_flags); \
} while (0)
@@
-90,8
+99,8
@@
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
do { \
cpuflags_t _flags; \
DISABLE_IRQSAVE(_flags); \
- PORTG &= ~BV(P
ORT
G0); \
- DDRG |= BV(P
ORT
G0); \
+ PORTG &= ~BV(PG0); \
+ DDRG |= BV(PG0); \
ENABLE_IRQRESTORE(_flags); \
} while (0)
ENABLE_IRQRESTORE(_flags); \
} while (0)