From 34081a041423bec92ac7f8481ec66bfcebbbe2b9 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 3 Dec 2023 20:38:23 -0600 Subject: [PATCH] [turbine/gba] Make wake up time static --- src/turbine/gba/irq.arm.cpp | 4 ++-- src/turbine/gba/turbine.arm.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/turbine/gba/irq.arm.cpp b/src/turbine/gba/irq.arm.cpp index 0f2aa56f..6b5707c2 100644 --- a/src/turbine/gba/irq.arm.cpp +++ b/src/turbine/gba/irq.arm.cpp @@ -21,7 +21,7 @@ using namespace turbine; extern "C" { -void turbine_isr_vblank() { +void turbine_isr_vblank() noexcept { teagba::applySpriteUpdates(); if constexpr(config::GbaEventLoopTimerBased) { // disable vblank interrupt until it is needed again @@ -29,7 +29,7 @@ void turbine_isr_vblank() { } } -void turbine_isr_timer0() { +void turbine_isr_timer0() noexcept { g_timerMs = g_timerMs + 1; } diff --git a/src/turbine/gba/turbine.arm.cpp b/src/turbine/gba/turbine.arm.cpp index e3cf2520..73530256 100644 --- a/src/turbine/gba/turbine.arm.cpp +++ b/src/turbine/gba/turbine.arm.cpp @@ -12,7 +12,7 @@ namespace turbine { extern volatile gba_timer_t g_timerMs; -gba_timer_t g_wakeupTime; +static gba_timer_t g_wakeupTime{}; ox::Error run(Context &ctx) noexcept { g_wakeupTime = 0;