projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial (nonworking) draft of preemptive task switching
[bertos.git]
/
bertos
/
drv
/
timer.h
diff --git
a/bertos/drv/timer.h
b/bertos/drv/timer.h
index 76f4f31f95a59bb9e7a63a4438fb701515ca05ee..380b8c34c1df69df680f516ff223e536af333a8f 100644
(file)
--- a/
bertos/drv/timer.h
+++ b/
bertos/drv/timer.h
@@
-27,7
+27,7
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bern
ardo Innocenti <bernie@develer.com
>
+ * Copyright 2000 Bern
ie Innocenti <bernie@codewiz.org
>
*
* -->
*
*
* -->
*
@@
-35,7
+35,7
@@
*
* \version $Id$
*
*
* \version $Id$
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
*
*/
*
*/
@@
-59,11
+59,11
@@
#include CPU_HEADER(timer)
#endif
#include CPU_HEADER(timer)
#endif
-#include
<cfg/cfg_timer.h>
+#include
"cfg/cfg_timer.h"
#include <cfg/debug.h>
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/compiler.h>
-#include <
mware
/list.h>
+#include <
struct
/list.h>
extern volatile ticks_t _clock;
extern volatile ticks_t _clock;
@@
-178,14
+178,19
@@
INLINE utime_t hptime_to_us(hptime_t hpticks)
#endif /* TIMER_HW_HPTICKS_PER_SEC < 100000UL */
}
#endif /* TIMER_HW_HPTICKS_PER_SEC < 100000UL */
}
-
-void timer_init(void);
void timer_delayTicks(ticks_t delay);
INLINE void timer_delay(mtime_t delay)
{
timer_delayTicks(ms_to_ticks(delay));
}
void timer_delayTicks(ticks_t delay);
INLINE void timer_delay(mtime_t delay)
{
timer_delayTicks(ms_to_ticks(delay));
}
+void timer_init(void);
+void timer_cleanup(void);
+
+int timer_testSetup(void);
+int timer_testRun(void);
+int timer_testTearDown(void);
+
#if !defined(CONFIG_TIMER_DISABLE_UDELAY)
void timer_busyWait(hptime_t delay);
void timer_delayHp(hptime_t delay);
#if !defined(CONFIG_TIMER_DISABLE_UDELAY)
void timer_busyWait(hptime_t delay);
void timer_delayHp(hptime_t delay);
@@
-219,8
+224,8
@@
typedef struct Timer
#define TIMER_MAGIC_ACTIVE 0xABBA
#define TIMER_MAGIC_INACTIVE 0xBAAB
#define TIMER_MAGIC_ACTIVE 0xABBA
#define TIMER_MAGIC_INACTIVE 0xBAAB
-
extern
void timer_add(Timer *timer);
-
extern
Timer *timer_abort(Timer *timer);
+void timer_add(Timer *timer);
+Timer *timer_abort(Timer *timer);
/** Set the timer so that it calls an user hook when it expires */
INLINE void timer_set_event_softint(Timer *timer, Hook func, iptr_t user_data)
/** Set the timer so that it calls an user hook when it expires */
INLINE void timer_set_event_softint(Timer *timer, Hook func, iptr_t user_data)