Merge needed define.

[bertos.git] / drv / buzzerled.c

diff --git a/drv/buzzerled.c b/drv/buzzerled.c
old mode 100755 (executable)
new mode 100644 (file)
index 2aa7b15..7ce6f53
--- a/drv/buzzerled.c
+++ b/drv/buzzerled.c
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2004 Giovanni Bajo
- * This file is part of DevLib - See devlib/README for information.
+ *
  * -->
  *
  * \brief Generic library to handle buzzers and leds
@@ -25,25 +50,34 @@
  * \author Giovanni Bajo <rasky@develer.com>
  */
 
-/*
- * $Log$
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 18:36:05  bernie
- * Import buzzerled driver.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.7  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.6  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.5  2004/12/08 09:43:41  bernie
+ *#* Add a todo item.
+ *#*
+ *#* Revision 1.4  2004/08/25 14:12:08  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.3  2004/07/14 14:04:29  rasky
+ *#* Merge da SC: spostata bld_set inline perché si ottimizza parecchio tramite propagazione di costanti
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 18:36:05  bernie
+ *#* Import buzzerled driver.
+ *#*
+ *#*/
 
 #include "buzzerled.h"
 #include "timer.h"
 
-#if defined(__m56800__)
-       #include "buzzerled_dsp56k.h"
-#else
-       #error Unsupported architecture
-#endif
-
 static struct Timer timers[NUM_BLDS];
 static bool timer_go[NUM_BLDS];
 
@@ -69,14 +103,10 @@ void bld_init(void)
        bld_hw_init();
 }
 
-void bld_set(enum BLD_DEVICE device, bool enable)
-{
-       bld_hw_set(device, enable);
-}
-
 void bld_beep(enum BLD_DEVICE device, uint16_t duration)
 {
-       struct Timer* t = &timers[device];
+       // \todo This is not reentrant for the same device. FIXME!
+       struct Timer *t = &timers[device];
        timer_set_delay(t, duration);
        timer_set_event_softint(t, hook_turn_off, t);
        timer_add(t);