aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--armclock.h2
-rw-r--r--bcmclock.h2
-rw-r--r--demo_functionality.c2
-rw-r--r--interrupts.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/armclock.h b/armclock.h
index 700879a..bf225b0 100644
--- a/armclock.h
+++ b/armclock.h
@@ -58,7 +58,7 @@ static inline void armclk_disable_timer_irq(void)
*(uint32_t volatile*) BCMCLK_DISABLE_BASIC_IRQS = 1;
}
-static inline void armclk_set_timer_match_timeout(uint32_t timeout)
+static inline void armclk_irq_settimeout(uint32_t timeout)
{
*(uint32_t volatile*) ARMCLK_IRQ_CLR_ACK = 0;
*(uint32_t volatile*) ARMCLK_LOAD = timeout;
diff --git a/bcmclock.h b/bcmclock.h
index e4edb57..75a3b07 100644
--- a/bcmclock.h
+++ b/bcmclock.h
@@ -39,7 +39,7 @@ static inline void bcmclk_disable_timer_irq(void)
*(uint32_t volatile*) BCMCLK_DISABLE_IRQS_1 = 1 << 2;
}
-static inline void bcmclk_set_timer_match_timeout(uint32_t timeout)
+static inline void bcmclk_irq_settimeout(uint32_t timeout)
{
uint32_t clock_now = *(uint32_t volatile*) ST_CLO;
*(uint32_t volatile*) ST_C2 = clock_now + timeout;
diff --git a/demo_functionality.c b/demo_functionality.c
index a2d8550..1ef91a1 100644
--- a/demo_functionality.c
+++ b/demo_functionality.c
@@ -126,7 +126,7 @@ void demo_go_unprivileged(void)
puts("All ready, jumping to PL0 code");
- armclk_set_timer_match_timeout(0x00100000);
+ armclk_irq_settimeout(0x00100000);
asm volatile("cps %[sysmode]\n\r"
"mov sp, %[stackaddr]\n\r"
diff --git a/interrupts.c b/interrupts.c
index 62c644b..f4192a0 100644
--- a/interrupts.c
+++ b/interrupts.c
@@ -62,7 +62,7 @@ void irq_handler(void)
if (armclk_irq_pending())
{
puts("<<irq from timer>>");
- armclk_set_timer_match_timeout(0x00100000);
+ armclk_irq_settimeout(0x00100000);
}
else
{