From 6d6546dac1f6d8848df3037b7c32176c34745b1c Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 28 Jan 2014 10:03:16 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6650 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/nil/ports/AVR/nilcore.h | 15 +++-- os/nil/ports/AVR/nilcore_timer.h | 129 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 5 deletions(-) create mode 100644 os/nil/ports/AVR/nilcore_timer.h (limited to 'os') diff --git a/os/nil/ports/AVR/nilcore.h b/os/nil/ports/AVR/nilcore.h index 32d2ea835..6394eeb0b 100644 --- a/os/nil/ports/AVR/nilcore.h +++ b/os/nil/ports/AVR/nilcore.h @@ -238,10 +238,7 @@ struct port_intctx { * @details This macro must be inserted at the end of all IRQ handlers * enabled to invoke system APIs. */ -#define PORT_IRQ_EPILOGUE() { \ - if (chSchIsRescRequiredI()) \ - chSchRescheduleS(); \ -} +#define PORT_IRQ_EPILOGUE() chSchRescheduleS() /** * @brief IRQ handler function declaration. @@ -255,7 +252,7 @@ struct port_intctx { * @note @p id can be a function name or a vector number depending on the * port implementation. */ -#define PORT_FAST_IRQ_HANDLER(id) void id(void) +#define PORT_FAST_IRQ_HANDLER(id) ISR(id) /** * @brief Performs a context switch between two threads. @@ -345,6 +342,7 @@ static inline bool port_is_isr_context(void) { */ static inline void port_lock(void) { + asm volatile ("cli" : : : "memory"); } /** @@ -352,10 +350,12 @@ static inline void port_lock(void) { */ static inline void port_unlock(void) { + asm volatile ("sei" : : : "memory"); } /** * @brief Kernel-lock action from an interrupt handler. + * @note This function is empty in this port. */ static inline void port_lock_from_isr(void) { @@ -363,6 +363,7 @@ static inline void port_lock_from_isr(void) { /** * @brief Kernel-unlock action from an interrupt handler. + * @note This function is empty in this port. */ static inline void port_unlock_from_isr(void) { @@ -373,6 +374,7 @@ static inline void port_unlock_from_isr(void) { */ static inline void port_disable(void) { + asm volatile ("cli" : : : "memory"); } /** @@ -380,6 +382,7 @@ static inline void port_disable(void) { */ static inline void port_suspend(void) { + asm volatile ("cli" : : : "memory"); } /** @@ -387,6 +390,7 @@ static inline void port_suspend(void) { */ static inline void port_enable(void) { + asm volatile ("sei" : : : "memory"); } /** @@ -398,6 +402,7 @@ static inline void port_enable(void) { */ static inline void port_wait_for_interrupt(void) { + asm volatile ("sleep" : : : "memory"); } /** diff --git a/os/nil/ports/AVR/nilcore_timer.h b/os/nil/ports/AVR/nilcore_timer.h new file mode 100644 index 000000000..0eadcf12a --- /dev/null +++ b/os/nil/ports/AVR/nilcore_timer.h @@ -0,0 +1,129 @@ +/* + ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, + 2011,2012,2013 Giovanni Di Sirio. + + This file is part of ChibiOS/RT. + + ChibiOS/RT 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 3 of the License, or + (at your option) any later version. + + ChibiOS/RT 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, see . +*/ + +/** + * @file AVR/nilcore_timer.h + * @brief System timer header file. + * + * @addtogroup AVR_TIMER + * @{ + */ + +#ifndef _NILCORE_TIMER_H_ +#define _NILCORE_TIMER_H_ + +/* This is the only header in the HAL designed to be include-able alone.*/ +/*#include "st.h"*/ + +/*===========================================================================*/ +/* Module constants. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Module pre-compile time settings. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Derived constants and error checks. */ +/*===========================================================================*/ + +#error "tickless mode not yet implemented in AVR port" + +/*===========================================================================*/ +/* Module data structures and types. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Module macros. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* External declarations. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Module inline functions. */ +/*===========================================================================*/ + +#if 0 +/** + * @brief Starts the alarm. + * @note Makes sure that no spurious alarms are triggered after + * this call. + * + * @param[in] time the time to be set for the first alarm + * + * @notapi + */ +static inline void port_timer_start_alarm(systime_t time) { + + stStartAlarm(time); +} + +/** + * @brief Stops the alarm interrupt. + * + * @notapi + */ +static inline void port_timer_stop_alarm(void) { + + stStopAlarm(); +} + +/** + * @brief Sets the alarm time. + * + * @param[in] time the time to be set for the next alarm + * + * @notapi + */ +static inline void port_timer_set_alarm(systime_t time) { + + stSetAlarm(time); +} + +/** + * @brief Returns the system time. + * + * @return The system time. + * + * @notapi + */ +static inline systime_t port_timer_get_time(void) { + + return stGetCounter(); +} + +/** + * @brief Returns the current alarm time. + * + * @return The currently set alarm time. + * + * @notapi + */ +static inline systime_t port_timer_get_alarm(void) { + + return stGetAlarm(); +} +#endif + +#endif /* _NILCORE_TIMER_H_ */ + +/** @} */ -- cgit v1.2.3