X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fbuzzer.c;h=6d74fcc4be2aaba98a80fcf13a484da32d526540;hb=e62ca0b357f09804d7d894949df44224c9d74bb7;hp=63cbc4a8c7c01694c0b5a0bee5b16005f06bcd39;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/drv/buzzer.c b/bertos/drv/buzzer.c
index 63cbc4a8..6d74fcc4 100644
--- a/bertos/drv/buzzer.c
+++ b/bertos/drv/buzzer.c
@@ -27,7 +27,7 @@
  * the GNU General Public License.
  *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2003 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 1999, 2003 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
@@ -36,49 +36,13 @@
  * \brief Buzzer driver (implementation)
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.19  2006/07/19 12:56:25  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.18  2006/02/17 21:15:25  bernie
- *#* Add MOD_CHECK() checks.
- *#*
- *#* Revision 1.17  2006/02/10 12:30:18  bernie
- *#* Push interrupt protection inside hw module.
- *#*
- *#* Revision 1.16  2005/11/04 16:19:33  bernie
- *#* buz_init(): Restore IRQ protection as in project_bko.
- *#*
- *#* Revision 1.15  2005/06/27 21:25:50  bernie
- *#* Modularize hardware access; Port to new timer interface.
- *#*
- *#* 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.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.
- *#*/
-
 #include "buzzer.h"
 
-#include <hw_buzzer.h>
+#include "hw/hw_buzzer.h"
 #include <drv/timer.h>
 
 #include <mware/event.h>
@@ -128,7 +92,7 @@ static void buz_softint(void)
  */
 void buz_beep(mtime_t time)
 {
-	cpuflags_t flags;
+	cpu_flags_t flags;
 	IRQ_SAVE_DISABLE(flags);
 
 	/* Remove the software interrupt if it was already queued */
@@ -163,7 +127,7 @@ void buz_repeat_start(mtime_t duration, mtime_t interval)
  */
 void buz_repeat_stop(void)
 {
-	cpuflags_t flags;
+	cpu_flags_t flags;
 	IRQ_SAVE_DISABLE(flags);
 
 	/* Remove the software interrupt if it was already queued */
@@ -191,7 +155,7 @@ void buz_init(void)
 	BUZZER_HW_INIT;
 
 	/* Init software interrupt. */
-	timer_set_event_softint(&buz_timer, (Hook)buz_softint, 0);
+	timer_setSoftint(&buz_timer, (Hook)buz_softint, 0);
 
 	MOD_INIT(buzzer);
 }