-/*!
+/**
* \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 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.
+ *
* -->
*
* \brief Hardware independent timer driver (implementation)
* \author Bernardo Innocenti <bernie@develer.com>
*/
-/*#*
- *#* $Log$
- *#* 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.
- *#*
- *#* Revision 1.25 2005/07/19 07:26:37 bernie
- *#* Refactor to decouple timer ticks from milliseconds.
- *#*
- *#* Revision 1.24 2005/04/11 19:10:28 bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.23 2004/12/13 12:07:06 bernie
- *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
- *#*
- *#* Revision 1.22 2004/12/08 09:12:09 bernie
- *#* Rename time_t to mtime_t.
- *#*
- *#* Revision 1.21 2004/11/28 23:20:25 bernie
- *#* Remove obsolete INITLIST macro.
- *#*
- *#* Revision 1.20 2004/11/16 20:59:06 bernie
- *#* Add watchdog timer support.
- *#*/
-
#include "timer.h"
-#include <cfg/cpu.h>
+
+#include <cpu/attr.h>
+#include <cpu/types.h>
+#include <cpu/irq.h>
+
#include <cfg/os.h>
#include <cfg/debug.h>
#include <cfg/module.h>
#if CONFIG_KERNEL
#include <config_kern.h>
+ #if CONFIG_KERN_PREEMPTIVE
+ #include <hw/switch.h>
+ #endif
#if CONFIG_KERN_SIGNALS
#include <kern/signal.h> /* sig_wait(), sig_check() */
#include <kern/proc.h> /* proc_current() */
#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.
}
-/*!
+/**
* Remove a timer from the timer queue before it has expired.
*/
Timer *timer_abort(Timer *timer)
*/
void timer_delayTicks(ticks_t delay)
{
-#if defined(IRQ_GETSTATE)
+#if defined(IRQ_ENABLED)
/* We shouldn't sleep with interrupts disabled */
- ASSERT(IRQ_GETSTATE());
+ ASSERT(IRQ_ENABLED());
#endif
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
#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 */
MOD_DEFINE(timer)
-/*!
+/**
* Initialize timer
*/
void timer_init(void)