projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add randpool test program.
[bertos.git]
/
drv
/
timer_qt.c
diff --git
a/drv/timer_qt.c
b/drv/timer_qt.c
index c6ff698f0261d8b2110131d9e1b5fc16c622543d..cb24195720691e431ac568d357dce3f5777b0f45 100755
(executable)
--- a/
drv/timer_qt.c
+++ b/
drv/timer_qt.c
@@
-1,4
+1,4
@@
-/*
!
+/*
*
* \file
* <!--
* Copyright 2005 Develer S.r.l. (http://www.develer.com/)
* \file
* <!--
* Copyright 2005 Develer S.r.l. (http://www.develer.com/)
@@
-14,6
+14,15
@@
/*#*
*#* $Log$
/*#*
*#* $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.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.
*#*
@@
-28,13
+37,8
@@
#include <cfg/compiler.h> /* hptime.t */
// Qt headers
#include <cfg/compiler.h> /* hptime.t */
// Qt headers
-#if _QT < 4
- #include <qdatetime.h>
- #include <qtimer.h>
-#else
- #include <QtCore/QDateTime>
- #include <QtCore/QTimer>
-#endif
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
// The user interrupt server routine
// The user interrupt server routine
@@
-108,13
+112,13
@@
public slots:
/// HW dependent timer initialization.
/// HW dependent timer initialization.
-
extern "C"
static void timer_hw_init(void)
+static void timer_hw_init(void)
{
// Kick EmulTimer initialization
EmulTimer::instance().init();
}
{
// 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();
}
{
return EmulTimer::instance().hpread();
}