From 602739b35d874de509fbe4bb0b5b9b0b754237d9 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Mon, 27 Dec 2021 22:20:20 -0800
Subject: Inlined functions

---
 src/cpu/irq.S | 6 ++++--
 src/cpu/irq.c | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/cpu')

diff --git a/src/cpu/irq.S b/src/cpu/irq.S
index c434deb..fbb6ab7 100644
--- a/src/cpu/irq.S
+++ b/src/cpu/irq.S
@@ -32,13 +32,15 @@ a_irq_handler:
 	cmp r0, #0
 	beq a_irq_handler.etimer
 	// Disable
-	bl disable_cntv
+	mov r0, #0
+	mcr p15, 0, r0, c14, c3, 1
 	b a_irq_handler.ttimer
 a_irq_handler.etimer:
 	// Enable
 	ldr r0, =cntfrq
 	bl write_cntv_tval
-	bl enable_cntv
+	mov r0, #1
+	mcr p15, 0, r0, c14, c3, 1
 	// Otherwise continue
 a_irq_handler.ttimer:
 	pop {r0}
diff --git a/src/cpu/irq.c b/src/cpu/irq.c
index 1654828..874e764 100644
--- a/src/cpu/irq.c
+++ b/src/cpu/irq.c
@@ -29,10 +29,10 @@ void c_irq_handler(void)
 					if(timer_status == 0) {
 						cntfrq = read_cntfrq();
 						write_cntv_tval(cntfrq);
-						enable_cntv();
+						enablecntv();
 						write_cstring(&g_Drawer, "Enabled ", 0x00FF00);
 					} else {
-						disable_cntv();
+						disablecntv();
 						write_cstring(&g_Drawer, "Disabled", 0xFF0000);
 					}
 					g_Drawer.x = x;
-- 
cgit v1.2.1