-/*!
+/**
* \file
* <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
* Copyright 2000 Bernardo Innocenti <bernie@develer.com>
* This file is part of DevLib - See README.devlib for information.
* -->
/*#*
*#* $Log$
+ *#* Revision 1.32 2007/10/08 12:14:32 batt
+ *#* Fix some review issues.
+ *#*
+ *#* Revision 1.31 2006/07/19 12:56:26 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.30 2006/02/24 00:26:49 bernie
+ *#* Fixes for CONFIG_KERNEL.
+ *#*
+ *#* Revision 1.29 2006/02/17 22:24:07 bernie
+ *#* Add MOD_CHECK() checks.
+ *#*
+ *#* Revision 1.28 2006/02/10 12:32:52 bernie
+ *#* Update Copyright year.
+ *#*
+ *#* Revision 1.27 2005/11/27 03:04:08 bernie
+ *#* Move test code to timer_test.c; Add OS_HOSTED support.
+ *#*
*#* Revision 1.26 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
#include "timer.h"
#include <cfg/cpu.h>
-#include <hw.h>
+#include <cfg/os.h>
#include <cfg/debug.h>
+#include <cfg/module.h>
#include <appconfig.h>
-#include CPU_CSOURCE(timer)
+/*
+ * Include platform-specific binding code if we're hosted.
+ * Try the CPU specific one for bare-metal environments.
+ */
+#if OS_HOSTED
+ #include OS_CSOURCE(timer)
+#else
+ #include CPU_CSOURCE(timer)
+#endif
/*
* Sanity check for config parameters required by this module.
#include <drv/wdt.h>
#endif
-#if CONFIG_KERNEL && CONFIG_KERN_SIGNALS
- #include <kern/proc.h>
+#if CONFIG_KERNEL
+ #include <config_kern.h>
+ #if CONFIG_KERN_SIGNALS
+ #include <kern/signal.h> /* sig_wait(), sig_check() */
+ #include <kern/proc.h> /* proc_current() */
+ #include <cfg/macros.h> /* BV() */
+ #endif
#endif
-/*!
+/**
* \def CONFIG_TIMER_STROBE
*
* This is a debug facility that can be used to
#endif
-//! Master system clock (1 tick accuracy)
+/// Master system clock (1 tick accuracy)
volatile ticks_t _clock;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
-/*!
+/**
* List of active asynchronous timers.
*/
REGISTER static List timers_queue;
-/*!
+/**
* Add the specified timer to the software timer service queue.
* When the delay indicated by the timer expires, the timer
* device will execute the event associated with it.
}
/* Enqueue timer request into the list */
- INSERTBEFORE(&timer->link, &node->link);
+ INSERT_BEFORE(&timer->link, &node->link);
IRQ_RESTORE(flags);
}
-/*!
+/**
* Remove a timer from the timer queue before it has expired.
*/
Timer *timer_abort(Timer *timer)
#endif /* CONFIG_TIMER_DISABLE_EVENTS */
-/*!
- * Wait for the specified amount of time (expressed in ms).
+/**
+ * Wait for the specified amount of timer ticks.
*/
void timer_delayTicks(ticks_t delay)
{
ASSERT(!sig_check(SIG_SINGLE));
timer_set_event_signal(&t, proc_current(), SIG_SINGLE);
- timer_set_delay(&t, delay);
+ timer_setDelay(&t, delay);
timer_add(&t);
sig_wait(SIG_SINGLE);
#ifndef CONFIG_TIMER_DISABLE_UDELAY
-/*!
+/**
* Busy wait until the specified amount of high-precision ticks have elapsed.
*
* \note This function is interrupt safe, the only
}
}
-/*!
+/**
* Wait for the specified amount of time (expressed in microseconds).
*
* \bug In AVR arch the maximum amount of time that can be used as
#endif /* CONFIG_TIMER_DISABLE_UDELAY */
-/*!
+/**
* Timer interrupt handler. Find soft timers expired and
* trigger corresponding events.
*/
#ifndef CONFIG_TIMER_DISABLE_EVENTS
Timer *timer;
#endif
+ /*
+ * On systems sharing IRQ line and vector, this check is needed
+ * to ensure that IRQ is generated by timer source.
+ */
+ if (!timer_hw_triggered())
+ return;
TIMER_STROBE_ON;
+ /* Perform hw IRQ handling */
timer_hw_irq();
/* Update the master ms counter */
TIMER_STROBE_OFF;
}
+MOD_DEFINE(timer)
-/*!
+/**
* Initialize timer
*/
void timer_init(void)
_clock = 0;
timer_hw_init();
-}
-
-#if CONFIG_TEST
-
-static void timer_test_constants(void)
-{
- kprintf("TIMER_PRESCALER=%d\n", TIMER_PRESCALER);
- kprintf("TIMER_HW_HPTICKS_PER_SEC=%lu\n", TIMER_HW_HPTICKS_PER_SEC);
- #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("\n");
- kprintf("ms_to_ticks(100)=%lu\n", ms_to_ticks(100));
- kprintf("ms_to_ticks(10000)=%lu\n", ms_to_ticks(10000));
- kprintf("us_to_ticks(100)=%lu\n", us_to_ticks(100));
- kprintf("us_to_ticks(10000)=%lu\n", us_to_ticks(10000));
- kprintf("\n");
- kprintf("ticks_to_ms(100)=%lu\n", ticks_to_ms(100));
- kprintf("ticks_to_ms(10000)=%lu\n", ticks_to_ms(10000));
- kprintf("ticks_to_us(100)=%lu\n", ticks_to_us(100));
- kprintf("ticks_to_us(10000)=%lu\n", ticks_to_us(10000));
- kprintf("\n");
- kprintf("hptime_to_us(100)=%lu\n", hptime_to_us(100));
- kprintf("hptime_to_us(10000)=%lu\n", hptime_to_us(10000));
- kprintf("us_to_hptime(100)=%lu\n", us_to_hptime(100));
- kprintf("us_to_hptime(10000)=%lu\n", us_to_hptime(10000));
+ MOD_INIT(timer);
}
-
-static void timer_test_delay(void)
-{
- int i;
-
- kputs("Delay test\n");
- for (i = 0; i < 1000; i += 100)
- {
- kprintf("delay %d...", i);
- timer_delay(i);
- kputs("done\n");
- }
-}
-
-static void timer_test_hook(iptr_t _timer)
-{
- Timer *timer = (Timer *)(void *)_timer;
-
- kprintf("Timer %ld expired\n", ticks_to_ms(timer->_delay));
- timer_add(timer);
-}
-
-static void timer_test_async(void)
-{
- static Timer test_timers[5];
- static const mtime_t test_delays[5] = { 170, 50, 310, 1500, 310 };
- size_t i;
-
- for (i = 0; i < countof(test_timers); ++i)
- {
- Timer *timer = &test_timers[i];
- timer_setDelay(timer, ms_to_ticks(test_delays[i]));
- timer_set_event_softint(timer, timer_test_hook, (iptr_t)timer);
- timer_add(timer);
- }
-}
-
-static void timer_test_poll(void)
-{
- int secs = 0;
- mtime_t start_time = ticks_to_ms(timer_clock());
- mtime_t now;
-
- while (secs <= 10)
- {
- now = ticks_to_ms(timer_clock());
- if (now - start_time >= 1000)
- {
- ++secs;
- start_time += 1000;
- kprintf("seconds = %d, ticks=%ld\n", secs, now);
- }
- }
-}
-
-void timer_test(void)
-{
- timer_test_constants();
- timer_test_delay();
- timer_test_async();
- timer_test_poll();
-}
-
-#endif /* CONFIG_TEST */
projects / bertos.git / blobdiff