sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kinetis: First cut implementation of the alarm read function. Pretty simple because the Kinetis RTC is just a 1Hz counter.

Browse Source
This commit is contained in:
Gregory Nutt 2017-09-03 12:44:45 -06:00
parent 5f67fc8f1b
commit 860ff78d55
3 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/kinetis/kinetis_alarm.h
View File

@ -84,14 +84,6 @@ struct alm_setalarm_s
FAR void *as_arg; /* Argument for callback */
};
/* Structure used to pass parameters to query an alarm */
struct alm_rdalarm_s
{
int ar_id; /* enum alm_id_e */
FAR struct rtc_time *ar_time;/* Argument for storing ALARM RTC time */
};
/****************************************************************************
* Public Functions
****************************************************************************/
@ -129,14 +121,14 @@ int kinetis_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback);
* Query an alarm configured in hardware.
*
* Input Parameters:
* alminfo - Information about the alarm configuration.
* tp - Location to return the timer match register.
*
* Returned Value:
* Zero (OK) on success; a negated errno on failure
*
************************************************************************************/
int kinetis_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo);
int kinetis_rtc_rdalarm(FAR struct timespec *tp);
/****************************************************************************
* Name: kinetis_rtc_cancelalarm

39
arch/arm/src/kinetis/kinetis_rtc.c
View File

@ -177,6 +177,7 @@ static int kinetis_rtc_interrupt(int irq, void *context, FAR void *arg)
uint16_t rtc_sr;
/* if alarm */
rtc_sr = getreg32( KINETIS_RTC_SR);
if (rtc_sr & RTC_SR_TAF )
{
@ -264,7 +265,7 @@ int up_rtc_irq_attach(void)
/* Clear TAF if pending */
rtc_sr = getreg32( KINETIS_RTC_SR);
if (rtc_sr & RTC_SR_TAF )
if ((rtc_sr & RTC_SR_TAF) != 0)
{
putreg32(0, KINETIS_RTC_TAR);
}
@ -438,7 +439,9 @@ time_t up_rtc_time(void)
int up_rtc_gettime(FAR struct timespec *tp)
{
irqstate_t flags;
uint32_t seconds, prescaler, prescaler2;
uint32_t seconds;
uint32_t prescaler;
uint32_t prescaler2;
/* Get prescaler and seconds register. this is in a loop which ensures that
* registers will be re-read if during the reads the prescaler has
@ -482,7 +485,8 @@ int up_rtc_gettime(FAR struct timespec *tp)
int up_rtc_settime(FAR const struct timespec *tp)
{
irqstate_t flags;
uint32_t seconds, prescaler;
uint32_t seconds;
uint32_t prescaler;
seconds = tp->tv_sec;
prescaler = tp->tv_nsec * (CONFIG_RTC_FREQUENCY / 1000000000);
@ -573,8 +577,7 @@ int kinetis_rtc_cancelalarm(void)
/* Unset the alarm */
putreg32(0, KINETIS_RTC_IER); /* disable alarm interrupt */
putreg32(0, KINETIS_RTC_IER); /* Disable alarm interrupt */
return OK;
}
else
@ -591,7 +594,7 @@ int kinetis_rtc_cancelalarm(void)
* Query an alarm configured in hardware.
*
* Input Parameters:
* alminfo - Information about the alarm configuration.
* tp - Location to return the timer match register.
*
* Returned Value:
* Zero (OK) on success; a negated errno on failure
@ -599,27 +602,13 @@ int kinetis_rtc_cancelalarm(void)
************************************************************************************/
#ifdef CONFIG_RTC_ALARM
int kinetis_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo)
int kinetis_rtc_rdalarm(FAR struct timespec *tp)
{
int ret = -EINVAL;
DEBUGASSERT(tp != NULL);
ASSERT(alminfo != NULL);
switch (alminfo->ar_id)
{
case RTC_ALARMA:
{
#warning Missing logic
ret = -ENOSYS;
}
break;
default:
rtcerr("ERROR: Invalid ALARM%d\n", alminfo->ar_id);
break;
}
return ret;
tp->tv_sec = getreg32(KINETIS_RTC_TAR);
tp->tv_nsec = 0;
return OK;
}
#endif

16
arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c
View File

@ -44,6 +44,7 @@
#include <sys/types.h>
#include <stdbool.h>
#include <time.h>
#include <string.h>
#include <errno.h>
@ -515,7 +516,7 @@ static int kinetis_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid)
static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower,
FAR struct lower_rdalarm_s *alarminfo)
{
struct alm_rdalarm_s lowerinfo;
struct timespec ts;
int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL);
@ -528,12 +529,15 @@ static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower,
*/
sched_lock();
ret = kinetis_rtc_rdalarm(&ts);
lowerinfo.ar_id = alarminfo->id;
lowerinfo.ar_time = alarminfo->time;
ret = kinetis_rtc_rdalarm(&lowerinfo);
#ifdef CONFIG_LIBC_LOCALTIME
(void)localtime_r((FAR const time_t *)&ts.tv_sec,
(FAR struct tm *)alarminfo->time);
#else
(void)gmtime_r((FAR const time_t *)&ts.tv_sec,
(FAR struct tm *)alarminfo->time);
#endif
sched_unlock();
}