diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-06 02:41:50 +0100 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-06 02:41:50 +0100 |
| commit | f35c8058efe554ea6adb243baf0737220b65759e (patch) | |
| tree | 5e3a8f759a50b2ce6b1bbc8fd41a72a552397450 /os/hal/ports | |
| parent | 90800edb90ad0fcf8e7f53e5d32a4df9a0c62c6c (diff) | |
| download | ChibiOS-Contrib-f35c8058efe554ea6adb243baf0737220b65759e.tar.gz ChibiOS-Contrib-f35c8058efe554ea6adb243baf0737220b65759e.tar.bz2 ChibiOS-Contrib-f35c8058efe554ea6adb243baf0737220b65759e.zip | |
deal with 16bits systime_t
Diffstat (limited to 'os/hal/ports')
| -rw-r--r-- | os/hal/ports/NRF51/NRF51822/st_lld.c | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/os/hal/ports/NRF51/NRF51822/st_lld.c b/os/hal/ports/NRF51/NRF51822/st_lld.c index e3ae3f2..e144a11 100644 --- a/os/hal/ports/NRF51/NRF51822/st_lld.c +++ b/os/hal/ports/NRF51/NRF51822/st_lld.c @@ -31,14 +31,6 @@ /* Driver local definitions. */
/*===========================================================================*/
-#if (OSAL_ST_RESOLUTION == 32)
-#define ST_OVERFLOW_VALUE 0xFFFFFFFF
-#elif (OSAL_ST_RESOLUTION == 24)
-#define ST_OVERFLOW_VALUE 0x00FFFFFF
-#elif (OSAL_ST_RESOLUTION == 16)
-#define ST_OVERFLOW_VALUE 0x0000FFFF
-#endif
-
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
@@ -120,12 +112,21 @@ OSAL_IRQ_HANDLER(Vector6C) { OSAL_IRQ_PROLOGUE();
- NRF_RTC0->EVENTS_COMPARE[0] = 0;
+ if (NRF_RTC0->EVENTS_COMPARE[0]) {
+ NRF_RTC0->EVENTS_COMPARE[0] = 0;
- osalSysLockFromISR();
- osalOsTimerHandlerI();
- osalSysUnlockFromISR();
-
+ osalSysLockFromISR();
+ osalOsTimerHandlerI();
+ osalSysUnlockFromISR();
+ }
+
+#if OSAL_ST_RESOLUTION == 16
+ if (NRF_RTC0->EVENTS_COMPARE[1]) {
+ NRF_RTC0->EVENTS_COMPARE[1] = 0;
+ NRF_RTC0->TASKS_CLEAR = 1;
+ }
+#endif
+
OSAL_IRQ_EPILOGUE();
}
#endif
@@ -146,11 +147,18 @@ void st_lld_init(void) { /* Using RTC with prescaler */
NRF_RTC0->TASKS_STOP = 1;
NRF_RTC0->PRESCALER = (NRF51_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1;
- NRF_RTC0->EVTENCLR = RTC_EVTEN_COMPARE0_Msk;
+ NRF_RTC0->EVTENCLR = RTC_EVTENSET_COMPARE0_Msk;
NRF_RTC0->EVENTS_COMPARE[0] = 0;
NRF_RTC0->INTENSET = RTC_INTENSET_COMPARE0_Msk;
-
- /* Start timer */
+#if OSAL_ST_RESOLUTION == 16
+ NRF_RTC0->CC[1] = 0x10000; /* 2^16 */
+ NRF_RTC0->EVENTS_COMPARE[1] = 0;
+ NRF_RTC0->EVTENSET = RTC_EVTENSET_COMPARE0_Msk;
+ NRF_RTC0->INTENSET = RTC_INTENSET_COMPARE1_Msk;
+#endif
+ NRF_RTC0->TASKS_CLEAR = 1;
+
+ /* Start timer */
nvicEnableVector(RTC0_IRQn, 8);
NRF_RTC0->TASKS_START = 1;
#endif
|