From d588aa47e6567f74674d0fd4be7e31646661dee0 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Wed, 14 Oct 2020 23:15:35 -0700 Subject: [PATCH] GBA Hardware: Don't gate GBP features on not having an SIO driver installed --- src/gba/hardware.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gba/hardware.c b/src/gba/hardware.c index c16e44ab6..92c3076f0 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -546,13 +546,14 @@ void GBAHardwarePlayerUpdate(struct GBA* gba) { gba->memory.hw.gbpTxPosition = 0; return; } - if (gba->keyCallback || gba->sio.drivers.normal) { + if (gba->keyCallback) { return; } if (GBAHardwarePlayerCheckScreen(&gba->video)) { gba->memory.hw.devices |= HW_GB_PLAYER; gba->memory.hw.gbpInputsPosted = 0; gba->keyCallback = &gba->memory.hw.gbpCallback.d; + // TODO: Check if the SIO driver is actually used first GBASIOSetDriver(&gba->sio, &gba->memory.hw.gbpDriver.d, SIO_NORMAL_32); } }