andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6193 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-08-21 13:42:01 +00:00
parent 78b866e0a7
commit 35bdb9a42c
4 changed files with 11 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
os/rt/ports/ARMCMx/devices/STM32F0xx/systick.h → os/rt/ports/ARMCMx/chcore_timer.h
View File

@ -19,18 +19,21 @@
*/
/**
* @file ARMCMx/systick.h
* @file ARMCMx/chcore_timer.h
* @brief System timer header file.
*
* @addtogroup ARMCMx_SYSTICK
* @addtogroup ARMCMx_TIMER
* @{
*/
#ifndef _SYSTICK_H_
#define _SYSTICK_H_
#ifndef _CHCORE_TIMER_H_
#define _CHCORE_TIMER_H_
#if defined(CH_PORT_DO_NOT_USE_ST)
#include "systick_ext.h"
/* If, for some reason, the use of the HAL-provided ST timer port interface
is not wanted, it is possible to provide the timer interface into a custom
module.*/
#include "chcore_timer_ext.h"
#else /* !defined(CH_PORT_DO_NOT_USE_ST) */
@ -126,6 +129,6 @@ static inline systime_t port_timer_get_alarm(void) {
#endif /* !defined(CH_PORT_DO_NOT_USE_ST) */
#endif /* _SYSTICK_H_ */
#endif /* _CHCORE_TIMER_H_ */
/** @} */

2
os/rt/ports/ARMCMx/chcore_v6m.h
View File

@ -282,7 +282,7 @@ struct context {
#endif
#if CH_CFG_TIMEDELTA > 0
#include "systick.h"
#include "chcore_timer.h"
#endif
/*===========================================================================*/

2
os/rt/ports/ARMCMx/chcore_v7m.h
View File

@ -395,7 +395,7 @@ extern "C" {
#endif
#if CH_CFG_TIMEDELTA > 0
#include "systick.h"
#include "chcore_timer.h"
#endif
/*===========================================================================*/

132
os/rt/ports/ARMCMx/devices/STM32F30x/systick.h
View File

@ -1,132 +0,0 @@
/*
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 <http://www.gnu.org/licenses/>.
*/
/**
* @file STM32F0xx/systick.h
* @brief System timer header file.
*
* @addtogroup STM32F0XX_TIMER
* @{
*/
#ifndef _SYSTICK_H_
#define _SYSTICK_H_
/*===========================================================================*/
/* Module constants. */
/*===========================================================================*/
/*===========================================================================*/
/* Module pre-compile time settings. */
/*===========================================================================*/
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
/*===========================================================================*/
/* Module data structures and types. */
/*===========================================================================*/
/*===========================================================================*/
/* Module macros. */
/*===========================================================================*/
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
/*===========================================================================*/
/* Module inline functions. */
/*===========================================================================*/
/**
* @brief Returns the system time.
*
* @return The system time.
*
* @notapi
*/
static inline systime_t port_timer_get_time(void) {
return TIM2->CNT;
}
/**
* @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) {
chDbgAssert((TIM2->DIER & 2) == 0, "already started");
TIM2->CCR1 = time;
TIM2->SR = 0;
TIM2->DIER = 2; /* CC1IE */
}
/**
* @brief Stops the alarm interrupt.
*
* @notapi
*/
static inline void port_timer_stop_alarm(void) {
chDbgAssert((TIM2->DIER & 2) != 0, "not started");
TIM2->DIER = 0;
}
/**
* @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) {
chDbgAssert((TIM2->DIER & 2) != 0, "not started");
TIM2->CCR1 = time;
}
/**
* @brief Returns the current alarm time.
*
* @return The currently set alarm time.
*
* @notapi
*/
static inline systime_t port_timer_get_alarm(void) {
chDbgAssert((TIM2->DIER & 2) != 0, "not started");
return TIM2->CCR1;
}
#endif /* _SYSTICK_H_ */
/** @} */