From 109799011345bf5907dd7c03ff1dbe036f68205d Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 3 Jun 2023 16:50:31 -0500
Subject: [PATCH] [turbine/gba] Change isr to turbine_isr

---
 src/turbine/gba/irq.s       | 6 +++---
 src/turbine/gba/turbine.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/turbine/gba/irq.s b/src/turbine/gba/irq.s
index 6937bc93..4202a478 100644
--- a/src/turbine/gba/irq.s
+++ b/src/turbine/gba/irq.s
@@ -37,9 +37,9 @@
 .equ Int_cart,                32768 // cartridge removed
 
 
-.global isr
-.type isr, %function
-isr:
+.global turbine_isr
+.type turbine_isr, %function
+turbine_isr:
 	// read IE
 	ldr r0, =#REG_IE
 	ldrh r1, [r0] // r1 becomes IE value
diff --git a/src/turbine/gba/turbine.cpp b/src/turbine/gba/turbine.cpp
index 981d0341..cb3db5df 100644
--- a/src/turbine/gba/turbine.cpp
+++ b/src/turbine/gba/turbine.cpp
@@ -11,7 +11,7 @@
 #include "context.hpp"
 #include "turbine.hpp"
 
-extern "C" void isr();
+extern "C" void turbine_isr();
 
 namespace turbine {
 
@@ -23,7 +23,7 @@ constexpr int TicksMs59ns = 65535 - (NanoSecond / MilliSecond) / 59.59;
 extern volatile gba_timer_t g_timerMs;
 
 static void initIrq() noexcept {
-	REG_ISR = isr;
+	REG_ISR = turbine_isr;
 	REG_IME = 1; // enable interrupts
 }