Merge needed define.

[bertos.git] / drv / timer_test.c

diff --git a/drv/timer_test.c b/drv/timer_test.c
old mode 100755 (executable)
new mode 100644 (file)
index bfc712a..170105d
--- a/drv/timer_test.c
+++ b/drv/timer_test.c
@@ -1,8 +1,33 @@
-/*!
+/**
  * \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 2005 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Hardware independent timer driver (implementation)
@@ -11,16 +36,6 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.2  2005/11/27 03:58:18  bernie
- *#* Add POSIX timer emulator.
- *#*
- *#* Revision 1.1  2005/11/27 03:04:08  bernie
- *#* Move test code to timer_test.c; Add OS_HOSTED support.
- *#*
- *#*/
-
 #include "timer.c"
 #include "mware/event.c"
 #include "os/hptime.c"
@@ -34,7 +49,7 @@ static void timer_test_constants(void)
        #ifdef TIMER1_OVF_COUNT
                kprintf("TIMER1_OVF_COUNT=%d\n", (int)TIMER1_OVF_COUNT);
        #endif
-       kprintf("TIMER_TICKS_PER_MSEC=%d\n", (int)TIMER_TICKS_PER_MSEC);
+       kprintf("TIMER_TICKS_PER_SEC=%d\n", (int)TIMER_TICKS_PER_SEC);
        kprintf("\n");
        kprintf("ms_to_ticks(100)=%lu\n", ms_to_ticks(100));
        kprintf("ms_to_ticks(10000)=%lu\n", ms_to_ticks(10000));
@@ -115,4 +130,5 @@ int main(void)
        timer_test_delay();
        timer_test_async();
        timer_test_poll();
+       return 0;
 }