v01d commented on a change in pull request #1726:
URL: https://github.com/apache/incubator-nuttx/pull/1726#discussion_r485773401
##########
File path: arch/arm/src/nrf52/nrf52_systick.c
##########
@@ -123,26 +76,14 @@ static int nrf52_timerisr(int irq, uint32_t *regs, void
*arg)
void up_timer_initialize(void)
{
- uint32_t regval;
-
- regval = getreg32(NVIC_SYSTICK_CTRL);
- regval &= ~NVIC_SYSTICK_CTRL_CLKSOURCE;
- putreg32(regval, NVIC_SYSTICK_CTRL);
+#if defined(CONFIG_NRF52_SYSTIMER_SYSTICK)
+ /* Use SysTick to drive system timer */
- /* Configure SysTick to interrupt at the requested rate */
+ up_timer_set_lowerhalf(systick_initialize(true, BOARD_SYSTICK_CLOCK, -1));
+#elif defined(CONFIG_NRF52_SYSTIMER_RTC)
+ /* Use RTC to drive system timer */
- putreg32(SYSTICK_RELOAD, NVIC_SYSTICK_RELOAD);
-
- /* Attach the timer interrupt vector */
-
- irq_attach(NRF52_IRQ_SYSTICK, (xcpt_t)nrf52_timerisr, NULL);
-
- /* Enable SysTick interrupts */
-
- putreg32((NVIC_SYSTICK_CTRL_CLKSOURCE | NVIC_SYSTICK_CTRL_TICKINT |
- NVIC_SYSTICK_CTRL_ENABLE), NVIC_SYSTICK_CTRL);
-
- /* And enable the timer interrupt */
-
- up_enable_irq(NRF52_IRQ_SYSTICK);
+ nrf52_rtc_initialize("/dev/systimer", CONFIG_NRF52_SYSTIMER_RTC_INSTANCE,
Review comment:
Yes, this file is only for systick now, this was leftover code which I
didn't realize was still there. Will remove the call.
##########
File path: arch/arm/src/nrf52/nrf52_systick.c
##########
@@ -46,68 +46,21 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "nvic.h"
-#include "clock/clock.h"
-#include "arm_internal.h"
-#include "arm_arch.h"
+#if defined(CONFIG_NRF52_SYSTIMER_SYSTICK)
+#include <nuttx/timers/arch_timer.h>
+#include "systick.h"
+#elif defined(CONFIG_NRF52_SYSTIMER_RTC)
+#include "nrf52_rtc_lowerhalf.h"
Review comment:
Also removed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
