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

diff --git a/drv/timer_qt.c b/drv/timer_qt.c
old mode 100755
new mode 100644
index a9e38be6..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,21 @@
 
 /*#*
  *#* $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.
+ *#*
+ *#* Revision 1.4  2006/05/28 12:17:57  bernie
+ *#* Drop almost all the Qt3 cruft.
+ *#*
+ *#* Revision 1.3  2006/02/21 21:28:02  bernie
+ *#* New time handling based on TIMER_TICKS_PER_SEC to support slow timers with ticks longer than 1ms.
+ *#*
+ *#* Revision 1.2  2006/02/20 02:01:35  bernie
+ *#* Port to Qt 4.1.
+ *#*
  *#* Revision 1.1  2005/11/27 03:06:36  bernie
  *#* Qt timer emulation.
  *#*
@@ -22,8 +62,8 @@
 #include <cfg/compiler.h> /* hptime.t */
 
 // Qt headers
-#include <qdatetime.h>
-#include <qtimer.h>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
 
 
 // The user interrupt server routine
@@ -70,9 +110,9 @@ public:
 		// Record initial time
 		system_time.start();
 
-		// Activate 1ms timer interrupt
+		// Activate timer interrupt
 		timer.connect(&timer, SIGNAL(timeout()), this, SLOT(timerInterrupt()));
-		timer.start(1);
+		timer.start(1000 / TIMER_TICKS_PER_SEC);
 
 		initialized = true;
 	}
@@ -97,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();
 }