From 433759f1fe5b360df225ad3d21b7b4321712178d Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 16 Oct 2017 22:48:08 -0700 Subject: [PATCH] GBA Hardware: Remove leftover code --- include/mgba/internal/gba/hardware.h | 1 - src/gba/hardware.c | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/include/mgba/internal/gba/hardware.h b/include/mgba/internal/gba/hardware.h index 0edb89003..c2a3f655f 100644 --- a/include/mgba/internal/gba/hardware.h +++ b/include/mgba/internal/gba/hardware.h @@ -177,7 +177,6 @@ struct GBACartridgeHardware { void GBAHardwareInit(struct GBACartridgeHardware* gpio, uint16_t* gpioBase); void GBAHardwareClear(struct GBACartridgeHardware* gpio); -int32_t GBAHardwareProcessEvents(struct GBA* gba, int32_t cycles); void GBAHardwareInitRTC(struct GBACartridgeHardware* gpio); void GBAHardwareInitGyro(struct GBACartridgeHardware* gpio); diff --git a/src/gba/hardware.c b/src/gba/hardware.c index 9ac10dbe6..bd23dfa63 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -40,7 +40,6 @@ static void _eReaderReset(struct GBACartridgeHardware* hw); static void _eReaderWriteControl0(struct GBACartridgeHardware* hw, uint8_t value); static void _eReaderWriteControl1(struct GBACartridgeHardware* hw, uint8_t value); static void _eReaderReadData(struct GBACartridgeHardware* hw); -static int32_t _eReaderProcessEvents(struct GBACartridgeHardware* hw, int32_t cycles); static const int RTC_BYTES[8] = { 0, // Force reset @@ -82,13 +81,6 @@ void GBAHardwareClear(struct GBACartridgeHardware* hw) { } } -int32_t GBAHardwareProcessEvents(struct GBA* gba, int32_t cycles) { - if (gba->memory.hw.devices & HW_EREADER) { - return _eReaderProcessEvents(&gba->memory.hw, cycles); - } - return INT_MAX; -} - void GBAHardwareGPIOWrite(struct GBACartridgeHardware* hw, uint32_t address, uint16_t value) { if (!hw->gpioBase) { return; @@ -795,17 +787,6 @@ void _eReaderReadData(struct GBACartridgeHardware* hw) { } } -static int32_t _eReaderProcessEvents(struct GBACartridgeHardware* hw, int32_t cycles) { - if (hw->eReaderState != EREADER_SERIAL_INACTIVE) { - hw->eReaderDelay += cycles; - if (hw->eReaderDelay > 1024) { - mLOG(GBA_HW, DEBUG, "[e-Reader] Command timed out"); - hw->eReaderState = EREADER_SERIAL_INACTIVE; - } - } - return INT_MAX; -} - // == Serialization void GBAHardwareSerialize(const struct GBACartridgeHardware* hw, struct GBASerializedState* state) {