drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[turbine/gba] Change isr to turbine_isr

Browse Source
This commit is contained in:
Gary Talent 2023-06-03 16:50:31 -05:00
parent c6706f743d
commit 1097990113
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/turbine/gba/irq.s
View File

@ -37,9 +37,9 @@
.equ Int_cart, 32768 // cartridge removed .equ Int_cart, 32768 // cartridge removed
.global isr .global turbine_isr
.type isr, %function .type turbine_isr, %function
isr: turbine_isr:
// read IE // read IE
ldr r0, =#REG_IE ldr r0, =#REG_IE
ldrh r1, [r0] // r1 becomes IE value ldrh r1, [r0] // r1 becomes IE value

4
src/turbine/gba/turbine.cpp
View File

@ -11,7 +11,7 @@
#include "context.hpp" #include "context.hpp"
#include "turbine.hpp" #include "turbine.hpp"
extern "C" void isr(); extern "C" void turbine_isr();
namespace turbine { namespace turbine {
@ -23,7 +23,7 @@ constexpr int TicksMs59ns = 65535 - (NanoSecond / MilliSecond) / 59.59;
extern volatile gba_timer_t g_timerMs; extern volatile gba_timer_t g_timerMs;
static void initIrq() noexcept { static void initIrq() noexcept {
REG_ISR = isr; REG_ISR = turbine_isr;
REG_IME = 1; // enable interrupts REG_IME = 1; // enable interrupts
} }