riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* missing part of last commit

Browse Source
This commit is contained in:
Oliver Hahm 2010-11-01 17:38:23 +01:00
parent 51e7277473
commit 88d3421ee7
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/lpc2387/include/lpc2387-rtc.h
View File

@ -51,7 +51,6 @@ and the mailinglist (subscription via web site)
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include "lpc2387.h" #include "lpc2387.h"
#include "clock.h"
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/** /**

3
cpu/lpc2387/lpc2387-rtc.c
View File

@ -45,7 +45,6 @@ and the mailinglist (subscription via web site)
#include "lpc2387.h" #include "lpc2387.h"
#include "lpc2387-rtc.h" #include "lpc2387-rtc.h"
#include "lpm.h" #include "lpm.h"
#include "clock.h"
#define PREINT_RTC 0x000001C8 /* Prescaler value, integer portion, PCLK = 15Mhz */ #define PREINT_RTC 0x000001C8 /* Prescaler value, integer portion, PCLK = 15Mhz */
#define PREFRAC_RTC 0x000061C0 /* Prescaler value, fraction portion, PCLK = 15Mhz */ #define PREFRAC_RTC 0x000061C0 /* Prescaler value, fraction portion, PCLK = 15Mhz */
@ -58,7 +57,6 @@ and the mailinglist (subscription via web site)
#define PRINTF(fmt, args...) #define PRINTF(fmt, args...)
#endif #endif
extern void _clock_alarm(void);
/** /**
* @brief epoch time in hour granularity * @brief epoch time in hour granularity
@ -155,7 +153,6 @@ void RTC_IRQHandler (void)
RTC_AMR = 0xff; // disable alarm irq RTC_AMR = 0xff; // disable alarm irq
PRINTF("alarm"); PRINTF("alarm");
lpm_end_awake(); lpm_end_awake();
_clock_alarm();
} }
VICVectAddr = 0; // Acknowledge Interrupt VICVectAddr = 0; // Acknowledge Interrupt

9
sys/include/swtimer.h
View File

@ -64,14 +64,23 @@ typedef struct swtimer_t {
} action; } action;
} swtimer_t; } swtimer_t;
/**
* @brief Current system time
* @return Time in ticks since system boot
*/
swtime_t swtimer_now(); swtime_t swtimer_now();
/**
* @brief Initializes swtimer
* @return always 0
*/
int swtimer_init(); int swtimer_init();
/** /**
* @brief set swtimer interval and activate * @brief set swtimer interval and activate
* @param[in] t pointer to preinitialised swtimer_t * @param[in] t pointer to preinitialised swtimer_t
* @param[in] interval swtimer interval * @param[in] interval swtimer interval
* @return always 0
*/ */
int swtimer_set(swtimer_t *t, swtime_t interval); int swtimer_set(swtimer_t *t, swtime_t interval);