X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_qt.c;h=55527f902516159e98c5e40c430349e685912415;hb=27fef4ed34eb237817defa14242e726ccad70948;hp=9b7a289c64f73fc638a07cb62e8554480baa7abf;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/drv/timer_qt.c b/drv/timer_qt.c
old mode 100755
new mode 100644
index 9b7a289c..55527f90
--- a/drv/timer_qt.c
+++ b/drv/timer_qt.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.
+ *
  * -->
  *
  * \version $Id$
@@ -14,6 +39,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.6  2006/09/13 18:25:22  bernie
+ *#* Fix GCC error.
+ *#*
  *#* Revision 1.5  2006/07/19 12:56:26  bernie
  *#* Convert to new Doxygen style.
  *#*
@@ -109,13 +137,13 @@ public slots:
 
 
 /// HW dependent timer initialization.
-extern "C" static void timer_hw_init(void)
+static void timer_hw_init(void)
 {
 	// Kick EmulTimer initialization
 	EmulTimer::instance().init();
 }
 
-extern "C" INLINE hptime_t timer_hw_hpread(void)
+INLINE hptime_t timer_hw_hpread(void)
 {
 	return EmulTimer::instance().hpread();
 }