From 1e912abf4b77f9cce67ac844e3bcc6eab4a68b2b Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 25 Feb 2015 20:35:13 -0800 Subject: [PATCH 001/101] GBA SIO: Start building up skeleton for lockstep driver --- CMakeLists.txt | 4 +- src/gba/sio.h | 8 +-- src/gba/sio/lockstep.c | 73 +++++++++++++++++++++++ src/gba/sio/lockstep.h | 32 ++++++++++ src/platform/qt/CMakeLists.txt | 1 + src/platform/qt/MultiplayerController.cpp | 20 +++++++ src/platform/qt/MultiplayerController.h | 29 +++++++++ 7 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 src/gba/sio/lockstep.c create mode 100644 src/gba/sio/lockstep.h create mode 100644 src/platform/qt/MultiplayerController.cpp create mode 100644 src/platform/qt/MultiplayerController.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d5801063..ef487f075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,10 +21,11 @@ file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c) file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs]) file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c) file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/video-software.c) +file(GLOB SIO_SRC ${CMAKE_SOURCE_DIR}/src/gba/sio/lockstep.c) file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/src/third-party/inih/*.c) list(APPEND UTIL_SRC ${CMAKE_SOURCE_DIR}/src/platform/commandline.c) source_group("ARM core" FILES ${ARM_SRC}) -source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC}) +source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC} ${SIO_SRC}) source_group("GBA supervisor" FILES ${GBA_SV_SRC}) source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}}) include_directories(${CMAKE_SOURCE_DIR}/src/arm) @@ -275,6 +276,7 @@ set(SRC ${GBA_SV_SRC} ${DEBUGGER_SRC} ${RENDERER_SRC} + ${SIO_SRC} ${UTIL_SRC} ${VFS_SRC} ${OS_SRC} diff --git a/src/gba/sio.h b/src/gba/sio.h index 030218cc8..61e979385 100644 --- a/src/gba/sio.h +++ b/src/gba/sio.h @@ -30,11 +30,11 @@ struct GBASIO; struct GBASIODriver { struct GBASIO* p; - int (*init)(struct GBASIODriver* driver); + bool (*init)(struct GBASIODriver* driver); void (*deinit)(struct GBASIODriver* driver); - int (*load)(struct GBASIODriver* driver); - int (*unload)(struct GBASIODriver* driver); - int (*writeRegister)(struct GBASIODriver* driver, uint32_t address, uint16_t value); + bool (*load)(struct GBASIODriver* driver); + bool (*unload)(struct GBASIODriver* driver); + uint16_t (*writeRegister)(struct GBASIODriver* driver, uint32_t address, uint16_t value); int32_t (*processEvents)(struct GBASIODriver* driver, int32_t cycles); }; diff --git a/src/gba/sio/lockstep.c b/src/gba/sio/lockstep.c new file mode 100644 index 000000000..d7cfa268e --- /dev/null +++ b/src/gba/sio/lockstep.c @@ -0,0 +1,73 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "lockstep.h" + +#define LOCKSTEP_INCREMENT 2048 + +static bool GBASIOLockstepNodeInit(struct GBASIODriver* driver); +static void GBASIOLockstepNodeDeinit(struct GBASIODriver* driver); +static bool GBASIOLockstepNodeLoad(struct GBASIODriver* driver); +static bool GBASIOLockstepNodeUnload(struct GBASIODriver* driver); +static uint16_t GBASIOLockstepNodeWriteRegister(struct GBASIODriver* driver, uint32_t address, uint16_t value); +static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int32_t cycles); + +void GBASIOLockstepInit(struct GBASIOLockstep* lockstep) { + lockstep->players[0] = 0; + lockstep->players[1] = 0; + lockstep->players[2] = 0; + lockstep->players[3] = 0; + lockstep->attached = 0; + ConditionInit(&lockstep->barrier); +} + +void GBASIOLockstepDeinit(struct GBASIOLockstep* lockstep) { + ConditionDeinit(&lockstep->barrier); +} + +void GBASIOLockstepNodeCreate(struct GBASIOLockstepNode* node) { + node->d.init = GBASIOLockstepNodeInit; + node->d.deinit = GBASIOLockstepNodeDeinit; + node->d.load = GBASIOLockstepNodeLoad; + node->d.unload = GBASIOLockstepNodeUnload; + node->d.writeRegister = GBASIOLockstepNodeWriteRegister; + node->d.processEvents = GBASIOLockstepNodeProcessEvents; +} + +bool GBASIOLockstepAttachNode(struct GBASIOLockstep* lockstep, struct GBASIOLockstepNode* node) { + if (lockstep->attached == MAX_GBAS) { + return false; + } + lockstep->players[lockstep->attached] = node; + ++lockstep->attached; + return true; +} + +bool GBASIOLockstepNodeInit(struct GBASIODriver* driver) { + UNUSED(driver); + return true; +} + +void GBASIOLockstepNodeDeinit(struct GBASIODriver* driver) { + UNUSED(driver); +} + +bool GBASIOLockstepNodeLoad(struct GBASIODriver* driver) { + UNUSED(driver); + return true; +} + +bool GBASIOLockstepNodeUnload(struct GBASIODriver* driver) { + UNUSED(driver); + return true; +} + +static uint16_t GBASIOLockstepNodeWriteRegister(struct GBASIODriver* driver, uint32_t address, uint16_t value) { + return value; +} + +static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int32_t cycles) { + return INT_MAX; +} diff --git a/src/gba/sio/lockstep.h b/src/gba/sio/lockstep.h new file mode 100644 index 000000000..c25025db6 --- /dev/null +++ b/src/gba/sio/lockstep.h @@ -0,0 +1,32 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef SIO_LOCKSTEP_H +#define SIO_LOCKSTEP_H + +#include "gba/sio.h" + +#include "util/threading.h" + +struct GBASIOLockstep { + struct GBASIOLockstepNode* players[MAX_GBAS]; + int attached; + + uint16_t data[MAX_GBAS]; + Condition barrier; +}; + +struct GBASIOLockstepNode { + struct GBASIODriver d; + struct GBASIOLockstep* p; +}; + +void GBASIOLockstepInit(struct GBASIOLockstep*); +void GBASIOLockstepDeinit(struct GBASIOLockstep*); + +void GBASIOLockstepNodeCreate(struct GBASIOLockstepNode*); +bool GBASIOLockstepAttachNode(struct GBASIOLockstep*, struct GBASIOLockstepNode*); + +#endif diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 531ab4886..f87fa093b 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -51,6 +51,7 @@ set(SOURCE_FILES KeyEditor.cpp LoadSaveState.cpp LogView.cpp + MultiplayerController.cpp OverrideView.cpp SavestateButton.cpp SensorView.cpp diff --git a/src/platform/qt/MultiplayerController.cpp b/src/platform/qt/MultiplayerController.cpp new file mode 100644 index 000000000..99b1ee8e0 --- /dev/null +++ b/src/platform/qt/MultiplayerController.cpp @@ -0,0 +1,20 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "MultiplayerController.h" + +using namespace QGBA; + +MultiplayerController::MultiplayerController() { + GBASIOLockstepInit(&m_lockstep); +} + +MultiplayerController::~MultiplayerController() { + GBASIOLockstepDeinit(&m_lockstep); +} + +bool MultiplayerController::attachGame(GameController* controller) { + return false; +} diff --git a/src/platform/qt/MultiplayerController.h b/src/platform/qt/MultiplayerController.h new file mode 100644 index 000000000..3a10d56f0 --- /dev/null +++ b/src/platform/qt/MultiplayerController.h @@ -0,0 +1,29 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef QGBA_MULTIPLAYER_CONTROLLER +#define QGBA_MULTIPLAYER_CONTROLLER + +extern "C" { +#include "gba/sio/lockstep.h" +} + +namespace QGBA { + +class GameController; + +class MultiplayerController { +public: + MultiplayerController(); + ~MultiplayerController(); + + bool attachGame(GameController*); + +private: + GBASIOLockstep m_lockstep; +}; + +} +#endif From 5b40951c05baa28ac43c84ffacfec6bd99692ed3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 26 Feb 2015 00:07:12 -0800 Subject: [PATCH 002/101] GBA SIO: Build up lockstep driver a bit more --- src/gba/sio/lockstep.c | 19 +++++++++++++++++++ src/gba/sio/lockstep.h | 3 +++ 2 files changed, 22 insertions(+) diff --git a/src/gba/sio/lockstep.c b/src/gba/sio/lockstep.c index d7cfa268e..73d6a7b38 100644 --- a/src/gba/sio/lockstep.c +++ b/src/gba/sio/lockstep.c @@ -21,10 +21,12 @@ void GBASIOLockstepInit(struct GBASIOLockstep* lockstep) { lockstep->players[3] = 0; lockstep->attached = 0; ConditionInit(&lockstep->barrier); + MutexInit(&lockstep->mutex); } void GBASIOLockstepDeinit(struct GBASIOLockstep* lockstep) { ConditionDeinit(&lockstep->barrier); + MutexDeinit(&lockstep->mutex); } void GBASIOLockstepNodeCreate(struct GBASIOLockstepNode* node) { @@ -45,6 +47,23 @@ bool GBASIOLockstepAttachNode(struct GBASIOLockstep* lockstep, struct GBASIOLock return true; } +void GBASIOLockstepDetachNode(struct GBASIOLockstep* lockstep, struct GBASIOLockstepNode* node) { + if (lockstep->attached == 0) { + return; + } + int i; + for (i = 0; i < lockstep->attached; ++i) { + if (lockstep->players[i] != node) { + continue; + } + for (++i; i < lockstep->attached; ++i) { + lockstep->players[i - 1] = lockstep->players[i]; + } + --lockstep->attached; + break; + } +} + bool GBASIOLockstepNodeInit(struct GBASIODriver* driver) { UNUSED(driver); return true; diff --git a/src/gba/sio/lockstep.h b/src/gba/sio/lockstep.h index c25025db6..b9ca37ff5 100644 --- a/src/gba/sio/lockstep.h +++ b/src/gba/sio/lockstep.h @@ -15,6 +15,7 @@ struct GBASIOLockstep { int attached; uint16_t data[MAX_GBAS]; + Mutex mutex; Condition barrier; }; @@ -27,6 +28,8 @@ void GBASIOLockstepInit(struct GBASIOLockstep*); void GBASIOLockstepDeinit(struct GBASIOLockstep*); void GBASIOLockstepNodeCreate(struct GBASIOLockstepNode*); + bool GBASIOLockstepAttachNode(struct GBASIOLockstep*, struct GBASIOLockstepNode*); +void GBASIOLockstepDetachNode(struct GBASIOLockstep*, struct GBASIOLockstepNode*); #endif From 6e467a0332446b2ac4c81f6cb63dc22e07792454 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 26 Feb 2015 00:07:36 -0800 Subject: [PATCH 003/101] Qt: Create MultiplayerController --- src/platform/qt/GameController.cpp | 20 ++++++++++ src/platform/qt/GameController.h | 7 ++++ src/platform/qt/MultiplayerController.cpp | 45 ++++++++++++++++++++++- src/platform/qt/MultiplayerController.h | 1 + 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index aea188833..7cd6d5e24 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -7,6 +7,7 @@ #include "AudioProcessor.h" #include "InputController.h" +#include "MultiplayerController.h" #include #include @@ -41,6 +42,7 @@ GameController::GameController(QObject* parent) , m_turbo(false) , m_turboForced(false) , m_inputController(nullptr) + , m_multiplayer(nullptr) { m_renderer = new GBAVideoSoftwareRenderer; GBAVideoSoftwareRendererCreate(m_renderer); @@ -140,12 +142,30 @@ GameController::~GameController() { m_audioThread->quit(); m_audioThread->wait(); disconnect(); + clearMultiplayerController(); closeGame(); GBACheatDeviceDestroy(&m_cheatDevice); delete m_renderer; delete[] m_drawContext; } +void GameController::setMultiplayerController(std::shared_ptr controller) { + if (controller == m_multiplayer) { + return; + } + clearMultiplayerController(); + m_multiplayer = controller; + controller->attachGame(this); +} + +void GameController::clearMultiplayerController() { + if (!m_multiplayer) { + return; + } + m_multiplayer->detachGame(this); + m_multiplayer.reset(); +} + void GameController::setOverride(const GBACartridgeOverride& override) { m_threadContext.override = override; m_threadContext.hasOverride = true; diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index 32cfb2352..991cdb1c1 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -12,6 +12,8 @@ #include #include +#include + extern "C" { #include "gba/cheats.h" #include "gba/hardware.h" @@ -32,6 +34,7 @@ namespace QGBA { class AudioProcessor; class InputController; +class MultiplayerController; class GameController : public QObject { Q_OBJECT @@ -59,6 +62,9 @@ public: void setInputController(InputController* controller) { m_inputController = controller; } void setOverrides(Configuration* overrides) { m_threadContext.overrides = overrides; } + void setMultiplayerController(std::shared_ptr controller); + void clearMultiplayerController(); + void setOverride(const GBACartridgeOverride& override); void clearOverride() { m_threadContext.hasOverride = false; } @@ -162,6 +168,7 @@ private: bool m_turboForced; InputController* m_inputController; + std::shared_ptr m_multiplayer; struct GameControllerLux : GBALuminanceSource { GameController* p; diff --git a/src/platform/qt/MultiplayerController.cpp b/src/platform/qt/MultiplayerController.cpp index 99b1ee8e0..fae301a49 100644 --- a/src/platform/qt/MultiplayerController.cpp +++ b/src/platform/qt/MultiplayerController.cpp @@ -5,6 +5,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MultiplayerController.h" +#include "GameController.h" + using namespace QGBA; MultiplayerController::MultiplayerController() { @@ -16,5 +18,46 @@ MultiplayerController::~MultiplayerController() { } bool MultiplayerController::attachGame(GameController* controller) { - return false; + MutexLock(&m_lockstep.mutex); + if (m_lockstep.attached == MAX_GBAS) { + MutexUnlock(&m_lockstep.mutex); + return false; + } + GBASIOLockstepNode* node = new GBASIOLockstepNode; + GBASIOLockstepNodeCreate(node); + GBASIOLockstepAttachNode(&m_lockstep, node); + MutexUnlock(&m_lockstep.mutex); + + controller->threadInterrupt(); + GBAThread* thread = controller->thread(); + if (controller->isLoaded()) { + GBASIOSetDriver(&thread->gba->sio, &node->d, SIO_MULTI); + } + thread->sioDrivers.multiplayer = &node->d; + controller->threadContinue(); + return true; +} + +void MultiplayerController::detachGame(GameController* controller) { + controller->threadInterrupt(); + MutexLock(&m_lockstep.mutex); + GBAThread* thread = nullptr; + for (int i = 0; i < m_lockstep.attached; ++i) { + thread = controller->thread(); + if (thread->sioDrivers.multiplayer == &m_lockstep.players[i]->d) { + break; + } + thread = nullptr; + } + if (thread) { + GBASIOLockstepNode* node = reinterpret_cast(thread->sioDrivers.multiplayer); + if (controller->isLoaded()) { + GBASIOSetDriver(&thread->gba->sio, nullptr, SIO_MULTI); + } + thread->sioDrivers.multiplayer = nullptr; + GBASIOLockstepDetachNode(&m_lockstep, node); + delete node; + } + MutexUnlock(&m_lockstep.mutex); + controller->threadContinue(); } diff --git a/src/platform/qt/MultiplayerController.h b/src/platform/qt/MultiplayerController.h index 3a10d56f0..7c5279823 100644 --- a/src/platform/qt/MultiplayerController.h +++ b/src/platform/qt/MultiplayerController.h @@ -20,6 +20,7 @@ public: ~MultiplayerController(); bool attachGame(GameController*); + void detachGame(GameController*); private: GBASIOLockstep m_lockstep; From e1a8befcbb4cd4f7b5f5239563f4a3e1d49dfd5f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 26 Feb 2015 23:10:01 -0800 Subject: [PATCH 004/101] GBA SIO: Fix RCNT reading for mode --- src/gba/sio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/sio.c b/src/gba/sio.c index 2f7f5c30b..4f93e4e21 100644 --- a/src/gba/sio.c +++ b/src/gba/sio.c @@ -29,7 +29,7 @@ static struct GBASIODriver* _lookupDriver(struct GBASIO* sio, enum GBASIOMode mo } static void _switchMode(struct GBASIO* sio) { - unsigned mode = ((sio->rcnt >> 14) & 0xC) | ((sio->siocnt >> 12) & 0x3); + unsigned mode = ((sio->rcnt & 0xC000) | (sio->siocnt & 0x3000)) >> 12; enum GBASIOMode oldMode = sio->mode; if (mode < 8) { sio->mode = (enum GBASIOMode) (mode & 0x3); From 2fc8f0b567b8ceac642d1cb463282792d0d360bc Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 27 Feb 2015 00:59:20 -0800 Subject: [PATCH 005/101] Qt: Add option for opening new window --- src/platform/qt/Window.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 4c3279a6b..30da056c5 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -23,6 +23,7 @@ #include "GIFView.h" #include "LoadSaveState.h" #include "LogView.h" +#include "MultiplayerController.h" #include "OverrideView.h" #include "SensorView.h" #include "SettingsView.h" @@ -522,8 +523,23 @@ void Window::setupMenu(QMenuBar* menubar) { quickSaveMenu->addAction(quickSave); } -#ifndef Q_OS_MAC fileMenu->addSeparator(); + QAction* multiWindow = new QAction(tr("New multiplayer window"), fileMenu); + connect(multiWindow, &QAction::triggered, [this]() { + std::shared_ptr multiplayer = m_controller->multiplayerController(); + if (!multiplayer) { + multiplayer = std::make_shared(); + m_controller->setMultiplayerController(multiplayer); + } + Window* w2 = new Window(m_config); + w2->setAttribute(Qt::WA_DeleteOnClose); + w2->loadConfig(); + w2->controller()->setMultiplayerController(multiplayer); + w2->show(); + }); + addControlledAction(fileMenu, multiWindow, "multiWindow"); + +#ifndef Q_OS_MAC addControlledAction(fileMenu, fileMenu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit), "quit"); #endif From d1e01266c6848577eb42ef9f4fa23cd1af5d39ea Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 27 Feb 2015 00:59:47 -0800 Subject: [PATCH 006/101] GBA SIO: Partially functional lockstep driver --- src/gba/sio/lockstep.c | 101 +++++++++++++++++++++++++++++++++++++++-- src/gba/sio/lockstep.h | 19 +++++++- 2 files changed, 115 insertions(+), 5 deletions(-) diff --git a/src/gba/sio/lockstep.c b/src/gba/sio/lockstep.c index 73d6a7b38..4b07339c5 100644 --- a/src/gba/sio/lockstep.c +++ b/src/gba/sio/lockstep.c @@ -5,6 +5,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "lockstep.h" +#include "gba/gba.h" +#include "gba/io.h" + #define LOCKSTEP_INCREMENT 2048 static bool GBASIOLockstepNodeInit(struct GBASIODriver* driver); @@ -19,7 +22,15 @@ void GBASIOLockstepInit(struct GBASIOLockstep* lockstep) { lockstep->players[1] = 0; lockstep->players[2] = 0; lockstep->players[3] = 0; + lockstep->multiRecv[0] = 0xFFFF; + lockstep->multiRecv[1] = 0xFFFF; + lockstep->multiRecv[2] = 0xFFFF; + lockstep->multiRecv[3] = 0xFFFF; lockstep->attached = 0; + lockstep->loaded = 0; + lockstep->transferActive = false; + lockstep->waiting = 0; + lockstep->nextEvent = LOCKSTEP_INCREMENT; ConditionInit(&lockstep->barrier); MutexInit(&lockstep->mutex); } @@ -43,6 +54,8 @@ bool GBASIOLockstepAttachNode(struct GBASIOLockstep* lockstep, struct GBASIOLock return false; } lockstep->players[lockstep->attached] = node; + node->p = lockstep; + node->id = lockstep->attached; ++lockstep->attached; return true; } @@ -58,6 +71,7 @@ void GBASIOLockstepDetachNode(struct GBASIOLockstep* lockstep, struct GBASIOLock } for (++i; i < lockstep->attached; ++i) { lockstep->players[i - 1] = lockstep->players[i]; + lockstep->players[i - 1]->id = i - 1; } --lockstep->attached; break; @@ -65,7 +79,9 @@ void GBASIOLockstepDetachNode(struct GBASIOLockstep* lockstep, struct GBASIOLock } bool GBASIOLockstepNodeInit(struct GBASIODriver* driver) { - UNUSED(driver); + struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; + node->nextEvent = LOCKSTEP_INCREMENT; + node->d.p->multiplayerControl.slave = node->id > 0; return true; } @@ -74,19 +90,96 @@ void GBASIOLockstepNodeDeinit(struct GBASIODriver* driver) { } bool GBASIOLockstepNodeLoad(struct GBASIODriver* driver) { - UNUSED(driver); + struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; + node->state = LOCKSTEP_IDLE; + MutexLock(&node->p->mutex); + ++node->p->loaded; + MutexUnlock(&node->p->mutex); return true; } bool GBASIOLockstepNodeUnload(struct GBASIODriver* driver) { - UNUSED(driver); + struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; + MutexLock(&node->p->mutex); + --node->p->loaded; + MutexUnlock(&node->p->mutex); return true; } static uint16_t GBASIOLockstepNodeWriteRegister(struct GBASIODriver* driver, uint32_t address, uint16_t value) { + struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; + if (address == REG_SIOCNT) { + if (value & 0x0080) { + if (!node->id) { + MutexLock(&node->p->mutex); + node->p->transferActive = true; + node->p->transferCycles = GBASIOCyclesPerTransfer[node->d.p->multiplayerControl.baud][node->p->attached - 1]; + MutexUnlock(&node->p->mutex); + } else { + value &= ~0x0080; + value |= driver->p->siocnt & 0x0080; + } + } + value &= 0xFF03; + value |= driver->p->siocnt & 0x00F8; + } return value; } static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int32_t cycles) { - return INT_MAX; + struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; + node->nextEvent -= cycles; + while (node->nextEvent <= 0) { + MutexLock(&node->p->mutex); + ++node->p->waiting; + if (node->p->waiting < node->p->loaded) { + ConditionWait(&node->p->barrier, &node->p->mutex); + } else { + if (node->p->transferActive) { + node->p->transferCycles -= node->p->nextEvent; + if (node->p->transferCycles) { + node->p->nextEvent = LOCKSTEP_INCREMENT; + if (node->p->transferCycles < LOCKSTEP_INCREMENT) { + node->p->nextEvent = node->p->transferCycles; + } + } else { + node->p->transferActive = false; + int i; + for (i = 0; i < node->p->attached; ++i) { + node->p->multiRecv[i] = node->p->players[i]->multiSend; + node->p->players[i]->state = LOCKSTEP_FINISHED; + } + for (; i < MAX_GBAS; ++i) { + node->p->multiRecv[i] = 0xFFFF; + } + } + } + ConditionWake(&node->p->barrier); + } + --node->p->waiting; + if (node->state == LOCKSTEP_FINISHED) { + node->d.p->p->memory.io[REG_SIOMULTI0 >> 1] = node->p->multiRecv[0]; + node->d.p->p->memory.io[REG_SIOMULTI1 >> 1] = node->p->multiRecv[1]; + node->d.p->p->memory.io[REG_SIOMULTI2 >> 1] = node->p->multiRecv[2]; + node->d.p->p->memory.io[REG_SIOMULTI3 >> 1] = node->p->multiRecv[3]; + node->state = LOCKSTEP_IDLE; + if (node->d.p->multiplayerControl.irq) { + GBARaiseIRQ(node->d.p->p, IRQ_SIO); + } + node->d.p->multiplayerControl.id = node->id; + node->d.p->multiplayerControl.busy = 0; + } else if (node->state == LOCKSTEP_IDLE && node->p->transferActive) { + node->state = LOCKSTEP_STARTED; + node->d.p->p->memory.io[REG_SIOMULTI0 >> 1] = 0xFFFF; + node->d.p->p->memory.io[REG_SIOMULTI1 >> 1] = 0xFFFF; + node->d.p->p->memory.io[REG_SIOMULTI2 >> 1] = 0xFFFF; + node->d.p->p->memory.io[REG_SIOMULTI3 >> 1] = 0xFFFF; + node->multiSend = node->d.p->p->memory.io[REG_SIOMLT_SEND >> 1]; + node->d.p->multiplayerControl.busy = 1; + } + node->d.p->multiplayerControl.ready = node->p->loaded == node->p->attached; + node->nextEvent += node->p->nextEvent; + MutexUnlock(&node->p->mutex); + } + return node->nextEvent; } diff --git a/src/gba/sio/lockstep.h b/src/gba/sio/lockstep.h index b9ca37ff5..3b4c5979e 100644 --- a/src/gba/sio/lockstep.h +++ b/src/gba/sio/lockstep.h @@ -10,11 +10,23 @@ #include "util/threading.h" +enum LockstepState { + LOCKSTEP_IDLE = 0, + LOCKSTEP_STARTED = 1, + LOCKSTEP_FINISHED = 2 +}; + struct GBASIOLockstep { struct GBASIOLockstepNode* players[MAX_GBAS]; int attached; + int loaded; - uint16_t data[MAX_GBAS]; + uint16_t multiRecv[MAX_GBAS]; + bool transferActive; + int32_t transferCycles; + int32_t nextEvent; + + int waiting; Mutex mutex; Condition barrier; }; @@ -22,6 +34,11 @@ struct GBASIOLockstep { struct GBASIOLockstepNode { struct GBASIODriver d; struct GBASIOLockstep* p; + + int32_t nextEvent; + uint16_t multiSend; + enum LockstepState state; + int id; }; void GBASIOLockstepInit(struct GBASIOLockstep*); From 80960f9e9aaf22239d0dea06b2ddc18082f21b02 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 27 Feb 2015 01:12:58 -0800 Subject: [PATCH 007/101] GBA SIO: Properly deinitialize SIO --- src/gba/gba.c | 1 + src/gba/sio.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/gba/gba.c b/src/gba/gba.c index f074a4696..88d546b10 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -105,6 +105,7 @@ void GBADestroy(struct GBA* gba) { GBAMemoryDeinit(gba); GBAVideoDeinit(&gba->video); GBAAudioDeinit(&gba->audio); + GBASIODeinit(&gba->sio); GBARRContextDestroy(gba); } diff --git a/src/gba/sio.c b/src/gba/sio.c index 4f93e4e21..d1e732492 100644 --- a/src/gba/sio.c +++ b/src/gba/sio.c @@ -59,6 +59,9 @@ void GBASIOInit(struct GBASIO* sio) { } void GBASIODeinit(struct GBASIO* sio) { + if (sio->activeDriver && sio->activeDriver->unload) { + sio->activeDriver->unload(sio->activeDriver); + } if (sio->drivers.multiplayer && sio->drivers.multiplayer->deinit) { sio->drivers.multiplayer->deinit(sio->drivers.multiplayer); } From 33c2c5379564e8b6fb008e4b06660f39ca2822ad Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 27 Feb 2015 01:37:44 -0800 Subject: [PATCH 008/101] Qt: Add missing function --- src/platform/qt/GameController.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index 991cdb1c1..b3041371a 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -63,6 +63,7 @@ public: void setOverrides(Configuration* overrides) { m_threadContext.overrides = overrides; } void setMultiplayerController(std::shared_ptr controller); + std::shared_ptr multiplayerController() { return m_multiplayer; } void clearMultiplayerController(); void setOverride(const GBACartridgeOverride& override); From e241566ee706ed59369133718ff5ad21564e8de7 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 28 Feb 2015 14:09:18 -0800 Subject: [PATCH 009/101] GBA SIO: Clean up lockstep a bit --- src/gba/sio/lockstep.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/gba/sio/lockstep.c b/src/gba/sio/lockstep.c index 4b07339c5..680ab9030 100644 --- a/src/gba/sio/lockstep.c +++ b/src/gba/sio/lockstep.c @@ -94,6 +94,10 @@ bool GBASIOLockstepNodeLoad(struct GBASIODriver* driver) { node->state = LOCKSTEP_IDLE; MutexLock(&node->p->mutex); ++node->p->loaded; + node->d.p->rcnt |= 3; + if (node->id) { + node->d.p->rcnt |= 4; + } MutexUnlock(&node->p->mutex); return true; } @@ -102,6 +106,7 @@ bool GBASIOLockstepNodeUnload(struct GBASIODriver* driver) { struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; MutexLock(&node->p->mutex); --node->p->loaded; + ConditionWake(&node->p->barrier); MutexUnlock(&node->p->mutex); return true; } @@ -110,18 +115,16 @@ static uint16_t GBASIOLockstepNodeWriteRegister(struct GBASIODriver* driver, uin struct GBASIOLockstepNode* node = (struct GBASIOLockstepNode*) driver; if (address == REG_SIOCNT) { if (value & 0x0080) { + value &= ~0x0080; if (!node->id) { MutexLock(&node->p->mutex); node->p->transferActive = true; node->p->transferCycles = GBASIOCyclesPerTransfer[node->d.p->multiplayerControl.baud][node->p->attached - 1]; MutexUnlock(&node->p->mutex); - } else { - value &= ~0x0080; - value |= driver->p->siocnt & 0x0080; } } value &= 0xFF03; - value |= driver->p->siocnt & 0x00F8; + value |= driver->p->siocnt & 0x0078; } return value; } @@ -137,12 +140,12 @@ static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int3 } else { if (node->p->transferActive) { node->p->transferCycles -= node->p->nextEvent; - if (node->p->transferCycles) { - node->p->nextEvent = LOCKSTEP_INCREMENT; + if (node->p->transferCycles > 0) { if (node->p->transferCycles < LOCKSTEP_INCREMENT) { node->p->nextEvent = node->p->transferCycles; } } else { + node->p->nextEvent = LOCKSTEP_INCREMENT; node->p->transferActive = false; int i; for (i = 0; i < node->p->attached; ++i) { @@ -162,6 +165,7 @@ static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int3 node->d.p->p->memory.io[REG_SIOMULTI1 >> 1] = node->p->multiRecv[1]; node->d.p->p->memory.io[REG_SIOMULTI2 >> 1] = node->p->multiRecv[2]; node->d.p->p->memory.io[REG_SIOMULTI3 >> 1] = node->p->multiRecv[3]; + node->d.p->rcnt |= 1; node->state = LOCKSTEP_IDLE; if (node->d.p->multiplayerControl.irq) { GBARaiseIRQ(node->d.p->p, IRQ_SIO); @@ -174,8 +178,11 @@ static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int3 node->d.p->p->memory.io[REG_SIOMULTI1 >> 1] = 0xFFFF; node->d.p->p->memory.io[REG_SIOMULTI2 >> 1] = 0xFFFF; node->d.p->p->memory.io[REG_SIOMULTI3 >> 1] = 0xFFFF; + node->d.p->rcnt &= ~1; node->multiSend = node->d.p->p->memory.io[REG_SIOMLT_SEND >> 1]; - node->d.p->multiplayerControl.busy = 1; + if (node->id) { + node->d.p->multiplayerControl.busy = 1; + } } node->d.p->multiplayerControl.ready = node->p->loaded == node->p->attached; node->nextEvent += node->p->nextEvent; From f775af67f352e08d55891c1031b0f3a75285da4f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 28 Feb 2015 14:52:46 -0800 Subject: [PATCH 010/101] GBA SIO: Fix writing to RCNT --- src/gba/sio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gba/sio.c b/src/gba/sio.c index d1e732492..1c770d7fb 100644 --- a/src/gba/sio.c +++ b/src/gba/sio.c @@ -122,7 +122,8 @@ void GBASIOSetDriver(struct GBASIO* sio, struct GBASIODriver* driver, enum GBASI } void GBASIOWriteRCNT(struct GBASIO* sio, uint16_t value) { - sio->rcnt = value; + sio->rcnt &= 0xF; + sio->rcnt |= value & ~0xF; _switchMode(sio); if (sio->activeDriver && sio->activeDriver->writeRegister) { sio->activeDriver->writeRegister(sio->activeDriver, REG_RCNT, value); From 4e2a27b42620369fbdb95cdcbacba7dc5876b058 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 1 Mar 2015 05:39:13 -0800 Subject: [PATCH 011/101] GBA SIO: Fix child bit in lockstep driver --- src/gba/sio/lockstep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gba/sio/lockstep.c b/src/gba/sio/lockstep.c index 680ab9030..7358b4d28 100644 --- a/src/gba/sio/lockstep.c +++ b/src/gba/sio/lockstep.c @@ -97,6 +97,7 @@ bool GBASIOLockstepNodeLoad(struct GBASIODriver* driver) { node->d.p->rcnt |= 3; if (node->id) { node->d.p->rcnt |= 4; + node->d.p->multiplayerControl.slave = 1; } MutexUnlock(&node->p->mutex); return true; @@ -124,7 +125,7 @@ static uint16_t GBASIOLockstepNodeWriteRegister(struct GBASIODriver* driver, uin } } value &= 0xFF03; - value |= driver->p->siocnt & 0x0078; + value |= driver->p->siocnt & 0x007C; } return value; } From 618092a5f6b5ed1501e361b4c7c2f390f4967d66 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 1 Mar 2015 15:53:09 -0800 Subject: [PATCH 012/101] GBA SIO: Fix lockstep barrier --- src/gba/sio/lockstep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/sio/lockstep.c b/src/gba/sio/lockstep.c index 7358b4d28..842db4571 100644 --- a/src/gba/sio/lockstep.c +++ b/src/gba/sio/lockstep.c @@ -158,9 +158,9 @@ static int32_t GBASIOLockstepNodeProcessEvents(struct GBASIODriver* driver, int3 } } } + node->p->waiting = 0; ConditionWake(&node->p->barrier); } - --node->p->waiting; if (node->state == LOCKSTEP_FINISHED) { node->d.p->p->memory.io[REG_SIOMULTI0 >> 1] = node->p->multiRecv[0]; node->d.p->p->memory.io[REG_SIOMULTI1 >> 1] = node->p->multiRecv[1]; From dcd2e3a64ffda50e97371aa8fc16776d85f8032f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 2 Mar 2015 01:19:44 -0800 Subject: [PATCH 013/101] GBA: Fix JOY_TRANS_HI register name --- src/gba/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/io.c b/src/gba/io.c index a39d7c444..6e3361f4b 100644 --- a/src/gba/io.c +++ b/src/gba/io.c @@ -172,7 +172,7 @@ const char* GBAIORegisterNames[] = { "JOY_RECV_LO", "JOY_RECV_HI", "JOY_TRANS_LO", - "JOY_RECV_HI", + "JOY_TRANS_HI", "JOYSTAT", 0, 0, From 9273a4ca724f82b41a6d5da74e2dc002fc4d1858 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 2 Mar 2015 01:20:12 -0800 Subject: [PATCH 014/101] GBA SIO: Fix RCNT mode selection --- src/gba/sio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gba/sio.c b/src/gba/sio.c index 1c770d7fb..087c9782d 100644 --- a/src/gba/sio.c +++ b/src/gba/sio.c @@ -36,11 +36,11 @@ static void _switchMode(struct GBASIO* sio) { } else { sio->mode = (enum GBASIOMode) (mode & 0xC); } - if (oldMode != mode) { + if (oldMode != sio->mode) { if (sio->activeDriver && sio->activeDriver->unload) { sio->activeDriver->unload(sio->activeDriver); } - sio->activeDriver = _lookupDriver(sio, mode); + sio->activeDriver = _lookupDriver(sio, sio->mode); if (sio->activeDriver && sio->activeDriver->load) { sio->activeDriver->load(sio->activeDriver); } From 0ab8cfe6ad84afbeca3ed220d591b78cae90fcca Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 3 Mar 2015 02:28:52 -0800 Subject: [PATCH 015/101] Util: Fix SocketPoll on pthreads --- src/util/socket.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/socket.h b/src/util/socket.h index c676fb737..c5c98a6a3 100644 --- a/src/util/socket.h +++ b/src/util/socket.h @@ -253,7 +253,7 @@ static inline int SocketPoll(size_t nSockets, Socket* reads, Socket* writes, Soc struct timeval tv; tv.tv_sec = timeoutMillis / 1000; tv.tv_usec = (timeoutMillis % 1000) * 1000; - int result = select(maxFd, &rset, &wset, &eset, timeoutMillis < 0 ? 0 : &tv); + int result = select(maxFd + 1, &rset, &wset, &eset, timeoutMillis < 0 ? 0 : &tv); int r = 0; int w = 0; int e = 0; From e810f1b9f061fa0e40235b249f2cf2342decb104 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 3 Mar 2015 21:18:53 -0800 Subject: [PATCH 016/101] GBA Video: Clear video buffer when starting --- src/gba/renderers/video-software.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c index 96a8b25fa..e989366f5 100644 --- a/src/gba/renderers/video-software.c +++ b/src/gba/renderers/video-software.c @@ -37,6 +37,7 @@ static const int _objSizes[32] = { static void GBAVideoSoftwareRendererInit(struct GBAVideoRenderer* renderer); static void GBAVideoSoftwareRendererDeinit(struct GBAVideoRenderer* renderer); +static void GBAVideoSoftwareRendererReset(struct GBAVideoRenderer* renderer); static void GBAVideoSoftwareRendererWriteOAM(struct GBAVideoRenderer* renderer, uint32_t oam); static void GBAVideoSoftwareRendererWritePalette(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value); static uint16_t GBAVideoSoftwareRendererWriteVideoRegister(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value); @@ -77,7 +78,7 @@ static void _breakWindowInner(struct GBAVideoSoftwareRenderer* softwareRenderer, void GBAVideoSoftwareRendererCreate(struct GBAVideoSoftwareRenderer* renderer) { renderer->d.init = GBAVideoSoftwareRendererInit; - renderer->d.reset = GBAVideoSoftwareRendererInit; + renderer->d.reset = GBAVideoSoftwareRendererReset; renderer->d.deinit = GBAVideoSoftwareRendererDeinit; renderer->d.writeVideoRegister = GBAVideoSoftwareRendererWriteVideoRegister; renderer->d.writeOAM = GBAVideoSoftwareRendererWriteOAM; @@ -89,6 +90,21 @@ void GBAVideoSoftwareRendererCreate(struct GBAVideoSoftwareRenderer* renderer) { } static void GBAVideoSoftwareRendererInit(struct GBAVideoRenderer* renderer) { + GBAVideoSoftwareRendererReset(renderer); + + struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer; + + int y; + for (y = 0; y < VIDEO_VERTICAL_PIXELS; ++y) { + color_t* row = &softwareRenderer->outputBuffer[softwareRenderer->outputBufferStride * y]; + int x; + for (x = 0; x < VIDEO_HORIZONTAL_PIXELS; ++x) { + row[x] = GBA_COLOR_WHITE; + } + } +} + +static void GBAVideoSoftwareRendererReset(struct GBAVideoRenderer* renderer) { struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer; int i; From 95e4820743c9d170c1f3cd4e0d4c7c55dfc02063 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 00:22:57 -0800 Subject: [PATCH 017/101] SDL: Remove RR functions --- src/platform/sdl/sdl-events.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 4af6edbb7..0a8bcbbb7 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -140,14 +140,6 @@ static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents GBARewind(context, 10); GBAThreadContinue(context); return; - case SDLK_ESCAPE: - GBAThreadInterrupt(context); - if (context->gba->rr) { - GBARRStopPlaying(context->gba->rr); - GBARRStopRecording(context->gba->rr); - } - GBAThreadContinue(context); - return; default: if ((event->keysym.mod & GUI_MOD) && (event->keysym.mod & GUI_MOD) == event->keysym.mod) { switch (event->keysym.sym) { @@ -169,31 +161,6 @@ static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents case SDLK_r: GBAThreadReset(context); break; - case SDLK_t: - if (context->stateDir) { - GBAThreadInterrupt(context); - GBARRContextCreate(context->gba); - if (!GBARRIsRecording(context->gba->rr)) { - GBARRStopPlaying(context->gba->rr); - GBARRInitStream(context->gba->rr, context->stateDir); - GBARRReinitStream(context->gba->rr, INIT_EX_NIHILO); - GBARRStartRecording(context->gba->rr); - GBARRSaveState(context->gba); - } - GBAThreadContinue(context); - } - break; - case SDLK_y: - if (context->stateDir) { - GBAThreadInterrupt(context); - GBARRContextCreate(context->gba); - GBARRStopRecording(context->gba->rr); - GBARRInitStream(context->gba->rr, context->stateDir); - GBARRStartPlaying(context->gba->rr, false); - GBARRLoadState(context->gba); - GBAThreadContinue(context); - } - break; default: break; } From bb77d278dd03ac09f0ef63d5b13aa6ee12f1e6e3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 00:24:15 -0800 Subject: [PATCH 018/101] GBA RR: Modularize RR --- CMakeLists.txt | 4 +- src/gba/gba.c | 6 +- src/gba/io.c | 8 +- src/gba/rr/mgm.c | 583 ++++++++++++++++++++++++++++++++++++++++ src/gba/rr/mgm.h | 83 ++++++ src/gba/serialize.c | 21 +- src/gba/supervisor/rr.c | 523 +---------------------------------- src/gba/supervisor/rr.h | 99 ++----- 8 files changed, 704 insertions(+), 623 deletions(-) create mode 100644 src/gba/rr/mgm.c create mode 100644 src/gba/rr/mgm.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d5801063..4d0a7b77d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ set(BUILD_STATIC OFF CACHE BOOL "Build a static library") set(BUILD_SHARED ON CACHE BOOL "Build a shared library") file(GLOB ARM_SRC ${CMAKE_SOURCE_DIR}/src/arm/*.c) file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c) +file(GLOB GBA_RR_SRC ${CMAKE_SOURCE_DIR}/src/gba/rr/*.c) file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c) file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs]) file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c) @@ -25,7 +26,7 @@ file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/src/third-party/inih/*.c) list(APPEND UTIL_SRC ${CMAKE_SOURCE_DIR}/src/platform/commandline.c) source_group("ARM core" FILES ${ARM_SRC}) source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC}) -source_group("GBA supervisor" FILES ${GBA_SV_SRC}) +source_group("GBA supervisor" FILES ${GBA_SV_SRC} ${GBA_RR_SRC}) source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}}) include_directories(${CMAKE_SOURCE_DIR}/src/arm) include_directories(${CMAKE_SOURCE_DIR}/src) @@ -272,6 +273,7 @@ endif() set(SRC ${ARM_SRC} ${GBA_SRC} + ${GBA_RR_SRC} ${GBA_SV_SRC} ${DEBUGGER_SRC} ${RENDERER_SRC} diff --git a/src/gba/gba.c b/src/gba/gba.c index 88d546b10..07dcc512b 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -106,7 +106,7 @@ void GBADestroy(struct GBA* gba) { GBAVideoDeinit(&gba->video); GBAAudioDeinit(&gba->audio); GBASIODeinit(&gba->sio); - GBARRContextDestroy(gba); + gba->rr = 0; } void GBAInterruptHandlerInit(struct ARMInterruptHandler* irqh) { @@ -130,7 +130,7 @@ void GBAReset(struct ARMCore* cpu) { cpu->gprs[ARM_SP] = SP_BASE_SYSTEM; struct GBA* gba = (struct GBA*) cpu->master; - if (!GBARRIsPlaying(gba->rr) && !GBARRIsRecording(gba->rr)) { + if (!gba->rr || (!gba->rr->isPlaying(gba->rr) && !gba->rr->isRecording(gba->rr))) { GBASavedataUnmask(&gba->memory.savedata); } GBAMemoryReset(gba); @@ -713,7 +713,7 @@ void GBAFrameStarted(struct GBA* gba) { void GBAFrameEnded(struct GBA* gba) { if (gba->rr) { - GBARRNextFrame(gba->rr); + gba->rr->nextFrame(gba->rr); } if (gba->cpu->components[GBA_COMPONENT_CHEAT_DEVICE]) { diff --git a/src/gba/io.c b/src/gba/io.c index 6e3361f4b..271aec632 100644 --- a/src/gba/io.c +++ b/src/gba/io.c @@ -583,12 +583,12 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) { break; case REG_KEYINPUT: - if (GBARRIsPlaying(gba->rr)) { - return 0x3FF ^ GBARRQueryInput(gba->rr); + if (gba->rr && gba->rr->isPlaying(gba->rr)) { + return 0x3FF ^ gba->rr->queryInput(gba->rr); } else if (gba->keySource) { uint16_t input = *gba->keySource; - if (GBARRIsRecording(gba->rr)) { - GBARRLogInput(gba->rr, input); + if (gba->rr && gba->rr->isRecording(gba->rr)) { + gba->rr->logInput(gba->rr, input); } return 0x3FF ^ input; } diff --git a/src/gba/rr/mgm.c b/src/gba/rr/mgm.c new file mode 100644 index 000000000..bc487a7b2 --- /dev/null +++ b/src/gba/rr/mgm.c @@ -0,0 +1,583 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "mgm.h" + +#include "gba/gba.h" +#include "gba/serialize.h" +#include "util/vfs.h" + +#define BINARY_EXT ".mgm" +#define BINARY_MAGIC "GBAb" +#define METADATA_FILENAME "metadata" BINARY_EXT + +enum { + INVALID_INPUT = 0x8000 +}; + +static bool GBAMGMStartPlaying(struct GBARRContext*, bool autorecord); +static void GBAMGMStopPlaying(struct GBARRContext*); +static bool GBAMGMStartRecording(struct GBARRContext*); +static void GBAMGMStopRecording(struct GBARRContext*); + +static bool GBAMGMIsPlaying(const struct GBARRContext*); +static bool GBAMGMIsRecording(const struct GBARRContext*); + +static void GBAMGMNextFrame(struct GBARRContext*); +static void GBAMGMLogInput(struct GBARRContext*, uint16_t input); +static uint16_t GBAMGMQueryInput(struct GBARRContext*); + +static void GBAMGMStateSaved(struct GBARRContext* rr, struct GBASerializedState* state); +static void GBAMGMStateLoaded(struct GBARRContext* rr, const struct GBASerializedState* state); + +static bool _loadStream(struct GBAMGMContext*, uint32_t streamId); +static bool _incrementStream(struct GBAMGMContext*, bool recursive); +static bool _finishSegment(struct GBAMGMContext*); +static bool _skipSegment(struct GBAMGMContext*); +static bool _markRerecord(struct GBAMGMContext*); + +static bool _emitMagic(struct GBAMGMContext*, struct VFile* vf); +static bool _verifyMagic(struct GBAMGMContext*, struct VFile* vf); +static enum GBAMGMTag _readTag(struct GBAMGMContext*, struct VFile* vf); +static bool _seekTag(struct GBAMGMContext*, struct VFile* vf, enum GBAMGMTag tag); +static bool _emitTag(struct GBAMGMContext*, struct VFile* vf, uint8_t tag); +static bool _emitEnd(struct GBAMGMContext*, struct VFile* vf); + +static bool _parseMetadata(struct GBAMGMContext*, struct VFile* vf); + +static bool _markStreamNext(struct GBAMGMContext*, uint32_t newStreamId, bool recursive); +static void _streamEndReached(struct GBAMGMContext*); + +static struct VFile* GBAMGMOpenSavedata(struct GBARRContext*, int flags); +static struct VFile* GBAMGMOpenSavestate(struct GBARRContext*, int flags); + +void GBAMGMContextCreate(struct GBAMGMContext* mgm) { + memset(mgm, 0, sizeof(*mgm)); + + mgm->d.startPlaying = GBAMGMStartPlaying; + mgm->d.stopPlaying = GBAMGMStopPlaying; + mgm->d.startRecording = GBAMGMStartRecording; + mgm->d.stopRecording = GBAMGMStopRecording; + + mgm->d.isPlaying = GBAMGMIsPlaying; + mgm->d.isRecording = GBAMGMIsRecording; + + mgm->d.nextFrame = GBAMGMNextFrame; + mgm->d.logInput = GBAMGMLogInput; + mgm->d.queryInput = GBAMGMQueryInput; + + mgm->d.stateSaved = GBAMGMStateSaved; + mgm->d.stateLoaded = GBAMGMStateLoaded; + + mgm->d.openSavedata = GBAMGMOpenSavedata; + mgm->d.openSavestate = GBAMGMOpenSavestate; +} + +void GBAMGMContextDestroy(struct GBAMGMContext* mgm) { + if (mgm->d.isPlaying(&mgm->d)) { + mgm->d.stopPlaying(&mgm->d); + } + if (mgm->d.isRecording(&mgm->d)) { + mgm->d.stopRecording(&mgm->d); + } + if (mgm->metadataFile) { + mgm->metadataFile->close(mgm->metadataFile); + } + if (mgm->d.savedata) { + mgm->d.savedata->close(mgm->d.savedata); + mgm->d.savedata = 0; + } +} + +bool GBAMGMSetStream(struct GBAMGMContext* mgm, struct VDir* stream) { + if (mgm->movieStream && !mgm->movieStream->close(mgm->movieStream)) { + return false; + } + + if (mgm->metadataFile && !mgm->metadataFile->close(mgm->metadataFile)) { + return false; + } + + mgm->streamDir = stream; + mgm->metadataFile = mgm->streamDir->openFile(mgm->streamDir, METADATA_FILENAME, O_CREAT | O_RDWR); + mgm->currentInput = INVALID_INPUT; + if (!_parseMetadata(mgm, mgm->metadataFile)) { + mgm->metadataFile->close(mgm->metadataFile); + mgm->metadataFile = 0; + mgm->maxStreamId = 0; + } + mgm->streamId = 1; + mgm->movieStream = 0; + return true; +} + +bool GBAMGMCreateStream(struct GBAMGMContext* mgm, enum GBARRInitFrom initFrom) { + if (mgm->metadataFile) { + mgm->metadataFile->truncate(mgm->metadataFile, 0); + } else { + mgm->metadataFile = mgm->streamDir->openFile(mgm->streamDir, METADATA_FILENAME, O_CREAT | O_TRUNC | O_RDWR); + } + _emitMagic(mgm, mgm->metadataFile); + + mgm->d.initFrom = initFrom; + mgm->initFromOffset = mgm->metadataFile->seek(mgm->metadataFile, 0, SEEK_CUR); + _emitTag(mgm, mgm->metadataFile, TAG_INIT | initFrom); + + mgm->streamId = 0; + mgm->maxStreamId = 0; + _emitTag(mgm, mgm->metadataFile, TAG_MAX_STREAM); + mgm->maxStreamIdOffset = mgm->metadataFile->seek(mgm->metadataFile, 0, SEEK_CUR); + mgm->metadataFile->write(mgm->metadataFile, &mgm->maxStreamId, sizeof(mgm->maxStreamId)); + + mgm->d.rrCount = 0; + _emitTag(mgm, mgm->metadataFile, TAG_RR_COUNT); + mgm->rrCountOffset = mgm->metadataFile->seek(mgm->metadataFile, 0, SEEK_CUR); + mgm->metadataFile->write(mgm->metadataFile, &mgm->d.rrCount, sizeof(mgm->d.rrCount)); + return true; +} + +bool _loadStream(struct GBAMGMContext* mgm, uint32_t streamId) { + if (mgm->movieStream && !mgm->movieStream->close(mgm->movieStream)) { + return false; + } + mgm->movieStream = 0; + mgm->streamId = streamId; + mgm->currentInput = INVALID_INPUT; + char buffer[14]; + snprintf(buffer, sizeof(buffer), "%u" BINARY_EXT, streamId); + if (mgm->d.isRecording(&mgm->d)) { + int flags = O_CREAT | O_RDWR; + if (streamId > mgm->maxStreamId) { + flags |= O_TRUNC; + } + mgm->movieStream = mgm->streamDir->openFile(mgm->streamDir, buffer, flags); + } else if (mgm->d.isPlaying(&mgm->d)) { + mgm->movieStream = mgm->streamDir->openFile(mgm->streamDir, buffer, O_RDONLY); + mgm->peekedTag = TAG_INVALID; + if (!mgm->movieStream || !_verifyMagic(mgm, mgm->movieStream) || !_seekTag(mgm, mgm->movieStream, TAG_BEGIN)) { + mgm->d.stopPlaying(&mgm->d); + } + } + GBALog(0, GBA_LOG_DEBUG, "[RR] Loading segment: %u", streamId); + mgm->d.frames = 0; + mgm->d.lagFrames = 0; + return true; +} + +bool _incrementStream(struct GBAMGMContext* mgm, bool recursive) { + uint32_t newStreamId = mgm->maxStreamId + 1; + uint32_t oldStreamId = mgm->streamId; + if (mgm->d.isRecording(&mgm->d) && mgm->movieStream) { + if (!_markStreamNext(mgm, newStreamId, recursive)) { + return false; + } + } + if (!_loadStream(mgm, newStreamId)) { + return false; + } + GBALog(0, GBA_LOG_DEBUG, "[RR] New segment: %u", newStreamId); + _emitMagic(mgm, mgm->movieStream); + mgm->maxStreamId = newStreamId; + _emitTag(mgm, mgm->movieStream, TAG_PREVIOUSLY); + mgm->movieStream->write(mgm->movieStream, &oldStreamId, sizeof(oldStreamId)); + _emitTag(mgm, mgm->movieStream, TAG_BEGIN); + + mgm->metadataFile->seek(mgm->metadataFile, mgm->maxStreamIdOffset, SEEK_SET); + mgm->metadataFile->write(mgm->metadataFile, &mgm->maxStreamId, sizeof(mgm->maxStreamId)); + mgm->previously = oldStreamId; + return true; +} + +bool GBAMGMStartPlaying(struct GBARRContext* rr, bool autorecord) { + if (rr->isRecording(rr) || rr->isPlaying(rr)) { + return false; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + mgm->isPlaying = true; + if (!_loadStream(mgm, 1)) { + mgm->isPlaying = false; + return false; + } + mgm->autorecord = autorecord; + return true; +} + +void GBAMGMStopPlaying(struct GBARRContext* rr) { + if (!rr->isPlaying(rr)) { + return; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + mgm->isPlaying = false; + if (mgm->movieStream) { + mgm->movieStream->close(mgm->movieStream); + mgm->movieStream = 0; + } +} + +bool GBAMGMStartRecording(struct GBARRContext* rr) { + if (rr->isRecording(rr) || rr->isPlaying(rr)) { + return false; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + if (!mgm->maxStreamIdOffset) { + _emitTag(mgm, mgm->metadataFile, TAG_MAX_STREAM); + mgm->maxStreamIdOffset = mgm->metadataFile->seek(mgm->metadataFile, 0, SEEK_CUR); + mgm->metadataFile->write(mgm->metadataFile, &mgm->maxStreamId, sizeof(mgm->maxStreamId)); + } + + mgm->isRecording = true; + return _incrementStream(mgm, false); +} + +void GBAMGMStopRecording(struct GBARRContext* rr) { + if (!rr->isRecording(rr)) { + return; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + mgm->isRecording = false; + if (mgm->movieStream) { + _emitEnd(mgm, mgm->movieStream); + mgm->movieStream->close(mgm->movieStream); + mgm->movieStream = 0; + } +} + +bool GBAMGMIsPlaying(const struct GBARRContext* rr) { + const struct GBAMGMContext* mgm = (const struct GBAMGMContext*) rr; + return mgm->isPlaying; +} + +bool GBAMGMIsRecording(const struct GBARRContext* rr) { + const struct GBAMGMContext* mgm = (const struct GBAMGMContext*) rr; + return mgm->isRecording; +} + +void GBAMGMNextFrame(struct GBARRContext* rr) { + if (!rr->isRecording(rr) && !rr->isPlaying(rr)) { + return; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + if (rr->isPlaying(rr)) { + while (mgm->peekedTag == TAG_INPUT) { + _readTag(mgm, mgm->movieStream); + GBALog(0, GBA_LOG_WARN, "[RR] Desync detected!"); + } + if (mgm->peekedTag == TAG_LAG) { + GBALog(0, GBA_LOG_DEBUG, "[RR] Lag frame marked in stream"); + if (mgm->inputThisFrame) { + GBALog(0, GBA_LOG_WARN, "[RR] Lag frame in stream does not match movie"); + } + } + } + + ++mgm->d.frames; + GBALog(0, GBA_LOG_DEBUG, "[RR] Frame: %u", mgm->d.frames); + if (!mgm->inputThisFrame) { + ++mgm->d.lagFrames; + GBALog(0, GBA_LOG_DEBUG, "[RR] Lag frame: %u", mgm->d.lagFrames); + } + + if (rr->isRecording(rr)) { + if (!mgm->inputThisFrame) { + _emitTag(mgm, mgm->movieStream, TAG_LAG); + } + _emitTag(mgm, mgm->movieStream, TAG_FRAME); + mgm->inputThisFrame = false; + } else { + if (!_seekTag(mgm, mgm->movieStream, TAG_FRAME)) { + _streamEndReached(mgm); + } + } +} + +void GBAMGMLogInput(struct GBARRContext* rr, uint16_t keys) { + if (!rr->isRecording(rr)) { + return; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + if (keys != mgm->currentInput) { + _emitTag(mgm, mgm->movieStream, TAG_INPUT); + mgm->movieStream->write(mgm->movieStream, &keys, sizeof(keys)); + mgm->currentInput = keys; + } + GBALog(0, GBA_LOG_DEBUG, "[RR] Input log: %03X", mgm->currentInput); + mgm->inputThisFrame = true; +} + +uint16_t GBAMGMQueryInput(struct GBARRContext* rr) { + if (!rr->isPlaying(rr)) { + return 0; + } + + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + if (mgm->peekedTag == TAG_INPUT) { + _readTag(mgm, mgm->movieStream); + } + mgm->inputThisFrame = true; + if (mgm->currentInput == INVALID_INPUT) { + GBALog(0, GBA_LOG_WARN, "[RR] Stream did not specify input"); + } + GBALog(0, GBA_LOG_DEBUG, "[RR] Input replay: %03X", mgm->currentInput); + return mgm->currentInput; +} + +void GBAMGMStateSaved(struct GBARRContext* rr, struct GBASerializedState* state) { + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + if (rr->isRecording(rr)) { + state->associatedStreamId = mgm->streamId; + _finishSegment(mgm); + } +} + +void GBAMGMStateLoaded(struct GBARRContext* rr, const struct GBASerializedState* state) { + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + if (rr->isRecording(rr)) { + if (state->associatedStreamId != mgm->streamId) { + _loadStream(mgm, state->associatedStreamId); + _incrementStream(mgm, true); + } else { + _finishSegment(mgm); + } + _markRerecord(mgm); + } else if (rr->isPlaying(rr)) { + _loadStream(mgm, state->associatedStreamId); + _skipSegment(mgm); + } +} + +bool _finishSegment(struct GBAMGMContext* mgm) { + if (mgm->movieStream) { + if (!_emitEnd(mgm, mgm->movieStream)) { + return false; + } + } + return _incrementStream(mgm, false); +} + +bool _skipSegment(struct GBAMGMContext* mgm) { + mgm->nextTime = 0; + while (_readTag(mgm, mgm->movieStream) != TAG_EOF); + if (!mgm->nextTime || !_loadStream(mgm, mgm->nextTime)) { + _streamEndReached(mgm); + return false; + } + return true; +} + +bool _markRerecord(struct GBAMGMContext* mgm) { + ++mgm->d.rrCount; + mgm->metadataFile->seek(mgm->metadataFile, mgm->rrCountOffset, SEEK_SET); + mgm->metadataFile->write(mgm->metadataFile, &mgm->d.rrCount, sizeof(mgm->d.rrCount)); + return true; +} + +bool _emitMagic(struct GBAMGMContext* mgm, struct VFile* vf) { + UNUSED(mgm); + return vf->write(vf, BINARY_MAGIC, 4) == 4; +} + +bool _verifyMagic(struct GBAMGMContext* mgm, struct VFile* vf) { + UNUSED(mgm); + char buffer[4]; + if (vf->read(vf, buffer, sizeof(buffer)) != sizeof(buffer)) { + return false; + } + if (memcmp(buffer, BINARY_MAGIC, sizeof(buffer)) != 0) { + return false; + } + return true; +} + +enum GBAMGMTag _readTag(struct GBAMGMContext* mgm, struct VFile* vf) { + if (!mgm || !vf) { + return TAG_EOF; + } + + enum GBAMGMTag tag = mgm->peekedTag; + switch (tag) { + case TAG_INPUT: + vf->read(vf, &mgm->currentInput, sizeof(uint16_t)); + break; + case TAG_PREVIOUSLY: + vf->read(vf, &mgm->previously, sizeof(mgm->previously)); + break; + case TAG_NEXT_TIME: + vf->read(vf, &mgm->nextTime, sizeof(mgm->nextTime)); + break; + case TAG_MAX_STREAM: + vf->read(vf, &mgm->maxStreamId, sizeof(mgm->maxStreamId)); + break; + case TAG_FRAME_COUNT: + vf->read(vf, &mgm->d.frames, sizeof(mgm->d.frames)); + break; + case TAG_LAG_COUNT: + vf->read(vf, &mgm->d.lagFrames, sizeof(mgm->d.lagFrames)); + break; + case TAG_RR_COUNT: + vf->read(vf, &mgm->d.rrCount, sizeof(mgm->d.rrCount)); + break; + + case TAG_INIT_EX_NIHILO: + mgm->d.initFrom = INIT_EX_NIHILO; + break; + case TAG_INIT_FROM_SAVEGAME: + mgm->d.initFrom = INIT_FROM_SAVEGAME; + break; + case TAG_INIT_FROM_SAVESTATE: + mgm->d.initFrom = INIT_FROM_SAVESTATE; + break; + case TAG_INIT_FROM_BOTH: + mgm->d.initFrom = INIT_FROM_BOTH; + break; + + // To be spec'd + case TAG_AUTHOR: + case TAG_COMMENT: + break; + + // Empty markers + case TAG_FRAME: + case TAG_LAG: + case TAG_BEGIN: + case TAG_END: + case TAG_INVALID: + case TAG_EOF: + break; + } + + uint8_t tagBuffer; + if (vf->read(vf, &tagBuffer, 1) != 1) { + mgm->peekedTag = TAG_EOF; + } else { + mgm->peekedTag = tagBuffer; + } + + if (mgm->peekedTag == TAG_END) { + _skipSegment(mgm); + } + return tag; +} + +bool _seekTag(struct GBAMGMContext* mgm, struct VFile* vf, enum GBAMGMTag tag) { + enum GBAMGMTag readTag; + while ((readTag = _readTag(mgm, vf)) != tag) { + if (readTag == TAG_EOF) { + return false; + } + } + return true; +} + +bool _emitTag(struct GBAMGMContext* mgm, struct VFile* vf, uint8_t tag) { + UNUSED(mgm); + return vf->write(vf, &tag, sizeof(tag)) == sizeof(tag); +} + +bool _parseMetadata(struct GBAMGMContext* mgm, struct VFile* vf) { + if (!_verifyMagic(mgm, vf)) { + return false; + } + while (_readTag(mgm, vf) != TAG_EOF) { + switch (mgm->peekedTag) { + case TAG_MAX_STREAM: + mgm->maxStreamIdOffset = vf->seek(vf, 0, SEEK_CUR); + break; + case TAG_INIT_EX_NIHILO: + case TAG_INIT_FROM_SAVEGAME: + case TAG_INIT_FROM_SAVESTATE: + case TAG_INIT_FROM_BOTH: + mgm->initFromOffset = vf->seek(vf, 0, SEEK_CUR); + break; + case TAG_RR_COUNT: + mgm->rrCountOffset = vf->seek(vf, 0, SEEK_CUR); + break; + default: + break; + } + } + return true; +} + +bool _emitEnd(struct GBAMGMContext* mgm, struct VFile* vf) { + // TODO: Error check + _emitTag(mgm, vf, TAG_END); + _emitTag(mgm, vf, TAG_FRAME_COUNT); + vf->write(vf, &mgm->d.frames, sizeof(mgm->d.frames)); + _emitTag(mgm, vf, TAG_LAG_COUNT); + vf->write(vf, &mgm->d.lagFrames, sizeof(mgm->d.lagFrames)); + _emitTag(mgm, vf, TAG_NEXT_TIME); + + uint32_t newStreamId = 0; + vf->write(vf, &newStreamId, sizeof(newStreamId)); + return true; +} + +bool _markStreamNext(struct GBAMGMContext* mgm, uint32_t newStreamId, bool recursive) { + if (mgm->movieStream->seek(mgm->movieStream, -sizeof(newStreamId) - 1, SEEK_END) < 0) { + return false; + } + + uint8_t tagBuffer; + if (mgm->movieStream->read(mgm->movieStream, &tagBuffer, 1) != 1) { + return false; + } + if (tagBuffer != TAG_NEXT_TIME) { + return false; + } + if (mgm->movieStream->write(mgm->movieStream, &newStreamId, sizeof(newStreamId)) != sizeof(newStreamId)) { + return false; + } + if (recursive) { + if (mgm->movieStream->seek(mgm->movieStream, 0, SEEK_SET) < 0) { + return false; + } + if (!_verifyMagic(mgm, mgm->movieStream)) { + return false; + } + _readTag(mgm, mgm->movieStream); + if (_readTag(mgm, mgm->movieStream) != TAG_PREVIOUSLY) { + return false; + } + if (mgm->previously == 0) { + return true; + } + uint32_t currentStreamId = mgm->streamId; + if (!_loadStream(mgm, mgm->previously)) { + return false; + } + return _markStreamNext(mgm, currentStreamId, mgm->previously); + } + return true; +} + +void _streamEndReached(struct GBAMGMContext* mgm) { + if (!mgm->d.isPlaying(&mgm->d)) { + return; + } + + uint32_t endStreamId = mgm->streamId; + mgm->d.stopPlaying(&mgm->d); + if (mgm->autorecord) { + mgm->isRecording = true; + _loadStream(mgm, endStreamId); + _incrementStream(mgm, false); + } +} + +struct VFile* GBAMGMOpenSavedata(struct GBARRContext* rr, int flags) { + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + return mgm->streamDir->openFile(mgm->streamDir, "movie.sav", flags); +} + +struct VFile* GBAMGMOpenSavestate(struct GBARRContext* rr, int flags) { + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; + return mgm->streamDir->openFile(mgm->streamDir, "movie.ssm", flags); +} diff --git a/src/gba/rr/mgm.h b/src/gba/rr/mgm.h new file mode 100644 index 000000000..3b08655ca --- /dev/null +++ b/src/gba/rr/mgm.h @@ -0,0 +1,83 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef RR_MGM_H +#define RR_MGM_H + +#include "util/common.h" + +#include "gba/supervisor/rr.h" + +struct GBA; +struct VDir; +struct VFile; + +enum GBAMGMTag { + // Playback tags + TAG_INVALID = 0x00, + TAG_INPUT = 0x01, + TAG_FRAME = 0x02, + TAG_LAG = 0x03, + + // Stream chunking tags + TAG_BEGIN = 0x10, + TAG_END = 0x11, + TAG_PREVIOUSLY = 0x12, + TAG_NEXT_TIME = 0x13, + TAG_MAX_STREAM = 0x14, + + // Recording information tags + TAG_FRAME_COUNT = 0x20, + TAG_LAG_COUNT = 0x21, + TAG_RR_COUNT = 0x22, + TAG_INIT = 0x24, + TAG_INIT_EX_NIHILO = 0x24 | INIT_EX_NIHILO, + TAG_INIT_FROM_SAVEGAME = 0x24 | INIT_FROM_SAVEGAME, + TAG_INIT_FROM_SAVESTATE = 0x24 | INIT_FROM_SAVESTATE, + TAG_INIT_FROM_BOTH = 0x24 | INIT_FROM_BOTH, + + // User metadata tags + TAG_AUTHOR = 0x30, + TAG_COMMENT = 0x31, + + TAG_EOF = INT_MAX +}; + +struct GBAMGMContext { + struct GBARRContext d; + + // Playback state + bool isPlaying; + bool autorecord; + + // Recording state + bool isRecording; + bool inputThisFrame; + + // Metadata + uint32_t streamId; + + uint32_t maxStreamId; + off_t maxStreamIdOffset; + off_t initFromOffset; + off_t rrCountOffset; + + // Streaming state + struct VDir* streamDir; + struct VFile* metadataFile; + struct VFile* movieStream; + uint16_t currentInput; + enum GBAMGMTag peekedTag; + uint32_t nextTime; + uint32_t previously; +}; + +void GBAMGMContextCreate(struct GBAMGMContext*); +void GBAMGMContextDestroy(struct GBAMGMContext*); + +bool GBAMGMSetStream(struct GBAMGMContext* mgm, struct VDir* stream); +bool GBAMGMCreateStream(struct GBAMGMContext* mgm, enum GBARRInitFrom initFrom); + +#endif diff --git a/src/gba/serialize.c b/src/gba/serialize.c index 56914f3dc..93a873c6e 100644 --- a/src/gba/serialize.c +++ b/src/gba/serialize.c @@ -49,11 +49,9 @@ void GBASerialize(struct GBA* gba, struct GBASerializedState* state) { GBAVideoSerialize(&gba->video, state); GBAAudioSerialize(&gba->audio, state); - if (GBARRIsRecording(gba->rr)) { - state->associatedStreamId = gba->rr->streamId; - GBARRFinishSegment(gba->rr); - } else { - state->associatedStreamId = 0; + state->associatedStreamId = 0; + if (gba->rr) { + gba->rr->stateSaved(gba->rr, state); } } @@ -114,17 +112,8 @@ void GBADeserialize(struct GBA* gba, struct GBASerializedState* state) { GBAVideoDeserialize(&gba->video, state); GBAAudioDeserialize(&gba->audio, state); - if (GBARRIsRecording(gba->rr)) { - if (state->associatedStreamId != gba->rr->streamId) { - GBARRLoadStream(gba->rr, state->associatedStreamId); - GBARRIncrementStream(gba->rr, true); - } else { - GBARRFinishSegment(gba->rr); - } - GBARRMarkRerecord(gba->rr); - } else if (GBARRIsPlaying(gba->rr)) { - GBARRLoadStream(gba->rr, state->associatedStreamId); - GBARRSkipSegment(gba->rr); + if (gba->rr) { + gba->rr->stateLoaded(gba->rr, state); } } diff --git a/src/gba/supervisor/rr.c b/src/gba/supervisor/rr.c index 4e88bbdd4..06ffc07e0 100644 --- a/src/gba/supervisor/rr.c +++ b/src/gba/supervisor/rr.c @@ -5,63 +5,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "rr.h" -#include "gba/gba.h" -#include "gba/serialize.h" #include "util/vfs.h" -#define BINARY_EXT ".dat" -#define BINARY_MAGIC "GBAb" -#define METADATA_FILENAME "metadata" BINARY_EXT - -enum { - INVALID_INPUT = 0x8000 -}; - -static bool _emitMagic(struct GBARRContext* rr, struct VFile* vf); -static bool _verifyMagic(struct GBARRContext* rr, struct VFile* vf); -static enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf); -static bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag); -static bool _emitTag(struct GBARRContext* rr, struct VFile* vf, uint8_t tag); -static bool _emitEnd(struct GBARRContext* rr, struct VFile* vf); - -static bool _parseMetadata(struct GBARRContext* rr, struct VFile* vf); - -static bool _markStreamNext(struct GBARRContext* rr, uint32_t newStreamId, bool recursive); -static void _streamEndReached(struct GBARRContext* rr); - -static struct VFile* _openSavedata(struct GBARRContext* rr, int flags); -static struct VFile* _openSavestate(struct GBARRContext* rr, int flags); - -void GBARRContextCreate(struct GBA* gba) { - if (gba->rr) { - return; - } - - gba->rr = calloc(1, sizeof(*gba->rr)); -} - -void GBARRContextDestroy(struct GBA* gba) { - if (!gba->rr) { - return; - } - - if (GBARRIsPlaying(gba->rr)) { - GBARRStopPlaying(gba->rr); - } - if (GBARRIsRecording(gba->rr)) { - GBARRStopRecording(gba->rr); - } - if (gba->rr->metadataFile) { - gba->rr->metadataFile->close(gba->rr->metadataFile); - } - if (gba->rr->savedata) { - gba->rr->savedata->close(gba->rr->savedata); - } - - free(gba->rr); - gba->rr = 0; -} - void GBARRSaveState(struct GBA* gba) { if (!gba || !gba->rr) { return; @@ -71,17 +16,17 @@ void GBARRSaveState(struct GBA* gba) { if (gba->rr->savedata) { gba->rr->savedata->close(gba->rr->savedata); } - gba->rr->savedata = _openSavedata(gba->rr, O_TRUNC | O_CREAT | O_WRONLY); + gba->rr->savedata = gba->rr->openSavedata(gba->rr, O_TRUNC | O_CREAT | O_WRONLY); GBASavedataClone(&gba->memory.savedata, gba->rr->savedata); gba->rr->savedata->close(gba->rr->savedata); - gba->rr->savedata = _openSavedata(gba->rr, O_RDONLY); + gba->rr->savedata = gba->rr->openSavedata(gba->rr, O_RDONLY); GBASavedataMask(&gba->memory.savedata, gba->rr->savedata); } else { GBASavedataMask(&gba->memory.savedata, 0); } if (gba->rr->initFrom & INIT_FROM_SAVESTATE) { - struct VFile* vf = _openSavestate(gba->rr, O_TRUNC | O_CREAT | O_RDWR); + struct VFile* vf = gba->rr->openSavestate(gba->rr, O_TRUNC | O_CREAT | O_RDWR); GBASaveStateNamed(gba, vf, false); vf->close(vf); } else { @@ -98,475 +43,17 @@ void GBARRLoadState(struct GBA* gba) { if (gba->rr->savedata) { gba->rr->savedata->close(gba->rr->savedata); } - gba->rr->savedata = _openSavedata(gba->rr, O_RDONLY); + gba->rr->savedata = gba->rr->openSavedata(gba->rr, O_RDONLY); GBASavedataMask(&gba->memory.savedata, gba->rr->savedata); } else { GBASavedataMask(&gba->memory.savedata, 0); } if (gba->rr->initFrom & INIT_FROM_SAVESTATE) { - struct VFile* vf = _openSavestate(gba->rr, O_RDONLY); + struct VFile* vf = gba->rr->openSavestate(gba->rr, O_RDONLY); GBALoadStateNamed(gba, vf); vf->close(vf); } else { ARMReset(gba->cpu); } } - -bool GBARRInitStream(struct GBARRContext* rr, struct VDir* stream) { - if (rr->movieStream && !rr->movieStream->close(rr->movieStream)) { - return false; - } - - if (rr->metadataFile && !rr->metadataFile->close(rr->metadataFile)) { - return false; - } - - rr->streamDir = stream; - rr->metadataFile = rr->streamDir->openFile(rr->streamDir, METADATA_FILENAME, O_CREAT | O_RDWR); - rr->currentInput = INVALID_INPUT; - if (!_parseMetadata(rr, rr->metadataFile)) { - rr->metadataFile->close(rr->metadataFile); - rr->metadataFile = 0; - rr->maxStreamId = 0; - } - rr->streamId = 1; - rr->movieStream = 0; - return true; -} - -bool GBARRReinitStream(struct GBARRContext* rr, enum GBARRInitFrom initFrom) { - if (!rr) { - return false; - } - - if (rr->metadataFile) { - rr->metadataFile->truncate(rr->metadataFile, 0); - } else { - rr->metadataFile = rr->streamDir->openFile(rr->streamDir, METADATA_FILENAME, O_CREAT | O_TRUNC | O_RDWR); - } - _emitMagic(rr, rr->metadataFile); - - rr->initFrom = initFrom; - rr->initFromOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); - _emitTag(rr, rr->metadataFile, TAG_INIT | initFrom); - - rr->streamId = 0; - rr->maxStreamId = 0; - _emitTag(rr, rr->metadataFile, TAG_MAX_STREAM); - rr->maxStreamIdOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); - rr->metadataFile->write(rr->metadataFile, &rr->maxStreamId, sizeof(rr->maxStreamId)); - - rr->rrCount = 0; - _emitTag(rr, rr->metadataFile, TAG_RR_COUNT); - rr->rrCountOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); - rr->metadataFile->write(rr->metadataFile, &rr->rrCount, sizeof(rr->rrCount)); - return true; -} - -bool GBARRLoadStream(struct GBARRContext* rr, uint32_t streamId) { - if (rr->movieStream && !rr->movieStream->close(rr->movieStream)) { - return false; - } - rr->movieStream = 0; - rr->streamId = streamId; - rr->currentInput = INVALID_INPUT; - char buffer[14]; - snprintf(buffer, sizeof(buffer), "%u" BINARY_EXT, streamId); - if (GBARRIsRecording(rr)) { - int flags = O_CREAT | O_RDWR; - if (streamId > rr->maxStreamId) { - flags |= O_TRUNC; - } - rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, flags); - } else if (GBARRIsPlaying(rr)) { - rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, O_RDONLY); - rr->peekedTag = TAG_INVALID; - if (!rr->movieStream || !_verifyMagic(rr, rr->movieStream) || !_seekTag(rr, rr->movieStream, TAG_BEGIN)) { - GBARRStopPlaying(rr); - } - } - GBALog(0, GBA_LOG_DEBUG, "[RR] Loading segment: %u", streamId); - rr->frames = 0; - rr->lagFrames = 0; - return true; -} - -bool GBARRIncrementStream(struct GBARRContext* rr, bool recursive) { - uint32_t newStreamId = rr->maxStreamId + 1; - uint32_t oldStreamId = rr->streamId; - if (GBARRIsRecording(rr) && rr->movieStream) { - if (!_markStreamNext(rr, newStreamId, recursive)) { - return false; - } - } - if (!GBARRLoadStream(rr, newStreamId)) { - return false; - } - GBALog(0, GBA_LOG_DEBUG, "[RR] New segment: %u", newStreamId); - _emitMagic(rr, rr->movieStream); - rr->maxStreamId = newStreamId; - _emitTag(rr, rr->movieStream, TAG_PREVIOUSLY); - rr->movieStream->write(rr->movieStream, &oldStreamId, sizeof(oldStreamId)); - _emitTag(rr, rr->movieStream, TAG_BEGIN); - - rr->metadataFile->seek(rr->metadataFile, rr->maxStreamIdOffset, SEEK_SET); - rr->metadataFile->write(rr->metadataFile, &rr->maxStreamId, sizeof(rr->maxStreamId)); - rr->previously = oldStreamId; - return true; -} - -bool GBARRStartPlaying(struct GBARRContext* rr, bool autorecord) { - if (GBARRIsRecording(rr) || GBARRIsPlaying(rr)) { - return false; - } - - rr->isPlaying = true; - if (!GBARRLoadStream(rr, 1)) { - rr->isPlaying = false; - return false; - } - rr->autorecord = autorecord; - return true; -} - -void GBARRStopPlaying(struct GBARRContext* rr) { - if (!GBARRIsPlaying(rr)) { - return; - } - rr->isPlaying = false; - if (rr->movieStream) { - rr->movieStream->close(rr->movieStream); - rr->movieStream = 0; - } -} - -bool GBARRStartRecording(struct GBARRContext* rr) { - if (GBARRIsRecording(rr) || GBARRIsPlaying(rr)) { - return false; - } - - if (!rr->maxStreamIdOffset) { - _emitTag(rr, rr->metadataFile, TAG_MAX_STREAM); - rr->maxStreamIdOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); - rr->metadataFile->write(rr->metadataFile, &rr->maxStreamId, sizeof(rr->maxStreamId)); - } - - rr->isRecording = true; - return GBARRIncrementStream(rr, false); -} - -void GBARRStopRecording(struct GBARRContext* rr) { - if (!GBARRIsRecording(rr)) { - return; - } - rr->isRecording = false; - if (rr->movieStream) { - _emitEnd(rr, rr->movieStream); - rr->movieStream->close(rr->movieStream); - rr->movieStream = 0; - } -} - -bool GBARRIsPlaying(struct GBARRContext* rr) { - return rr && rr->isPlaying; -} - -bool GBARRIsRecording(struct GBARRContext* rr) { - return rr && rr->isRecording; -} - -void GBARRNextFrame(struct GBARRContext* rr) { - if (!GBARRIsRecording(rr) && !GBARRIsPlaying(rr)) { - return; - } - - if (GBARRIsPlaying(rr)) { - while (rr->peekedTag == TAG_INPUT) { - _readTag(rr, rr->movieStream); - GBALog(0, GBA_LOG_WARN, "[RR] Desync detected!"); - } - if (rr->peekedTag == TAG_LAG) { - GBALog(0, GBA_LOG_DEBUG, "[RR] Lag frame marked in stream"); - if (rr->inputThisFrame) { - GBALog(0, GBA_LOG_WARN, "[RR] Lag frame in stream does not match movie"); - } - } - } - - ++rr->frames; - GBALog(0, GBA_LOG_DEBUG, "[RR] Frame: %u", rr->frames); - if (!rr->inputThisFrame) { - ++rr->lagFrames; - GBALog(0, GBA_LOG_DEBUG, "[RR] Lag frame: %u", rr->lagFrames); - } - - if (GBARRIsRecording(rr)) { - if (!rr->inputThisFrame) { - _emitTag(rr, rr->movieStream, TAG_LAG); - } - _emitTag(rr, rr->movieStream, TAG_FRAME); - rr->inputThisFrame = false; - } else { - if (!_seekTag(rr, rr->movieStream, TAG_FRAME)) { - _streamEndReached(rr); - } - } -} - -void GBARRLogInput(struct GBARRContext* rr, uint16_t keys) { - if (!GBARRIsRecording(rr)) { - return; - } - - if (keys != rr->currentInput) { - _emitTag(rr, rr->movieStream, TAG_INPUT); - rr->movieStream->write(rr->movieStream, &keys, sizeof(keys)); - rr->currentInput = keys; - } - GBALog(0, GBA_LOG_DEBUG, "[RR] Input log: %03X", rr->currentInput); - rr->inputThisFrame = true; -} - -uint16_t GBARRQueryInput(struct GBARRContext* rr) { - if (!GBARRIsPlaying(rr)) { - return 0; - } - - if (rr->peekedTag == TAG_INPUT) { - _readTag(rr, rr->movieStream); - } - rr->inputThisFrame = true; - if (rr->currentInput == INVALID_INPUT) { - GBALog(0, GBA_LOG_WARN, "[RR] Stream did not specify input"); - } - GBALog(0, GBA_LOG_DEBUG, "[RR] Input replay: %03X", rr->currentInput); - return rr->currentInput; -} - -bool GBARRFinishSegment(struct GBARRContext* rr) { - if (rr->movieStream) { - if (!_emitEnd(rr, rr->movieStream)) { - return false; - } - } - return GBARRIncrementStream(rr, false); -} - -bool GBARRSkipSegment(struct GBARRContext* rr) { - rr->nextTime = 0; - while (_readTag(rr, rr->movieStream) != TAG_EOF); - if (!rr->nextTime || !GBARRLoadStream(rr, rr->nextTime)) { - _streamEndReached(rr); - return false; - } - return true; -} - -bool GBARRMarkRerecord(struct GBARRContext* rr) { - ++rr->rrCount; - rr->metadataFile->seek(rr->metadataFile, rr->rrCountOffset, SEEK_SET); - rr->metadataFile->write(rr->metadataFile, &rr->rrCount, sizeof(rr->rrCount)); - return true; -} - -bool _emitMagic(struct GBARRContext* rr, struct VFile* vf) { - UNUSED(rr); - return vf->write(vf, BINARY_MAGIC, 4) == 4; -} - -bool _verifyMagic(struct GBARRContext* rr, struct VFile* vf) { - UNUSED(rr); - char buffer[4]; - if (vf->read(vf, buffer, sizeof(buffer)) != sizeof(buffer)) { - return false; - } - if (memcmp(buffer, BINARY_MAGIC, sizeof(buffer)) != 0) { - return false; - } - return true; -} - -enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf) { - if (!rr || !vf) { - return TAG_EOF; - } - - enum GBARRTag tag = rr->peekedTag; - switch (tag) { - case TAG_INPUT: - vf->read(vf, &rr->currentInput, sizeof(uint16_t)); - break; - case TAG_PREVIOUSLY: - vf->read(vf, &rr->previously, sizeof(rr->previously)); - break; - case TAG_NEXT_TIME: - vf->read(vf, &rr->nextTime, sizeof(rr->nextTime)); - break; - case TAG_MAX_STREAM: - vf->read(vf, &rr->maxStreamId, sizeof(rr->maxStreamId)); - break; - case TAG_FRAME_COUNT: - vf->read(vf, &rr->frames, sizeof(rr->frames)); - break; - case TAG_LAG_COUNT: - vf->read(vf, &rr->lagFrames, sizeof(rr->lagFrames)); - break; - case TAG_RR_COUNT: - vf->read(vf, &rr->rrCount, sizeof(rr->rrCount)); - break; - - case TAG_INIT_EX_NIHILO: - rr->initFrom = INIT_EX_NIHILO; - break; - case TAG_INIT_FROM_SAVEGAME: - rr->initFrom = INIT_FROM_SAVEGAME; - break; - case TAG_INIT_FROM_SAVESTATE: - rr->initFrom = INIT_FROM_SAVESTATE; - break; - case TAG_INIT_FROM_BOTH: - rr->initFrom = INIT_FROM_BOTH; - break; - - // To be spec'd - case TAG_AUTHOR: - case TAG_COMMENT: - break; - - // Empty markers - case TAG_FRAME: - case TAG_LAG: - case TAG_BEGIN: - case TAG_END: - case TAG_INVALID: - case TAG_EOF: - break; - } - - uint8_t tagBuffer; - if (vf->read(vf, &tagBuffer, 1) != 1) { - rr->peekedTag = TAG_EOF; - } else { - rr->peekedTag = tagBuffer; - } - - if (rr->peekedTag == TAG_END) { - GBARRSkipSegment(rr); - } - return tag; -} - -bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag) { - enum GBARRTag readTag; - while ((readTag = _readTag(rr, vf)) != tag) { - if (readTag == TAG_EOF) { - return false; - } - } - return true; -} - -bool _emitTag(struct GBARRContext* rr, struct VFile* vf, uint8_t tag) { - UNUSED(rr); - return vf->write(vf, &tag, sizeof(tag)) == sizeof(tag); -} - -bool _parseMetadata(struct GBARRContext* rr, struct VFile* vf) { - if (!_verifyMagic(rr, vf)) { - return false; - } - while (_readTag(rr, vf) != TAG_EOF) { - switch (rr->peekedTag) { - case TAG_MAX_STREAM: - rr->maxStreamIdOffset = vf->seek(vf, 0, SEEK_CUR); - break; - case TAG_INIT_EX_NIHILO: - case TAG_INIT_FROM_SAVEGAME: - case TAG_INIT_FROM_SAVESTATE: - case TAG_INIT_FROM_BOTH: - rr->initFromOffset = vf->seek(vf, 0, SEEK_CUR); - break; - case TAG_RR_COUNT: - rr->rrCountOffset = vf->seek(vf, 0, SEEK_CUR); - break; - default: - break; - } - } - return true; -} - -bool _emitEnd(struct GBARRContext* rr, struct VFile* vf) { - // TODO: Error check - _emitTag(rr, vf, TAG_END); - _emitTag(rr, vf, TAG_FRAME_COUNT); - vf->write(vf, &rr->frames, sizeof(rr->frames)); - _emitTag(rr, vf, TAG_LAG_COUNT); - vf->write(vf, &rr->lagFrames, sizeof(rr->lagFrames)); - _emitTag(rr, vf, TAG_NEXT_TIME); - - uint32_t newStreamId = 0; - vf->write(vf, &newStreamId, sizeof(newStreamId)); - return true; -} - -bool _markStreamNext(struct GBARRContext* rr, uint32_t newStreamId, bool recursive) { - if (rr->movieStream->seek(rr->movieStream, -sizeof(newStreamId) - 1, SEEK_END) < 0) { - return false; - } - - uint8_t tagBuffer; - if (rr->movieStream->read(rr->movieStream, &tagBuffer, 1) != 1) { - return false; - } - if (tagBuffer != TAG_NEXT_TIME) { - return false; - } - if (rr->movieStream->write(rr->movieStream, &newStreamId, sizeof(newStreamId)) != sizeof(newStreamId)) { - return false; - } - if (recursive) { - if (rr->movieStream->seek(rr->movieStream, 0, SEEK_SET) < 0) { - return false; - } - if (!_verifyMagic(rr, rr->movieStream)) { - return false; - } - _readTag(rr, rr->movieStream); - if (_readTag(rr, rr->movieStream) != TAG_PREVIOUSLY) { - return false; - } - if (rr->previously == 0) { - return true; - } - uint32_t currentStreamId = rr->streamId; - if (!GBARRLoadStream(rr, rr->previously)) { - return false; - } - return _markStreamNext(rr, currentStreamId, rr->previously); - } - return true; -} - -void _streamEndReached(struct GBARRContext* rr) { - if (!GBARRIsPlaying(rr)) { - return; - } - - uint32_t endStreamId = rr->streamId; - GBARRStopPlaying(rr); - if (rr->autorecord) { - rr->isRecording = true; - GBARRLoadStream(rr, endStreamId); - GBARRIncrementStream(rr, false); - } -} - -struct VFile* _openSavedata(struct GBARRContext* rr, int flags) { - return rr->streamDir->openFile(rr->streamDir, "movie.sav", flags); -} - -struct VFile* _openSavestate(struct GBARRContext* rr, int flags) { - return rr->streamDir->openFile(rr->streamDir, "movie.ssm", flags); -} diff --git a/src/gba/supervisor/rr.h b/src/gba/supervisor/rr.h index fb94ae02d..ae0b2b832 100644 --- a/src/gba/supervisor/rr.h +++ b/src/gba/supervisor/rr.h @@ -8,8 +8,8 @@ #include "util/common.h" -struct GBA; -struct VDir; +#include "gba/serialize.h" + struct VFile; enum GBARRInitFrom { @@ -19,95 +19,32 @@ enum GBARRInitFrom { INIT_FROM_BOTH = 3, }; -enum GBARRTag { - // Playback tags - TAG_INVALID = 0x00, - TAG_INPUT = 0x01, - TAG_FRAME = 0x02, - TAG_LAG = 0x03, - - // Stream chunking tags - TAG_BEGIN = 0x10, - TAG_END = 0x11, - TAG_PREVIOUSLY = 0x12, - TAG_NEXT_TIME = 0x13, - TAG_MAX_STREAM = 0x14, - - // Recording information tags - TAG_FRAME_COUNT = 0x20, - TAG_LAG_COUNT = 0x21, - TAG_RR_COUNT = 0x22, - TAG_INIT = 0x24, - TAG_INIT_EX_NIHILO = 0x24 | INIT_EX_NIHILO, - TAG_INIT_FROM_SAVEGAME = 0x24 | INIT_FROM_SAVEGAME, - TAG_INIT_FROM_SAVESTATE = 0x24 | INIT_FROM_SAVESTATE, - TAG_INIT_FROM_BOTH = 0x24 | INIT_FROM_BOTH, - - // User metadata tags - TAG_AUTHOR = 0x30, - TAG_COMMENT = 0x31, - - TAG_EOF = INT_MAX -}; - struct GBARRContext { - // Playback state - bool isPlaying; - bool autorecord; + bool (*startPlaying)(struct GBARRContext*, bool autorecord); + void (*stopPlaying)(struct GBARRContext*); + bool (*startRecording)(struct GBARRContext*); + void (*stopRecording)(struct GBARRContext*); - // Recording state - bool isRecording; - bool inputThisFrame; + bool (*isPlaying)(const struct GBARRContext*); + bool (*isRecording)(const struct GBARRContext*); + + void (*nextFrame)(struct GBARRContext*); + void (*logInput)(struct GBARRContext*, uint16_t input); + uint16_t (*queryInput)(struct GBARRContext*); + + void (*stateSaved)(struct GBARRContext*, struct GBASerializedState*); + void (*stateLoaded)(struct GBARRContext*, const struct GBASerializedState*); + + struct VFile* (*openSavedata)(struct GBARRContext* mgm, int flags); + struct VFile* (*openSavestate)(struct GBARRContext* mgm, int flags); - // Metadata uint32_t frames; uint32_t lagFrames; - uint32_t streamId; - - uint32_t maxStreamId; - off_t maxStreamIdOffset; - enum GBARRInitFrom initFrom; - off_t initFromOffset; uint32_t rrCount; - off_t rrCountOffset; struct VFile* savedata; - - // Streaming state - struct VDir* streamDir; - struct VFile* metadataFile; - struct VFile* movieStream; - uint16_t currentInput; - enum GBARRTag peekedTag; - uint32_t nextTime; - uint32_t previously; }; -void GBARRContextCreate(struct GBA*); -void GBARRContextDestroy(struct GBA*); -void GBARRSaveState(struct GBA*); -void GBARRLoadState(struct GBA*); - -bool GBARRInitStream(struct GBARRContext*, struct VDir*); -bool GBARRReinitStream(struct GBARRContext*, enum GBARRInitFrom); -bool GBARRLoadStream(struct GBARRContext*, uint32_t streamId); -bool GBARRIncrementStream(struct GBARRContext*, bool recursive); -bool GBARRFinishSegment(struct GBARRContext*); -bool GBARRSkipSegment(struct GBARRContext*); -bool GBARRMarkRerecord(struct GBARRContext*); - -bool GBARRStartPlaying(struct GBARRContext*, bool autorecord); -void GBARRStopPlaying(struct GBARRContext*); -bool GBARRStartRecording(struct GBARRContext*); -void GBARRStopRecording(struct GBARRContext*); - -bool GBARRIsPlaying(struct GBARRContext*); -bool GBARRIsRecording(struct GBARRContext*); - -void GBARRNextFrame(struct GBARRContext*); -void GBARRLogInput(struct GBARRContext*, uint16_t input); -uint16_t GBARRQueryInput(struct GBARRContext*); - #endif From f69d9db9d46322a71761c7f98da21a3da8c5dbe4 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 14:10:23 -0800 Subject: [PATCH 019/101] GBA RR: Add way to play movies from startup --- src/gba/rr/mgm.c | 17 ++++++----------- src/gba/rr/mgm.h | 1 - src/gba/supervisor/rr.c | 18 ++++++++++++++++-- src/gba/supervisor/rr.h | 7 +++++++ src/gba/supervisor/thread.c | 33 +++++++++++++++++++++++++++++++++ src/gba/supervisor/thread.h | 1 + src/platform/commandline.c | 14 +++++++++++--- src/platform/commandline.h | 1 + 8 files changed, 75 insertions(+), 17 deletions(-) diff --git a/src/gba/rr/mgm.c b/src/gba/rr/mgm.c index bc487a7b2..cf7f46c2b 100644 --- a/src/gba/rr/mgm.c +++ b/src/gba/rr/mgm.c @@ -17,6 +17,8 @@ enum { INVALID_INPUT = 0x8000 }; +static void GBAMGMContextDestroy(struct GBARRContext*); + static bool GBAMGMStartPlaying(struct GBARRContext*, bool autorecord); static void GBAMGMStopPlaying(struct GBARRContext*); static bool GBAMGMStartRecording(struct GBARRContext*); @@ -56,6 +58,8 @@ static struct VFile* GBAMGMOpenSavestate(struct GBARRContext*, int flags); void GBAMGMContextCreate(struct GBAMGMContext* mgm) { memset(mgm, 0, sizeof(*mgm)); + mgm->d.destroy = GBAMGMContextDestroy; + mgm->d.startPlaying = GBAMGMStartPlaying; mgm->d.stopPlaying = GBAMGMStopPlaying; mgm->d.startRecording = GBAMGMStartRecording; @@ -75,20 +79,11 @@ void GBAMGMContextCreate(struct GBAMGMContext* mgm) { mgm->d.openSavestate = GBAMGMOpenSavestate; } -void GBAMGMContextDestroy(struct GBAMGMContext* mgm) { - if (mgm->d.isPlaying(&mgm->d)) { - mgm->d.stopPlaying(&mgm->d); - } - if (mgm->d.isRecording(&mgm->d)) { - mgm->d.stopRecording(&mgm->d); - } +void GBAMGMContextDestroy(struct GBARRContext* rr) { + struct GBAMGMContext* mgm = (struct GBAMGMContext*) rr; if (mgm->metadataFile) { mgm->metadataFile->close(mgm->metadataFile); } - if (mgm->d.savedata) { - mgm->d.savedata->close(mgm->d.savedata); - mgm->d.savedata = 0; - } } bool GBAMGMSetStream(struct GBAMGMContext* mgm, struct VDir* stream) { diff --git a/src/gba/rr/mgm.h b/src/gba/rr/mgm.h index 3b08655ca..a0d0a860f 100644 --- a/src/gba/rr/mgm.h +++ b/src/gba/rr/mgm.h @@ -75,7 +75,6 @@ struct GBAMGMContext { }; void GBAMGMContextCreate(struct GBAMGMContext*); -void GBAMGMContextDestroy(struct GBAMGMContext*); bool GBAMGMSetStream(struct GBAMGMContext* mgm, struct VDir* stream); bool GBAMGMCreateStream(struct GBAMGMContext* mgm, enum GBARRInitFrom initFrom); diff --git a/src/gba/supervisor/rr.c b/src/gba/supervisor/rr.c index 06ffc07e0..d3b799df1 100644 --- a/src/gba/supervisor/rr.c +++ b/src/gba/supervisor/rr.c @@ -7,7 +7,7 @@ #include "util/vfs.h" -void GBARRSaveState(struct GBA* gba) { +void GBARRInitRecord(struct GBA* gba) { if (!gba || !gba->rr) { return; } @@ -34,7 +34,7 @@ void GBARRSaveState(struct GBA* gba) { } } -void GBARRLoadState(struct GBA* gba) { +void GBARRInitPlay(struct GBA* gba) { if (!gba || !gba->rr) { return; } @@ -57,3 +57,17 @@ void GBARRLoadState(struct GBA* gba) { ARMReset(gba->cpu); } } + +void GBARRDestroy(struct GBARRContext* rr) { + if (rr->isPlaying(rr)) { + rr->stopPlaying(rr); + } + if (rr->isRecording(rr)) { + rr->stopRecording(rr); + } + if (rr->savedata) { + rr->savedata->close(rr->savedata); + rr->savedata = 0; + } + rr->destroy(rr); +} diff --git a/src/gba/supervisor/rr.h b/src/gba/supervisor/rr.h index ae0b2b832..940f9c425 100644 --- a/src/gba/supervisor/rr.h +++ b/src/gba/supervisor/rr.h @@ -20,6 +20,8 @@ enum GBARRInitFrom { }; struct GBARRContext { + void (*destroy)(struct GBARRContext*); + bool (*startPlaying)(struct GBARRContext*, bool autorecord); void (*stopPlaying)(struct GBARRContext*); bool (*startRecording)(struct GBARRContext*); @@ -47,4 +49,9 @@ struct GBARRContext { struct VFile* savedata; }; +void GBARRDestroy(struct GBARRContext*); + +void GBARRInitRecord(struct GBA*); +void GBARRInitPlay(struct GBA*); + #endif diff --git a/src/gba/supervisor/thread.c b/src/gba/supervisor/thread.c index e3b29627e..7c6a1677e 100644 --- a/src/gba/supervisor/thread.c +++ b/src/gba/supervisor/thread.c @@ -10,6 +10,7 @@ #include "gba/cheats.h" #include "gba/serialize.h" #include "gba/supervisor/config.h" +#include "gba/rr/mgm.h" #include "debugger/debugger.h" @@ -117,6 +118,7 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { struct GBACheatDevice cheatDevice; struct GBAThread* threadContext = context; struct ARMComponent* components[GBA_COMPONENT_MAX] = {}; + struct GBARRContext* movie = 0; int numComponents = GBA_COMPONENT_MAX; #if !defined(_WIN32) && defined(USE_PTHREADS) @@ -170,7 +172,32 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { } } + if (threadContext->movie) { + struct VDir* movieDir = VDirOpen(threadContext->movie); +#ifdef ENABLE_LIBZIP + if (!movieDir) { + movieDir = VDirOpenZip(threadContext->movie, 0); + } +#endif + if (movieDir) { + struct GBAMGMContext* mgm = malloc(sizeof(*mgm)); + GBAMGMContextCreate(mgm); + if (!GBAMGMSetStream(mgm, movieDir)) { + mgm->d.destroy(&mgm->d); + } else { + movie = &mgm->d; + } + } + } + ARMReset(&cpu); + + if (movie) { + gba.rr = movie; + movie->startPlaying(movie, false); + GBARRInitPlay(&gba); + } + if (threadContext->skipBios) { GBASkipBIOS(&cpu); } @@ -256,6 +283,11 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { GBACheatDeviceDestroy(&cheatDevice); } + if (movie) { + movie->destroy(movie); + free(movie); + } + threadContext->sync.videoFrameOn = false; ConditionWake(&threadContext->sync.videoFrameAvailableCond); ConditionWake(&threadContext->sync.audioRequiredCond); @@ -309,6 +341,7 @@ void GBAMapArgumentsToContext(const struct GBAArguments* args, struct GBAThread* threadContext->fname = args->fname; threadContext->patch = VFileOpen(args->patch, O_RDONLY); threadContext->cheatsFile = VFileOpen(args->cheatsFile, O_RDONLY); + threadContext->movie = args->movie; } bool GBAThreadStart(struct GBAThread* threadContext) { diff --git a/src/gba/supervisor/thread.h b/src/gba/supervisor/thread.h index 837deaae8..11b435d26 100644 --- a/src/gba/supervisor/thread.h +++ b/src/gba/supervisor/thread.h @@ -72,6 +72,7 @@ struct GBAThread { struct VFile* patch; struct VFile* cheatsFile; const char* fname; + const char* movie; int activeKeys; struct GBAAVStream* stream; struct Configuration* overrides; diff --git a/src/platform/commandline.c b/src/platform/commandline.c index bee0a608b..3a4456202 100644 --- a/src/platform/commandline.c +++ b/src/platform/commandline.c @@ -34,8 +34,8 @@ static const struct option _options[] = { { "bios", required_argument, 0, 'b' }, - { "cheats", required_argument, 0, 'c' }, - { "dirmode", required_argument, 0, 'D' }, + { "cheats", required_argument, 0, 'c' }, + { "dirmode", required_argument, 0, 'D' }, { "frameskip", required_argument, 0, 's' }, #ifdef USE_CLI_DEBUGGER { "debug", no_argument, 0, 'd' }, @@ -43,6 +43,7 @@ static const struct option _options[] = { #ifdef USE_GDB_STUB { "gdb", no_argument, 0, 'g' }, #endif + { "movie", required_argument, 0, 'v' }, { "patch", required_argument, 0, 'p' }, { 0, 0, 0, 0 } }; @@ -52,7 +53,7 @@ bool _parseGraphicsArg(struct SubParser* parser, struct GBAConfig* config, int o bool parseArguments(struct GBAArguments* opts, struct GBAConfig* config, int argc, char* const* argv, struct SubParser* subparser) { int ch; char options[64] = - "b:c:Dl:p:s:" + "b:c:Dl:p:s:v:" #ifdef USE_CLI_DEBUGGER "d" #endif @@ -101,6 +102,9 @@ bool parseArguments(struct GBAArguments* opts, struct GBAConfig* config, int arg case 's': GBAConfigSetDefaultValue(config, "frameskip", optarg); break; + case 'v': + opts->movie = strdup(optarg); + break; default: if (subparser) { if (!subparser->parse(subparser, config, ch, optarg)) { @@ -125,6 +129,9 @@ void freeArguments(struct GBAArguments* opts) { free(opts->patch); opts->patch = 0; + + free(opts->movie); + opts->movie = 0; } void initParserForGraphics(struct SubParser* parser, struct GraphicsOpts* opts) { @@ -211,6 +218,7 @@ void usage(const char* arg0, const char* extraOptions) { #ifdef USE_GDB_STUB puts(" -g, --gdb Start GDB session (default port 2345)"); #endif + puts(" -v, --movie FILE Play back a movie of recorded input"); puts(" -p, --patch FILE Apply a specified patch file when running"); puts(" -s, --frameskip N Skip every N frames"); if (extraOptions) { diff --git a/src/platform/commandline.h b/src/platform/commandline.h index a360c335d..97ac22240 100644 --- a/src/platform/commandline.h +++ b/src/platform/commandline.h @@ -26,6 +26,7 @@ struct GBAArguments { char* patch; char* cheatsFile; bool dirmode; + char* movie; enum DebuggerType debuggerType; bool debugAtStart; From a268d462c0ed4d834cf1035bbb645cea2978c86e Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 14:25:35 -0800 Subject: [PATCH 020/101] GBA RR: Add VBM parser, for comparing VBA sync --- src/gba/rr/vbm.c | 183 ++++++++++++++++++++++++++++++++++++ src/gba/rr/vbm.h | 21 +++++ src/gba/supervisor/thread.c | 12 +++ 3 files changed, 216 insertions(+) create mode 100644 src/gba/rr/vbm.c create mode 100644 src/gba/rr/vbm.h diff --git a/src/gba/rr/vbm.c b/src/gba/rr/vbm.c new file mode 100644 index 000000000..717d5f195 --- /dev/null +++ b/src/gba/rr/vbm.c @@ -0,0 +1,183 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "vbm.h" + +#include "gba/gba.h" +#include "gba/serialize.h" +#include "util/vfs.h" + +static const char VBM_MAGIC[] = "VBM\x1A"; + +static void GBAVBMContextDestroy(struct GBARRContext*); + +static bool GBAVBMStartPlaying(struct GBARRContext*, bool autorecord); +static void GBAVBMStopPlaying(struct GBARRContext*); +static bool GBAVBMStartRecording(struct GBARRContext*); +static void GBAVBMStopRecording(struct GBARRContext*); + +static bool GBAVBMIsPlaying(const struct GBARRContext*); +static bool GBAVBMIsRecording(const struct GBARRContext*); + +static void GBAVBMNextFrame(struct GBARRContext*); +static uint16_t GBAVBMQueryInput(struct GBARRContext*); + +static void GBAVBMStateSaved(struct GBARRContext* rr, struct GBASerializedState* state); +static void GBAVBMStateLoaded(struct GBARRContext* rr, const struct GBASerializedState* state); + +static struct VFile* GBAVBMOpenSavedata(struct GBARRContext*, int flags); +static struct VFile* GBAVBMOpenSavestate(struct GBARRContext*, int flags); + +void GBAVBMContextCreate(struct GBAVBMContext* vbm) { + memset(vbm, 0, sizeof(*vbm)); + + vbm->d.destroy = GBAVBMContextDestroy; + + vbm->d.startPlaying = GBAVBMStartPlaying; + vbm->d.stopPlaying = GBAVBMStopPlaying; + vbm->d.startRecording = GBAVBMStartRecording; + vbm->d.stopRecording = GBAVBMStopRecording; + + vbm->d.isPlaying = GBAVBMIsPlaying; + vbm->d.isRecording = GBAVBMIsRecording; + + vbm->d.nextFrame = GBAVBMNextFrame; + vbm->d.logInput = 0; + vbm->d.queryInput = GBAVBMQueryInput; + + vbm->d.stateSaved = GBAVBMStateSaved; + vbm->d.stateLoaded = GBAVBMStateLoaded; + + vbm->d.openSavedata = GBAVBMOpenSavedata; + vbm->d.openSavestate = GBAVBMOpenSavestate; +} + +bool GBAVBMStartPlaying(struct GBARRContext* rr, bool autorecord) { + if (rr->isRecording(rr) || rr->isPlaying(rr) || autorecord) { + return false; + } + + struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; + vbm->isPlaying = true; + vbm->vbmFile->seek(vbm->vbmFile, vbm->inputOffset, SEEK_SET); + return true; +} + +void GBAVBMStopPlaying(struct GBARRContext* rr) { + if (!rr->isPlaying(rr)) { + return; + } + + struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; + vbm->isPlaying = false; +} + +bool GBAVBMStartRecording(struct GBARRContext* rr) { + UNUSED(rr); + return false; +} + +void GBAVBMStopRecording(struct GBARRContext* rr) { + UNUSED(rr); +} + +bool GBAVBMIsPlaying(const struct GBARRContext* rr) { + struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; + return vbm->isPlaying; +} + +bool GBAVBMIsRecording(const struct GBARRContext* rr) { + UNUSED(rr); + return false; +} + +void GBAVBMNextFrame(struct GBARRContext* rr) { + UNUSED(rr); +} + +uint16_t GBAVBMQueryInput(struct GBARRContext* rr) { + if (!rr->isPlaying(rr)) { + return 0; + } + + struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; + uint16_t input; + vbm->vbmFile->read(vbm->vbmFile, &input, sizeof(input)); + return input & 0x3FF; +} + +void GBAVBMStateSaved(struct GBARRContext* rr, struct GBASerializedState* state) { + UNUSED(rr); + UNUSED(state); +} + +void GBAVBMStateLoaded(struct GBARRContext* rr, const struct GBASerializedState* state) { + UNUSED(rr); + UNUSED(state); +} + +struct VFile* GBAVBMOpenSavedata(struct GBARRContext* rr, int flags) { + UNUSED(rr); + UNUSED(flags); + return 0; +} + +struct VFile* GBAVBMOpenSavestate(struct GBARRContext* rr, int flags) { + UNUSED(rr); + UNUSED(flags); + return 0; +} + +void GBAVBMContextDestroy(struct GBARRContext* rr) { + struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; + if (vbm->vbmFile) { + vbm->vbmFile->close(vbm->vbmFile); + } +} + +bool GBAVBMSetStream(struct GBAVBMContext* vbm, struct VFile* vf) { + vf->seek(vf, 0, SEEK_SET); + char magic[4]; + vf->read(vf, magic, sizeof(magic)); + if (memcmp(magic, VBM_MAGIC, sizeof(magic)) != 0) { + return false; + } + + uint32_t id; + vf->read(vf, &id, sizeof(id)); + if (id != 1) { + return false; + } + + vf->seek(vf, 4, SEEK_CUR); + vf->read(vf, &vbm->d.frames, sizeof(vbm->d.frames)); + vf->read(vf, &vbm->d.rrCount, sizeof(vbm->d.rrCount)); + + uint8_t flags; + vf->read(vf, &flags, sizeof(flags)); + if (flags & 1) { + // Incompatible savestate format + return false; + } + if (flags & 2) { + // TODO: Implement SRAM loading + return false; + } + + vf->seek(vf, 1, SEEK_CUR); + vf->read(vf, &flags, sizeof(flags)); + if ((flags & 0x7) != 1) { + // Non-GBA movie + return false; + } + + // TODO: parse more flags + + vf->seek(vf, 0x3C, SEEK_SET); + vf->read(vf, &vbm->inputOffset, sizeof(vbm->inputOffset)); + vf->seek(vf, vbm->inputOffset, SEEK_SET); + vbm->vbmFile = vf; + return true; +} diff --git a/src/gba/rr/vbm.h b/src/gba/rr/vbm.h new file mode 100644 index 000000000..c9a503cf4 --- /dev/null +++ b/src/gba/rr/vbm.h @@ -0,0 +1,21 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "util/common.h" + +#include "gba/supervisor/rr.h" + +struct GBAVBMContext { + struct GBARRContext d; + + bool isPlaying; + + struct VFile* vbmFile; + int32_t inputOffset; +}; + +void GBAVBMContextCreate(struct GBAVBMContext*); + +bool GBAVBMSetStream(struct GBAVBMContext*, struct VFile*); diff --git a/src/gba/supervisor/thread.c b/src/gba/supervisor/thread.c index 7c6a1677e..a8eb1bc09 100644 --- a/src/gba/supervisor/thread.c +++ b/src/gba/supervisor/thread.c @@ -11,6 +11,7 @@ #include "gba/serialize.h" #include "gba/supervisor/config.h" #include "gba/rr/mgm.h" +#include "gba/rr/vbm.h" #include "debugger/debugger.h" @@ -187,6 +188,17 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { } else { movie = &mgm->d; } + } else { + struct VFile* movieFile = VFileOpen(threadContext->movie, O_RDONLY); + if (movieFile) { + struct GBAVBMContext* vbm = malloc(sizeof(*vbm)); + GBAVBMContextCreate(vbm); + if (!GBAVBMSetStream(vbm, movieFile)) { + vbm->d.destroy(&vbm->d); + } else { + movie = &vbm->d; + } + } } } From 9adfcad1b56e5f42410390e8cb6cfce6f5043134 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 18:40:33 -0800 Subject: [PATCH 021/101] Util: Cleanup of VFileZip and VFile7z --- src/util/vfs.c | 12 ++++++++++++ src/util/vfs.h | 2 ++ src/util/vfs/vfs-lzma.c | 28 ++++++---------------------- src/util/vfs/vfs-zip.c | 15 +-------------- 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/util/vfs.c b/src/util/vfs.c index 291185aa2..d706d0b32 100644 --- a/src/util/vfs.c +++ b/src/util/vfs.c @@ -378,3 +378,15 @@ const char* _vdeName(struct VDirEntry* vde) { } return 0; } + +ssize_t VFileReadline(struct VFile* vf, char* buffer, size_t size) { + size_t bytesRead = 0; + while (bytesRead < size - 1) { + size_t newRead = vf->read(vf, &buffer[bytesRead], 1); + bytesRead += newRead; + if (!newRead || buffer[bytesRead] == '\n') { + break; + } + } + return buffer[bytesRead] = '\0'; +} diff --git a/src/util/vfs.h b/src/util/vfs.h index 0fc0cbf5a..30c45cbfb 100644 --- a/src/util/vfs.h +++ b/src/util/vfs.h @@ -52,4 +52,6 @@ struct VDir* VDirOpen7z(const char* path, int flags); struct VFile* VDirOptionalOpenFile(struct VDir* dir, const char* realPath, const char* prefix, const char* suffix, int mode); struct VFile* VDirOptionalOpenIncrementFile(struct VDir* dir, const char* realPath, const char* prefix, const char* infix, const char* suffix, int mode); +ssize_t VFileReadline(struct VFile* vf, char* buffer, size_t size); + #endif diff --git a/src/util/vfs/vfs-lzma.c b/src/util/vfs/vfs-lzma.c index e429d7f29..dff53156a 100644 --- a/src/util/vfs/vfs-lzma.c +++ b/src/util/vfs/vfs-lzma.c @@ -51,7 +51,6 @@ struct VFile7z { static bool _vf7zClose(struct VFile* vf); static off_t _vf7zSeek(struct VFile* vf, off_t offset, int whence); static ssize_t _vf7zRead(struct VFile* vf, void* buffer, size_t size); -static ssize_t _vf7zReadline(struct VFile* vf, char* buffer, size_t size); static ssize_t _vf7zWrite(struct VFile* vf, const void* buffer, size_t size); static void* _vf7zMap(struct VFile* vf, size_t size, int flags); static void _vf7zUnmap(struct VFile* vf, void* memory, size_t size); @@ -142,16 +141,12 @@ off_t _vf7zSeek(struct VFile* vf, off_t offset, int whence) { return -1; } - if (position <= vf7z->offset) { - vf7z->offset = position; - return position; + if (position > vf7z->size) { + return -1; } - if (position <= vf7z->size) { - return vf7z->offset; - } - - return -1; + vf7z->offset = position; + return position; } ssize_t _vf7zRead(struct VFile* vf, void* buffer, size_t size) { @@ -162,21 +157,10 @@ ssize_t _vf7zRead(struct VFile* vf, void* buffer, size_t size) { } memcpy(buffer, vf7z->outBuffer + vf7z->offset + vf7z->bufferOffset, size); + vf7z->offset += size; return size; } -ssize_t _vf7zReadline(struct VFile* vf, char* buffer, size_t size) { - size_t bytesRead = 0; - while (bytesRead < size - 1) { - size_t newRead = vf->read(vf, &buffer[bytesRead], 1); - bytesRead += newRead; - if (!newRead || buffer[bytesRead] == '\n') { - break; - } - } - return buffer[bytesRead] = '\0'; -} - ssize_t _vf7zWrite(struct VFile* vf, const void* buffer, size_t size) { // TODO UNUSED(vf); @@ -301,7 +285,7 @@ struct VFile* _vd7zOpenFile(struct VDir* vd, const char* path, int mode) { vf->d.close = _vf7zClose; vf->d.seek = _vf7zSeek; vf->d.read = _vf7zRead; - vf->d.readline = _vf7zReadline; + vf->d.readline = VFileReadline; vf->d.write = _vf7zWrite; vf->d.map = _vf7zMap; vf->d.unmap = _vf7zUnmap; diff --git a/src/util/vfs/vfs-zip.c b/src/util/vfs/vfs-zip.c index 02e6216fe..18789e423 100644 --- a/src/util/vfs/vfs-zip.c +++ b/src/util/vfs/vfs-zip.c @@ -38,7 +38,6 @@ struct VFileZip { static bool _vfzClose(struct VFile* vf); static off_t _vfzSeek(struct VFile* vf, off_t offset, int whence); static ssize_t _vfzRead(struct VFile* vf, void* buffer, size_t size); -static ssize_t _vfzReadline(struct VFile* vf, char* buffer, size_t size); static ssize_t _vfzWrite(struct VFile* vf, const void* buffer, size_t size); static void* _vfzMap(struct VFile* vf, size_t size, int flags); static void _vfzUnmap(struct VFile* vf, void* memory, size_t size); @@ -188,18 +187,6 @@ ssize_t _vfzRead(struct VFile* vf, void* buffer, size_t size) { return bytesRead; } -ssize_t _vfzReadline(struct VFile* vf, char* buffer, size_t size) { - size_t bytesRead = 0; - while (bytesRead < size - 1) { - size_t newRead = vf->read(vf, &buffer[bytesRead], 1); - bytesRead += newRead; - if (!newRead || buffer[bytesRead] == '\n') { - break; - } - } - return buffer[bytesRead] = '\0'; -} - ssize_t _vfzWrite(struct VFile* vf, const void* buffer, size_t size) { // TODO UNUSED(vf); @@ -296,7 +283,7 @@ struct VFile* _vdzOpenFile(struct VDir* vd, const char* path, int mode) { vfz->d.close = _vfzClose; vfz->d.seek = _vfzSeek; vfz->d.read = _vfzRead; - vfz->d.readline = _vfzReadline; + vfz->d.readline = VFileReadline; vfz->d.write = _vfzWrite; vfz->d.map = _vfzMap; vfz->d.unmap = _vfzUnmap; From e61d413d69aa3d1319c60a7565033214da8eb2c7 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 18:44:28 -0800 Subject: [PATCH 022/101] Util: VFile backed by memory --- src/util/vfs.h | 1 + src/util/vfs/vfs-mem.c | 139 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 src/util/vfs/vfs-mem.c diff --git a/src/util/vfs.h b/src/util/vfs.h index 30c45cbfb..3586ad315 100644 --- a/src/util/vfs.h +++ b/src/util/vfs.h @@ -38,6 +38,7 @@ struct VDir { struct VFile* VFileOpen(const char* path, int flags); struct VFile* VFileFromFD(int fd); +struct VFile* VFileFromMemory(void* mem, size_t size); struct VDir* VDirOpen(const char* path); diff --git a/src/util/vfs/vfs-mem.c b/src/util/vfs/vfs-mem.c new file mode 100644 index 000000000..7a11fd7ee --- /dev/null +++ b/src/util/vfs/vfs-mem.c @@ -0,0 +1,139 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "util/vfs.h" + +struct VFileMem { + struct VFile d; + void* mem; + size_t size; + size_t offset; +}; + +static bool _vfmClose(struct VFile* vf); +static off_t _vfmSeek(struct VFile* vf, off_t offset, int whence); +static ssize_t _vfmRead(struct VFile* vf, void* buffer, size_t size); +static ssize_t _vfmWrite(struct VFile* vf, const void* buffer, size_t size); +static void* _vfmMap(struct VFile* vf, size_t size, int flags); +static void _vfmUnmap(struct VFile* vf, void* memory, size_t size); +static void _vfmTruncate(struct VFile* vf, size_t size); +static ssize_t _vfmSize(struct VFile* vf); + +struct VFile* VFileFromMemory(void* mem, size_t size) { + if (!mem || !size) { + return 0; + } + + struct VFileMem* vfm = malloc(sizeof(struct VFileMem)); + if (!vfm) { + return 0; + } + + vfm->mem = mem; + vfm->size = size; + vfm->offset = 0; + vfm->d.close = _vfmClose; + vfm->d.seek = _vfmSeek; + vfm->d.read = _vfmRead; + vfm->d.readline = VFileReadline; + vfm->d.write = _vfmWrite; + vfm->d.map = _vfmMap; + vfm->d.unmap = _vfmUnmap; + vfm->d.truncate = _vfmTruncate; + vfm->d.size = _vfmSize; + + return &vfm->d; +} + +bool _vfmClose(struct VFile* vf) { + struct VFileMem* vfm = (struct VFileMem*) vf; + vfm->mem = 0; + free(vfm); + return true; +} + +off_t _vfmSeek(struct VFile* vf, off_t offset, int whence) { + struct VFileMem* vfm = (struct VFileMem*) vf; + + size_t position; + switch (whence) { + case SEEK_SET: + position = offset; + break; + case SEEK_CUR: + if (offset < 0 && ((vfm->offset < (size_t) -offset) || (offset == INT_MIN))) { + return -1; + } + position = vfm->offset + offset; + break; + case SEEK_END: + if (offset < 0 && ((vfm->size < (size_t) -offset) || (offset == INT_MIN))) { + return -1; + } + position = vfm->size + offset; + break; + default: + return -1; + } + + if (position > vfm->size) { + return -1; + } + + vfm->offset = position; + return position; +} + +ssize_t _vfmRead(struct VFile* vf, void* buffer, size_t size) { + struct VFileMem* vfm = (struct VFileMem*) vf; + + if (size + vfm->offset >= vfm->size) { + size = vfm->size - vfm->offset; + } + + memcpy(buffer, vfm->mem + vfm->offset, size); + vfm->offset += size; + return size; +} + +ssize_t _vfmWrite(struct VFile* vf, const void* buffer, size_t size) { + struct VFileMem* vfm = (struct VFileMem*) vf; + + if (size + vfm->offset >= vfm->size) { + size = vfm->size - vfm->offset; + } + + memcpy(vfm->mem + vfm->offset, buffer, size); + vfm->offset += size; + return size; +} + +void* _vfmMap(struct VFile* vf, size_t size, int flags) { + struct VFileMem* vfm = (struct VFileMem*) vf; + + UNUSED(flags); + if (size > vfm->size) { + return 0; + } + + return vfm->mem; +} + +void _vfmUnmap(struct VFile* vf, void* memory, size_t size) { + UNUSED(vf); + UNUSED(memory); + UNUSED(size); +} + +void _vfmTruncate(struct VFile* vf, size_t size) { + // TODO: Return value? + UNUSED(vf); + UNUSED(size); +} + +ssize_t _vfmSize(struct VFile* vf) { + struct VFileMem* vfm = (struct VFileMem*) vf; + return vfm->size; +} From 826569fdf7a69c620b6df66e3afd52bffa7274a8 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 6 Mar 2015 22:18:27 -0800 Subject: [PATCH 023/101] GBA BIOS: Fix BIOS decompression routines with invalid source addresses --- CHANGES | 1 + src/gba/bios.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index ce88d9a77..231f24112 100644 --- a/CHANGES +++ b/CHANGES @@ -47,6 +47,7 @@ Bugfixes: - Qt: Fix patch loading while a game is running - Util: Fix sockets on Windows - Qt: Fix crash when loading a game after stopping GDB server + - GBA BIOS: Fix BIOS decompression routines with invalid source addresses Misc: - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples - GBA Memory: Simplify memory API and use fixed bus width diff --git a/src/gba/bios.c b/src/gba/bios.c index 44959d49e..5a42baeff 100644 --- a/src/gba/bios.c +++ b/src/gba/bios.c @@ -233,6 +233,7 @@ void GBASwi16(struct ARMCore* cpu, int immediate) { case 0x12: if (cpu->gprs[0] < BASE_WORKING_RAM) { GBALog(gba, GBA_LOG_GAME_ERROR, "Bad LZ77 source"); + break; } switch (cpu->gprs[1] >> BASE_OFFSET) { default: @@ -247,6 +248,7 @@ void GBASwi16(struct ARMCore* cpu, int immediate) { case 0x13: if (cpu->gprs[0] < BASE_WORKING_RAM) { GBALog(gba, GBA_LOG_GAME_ERROR, "Bad Huffman source"); + break; } switch (cpu->gprs[1] >> BASE_OFFSET) { default: @@ -262,6 +264,7 @@ void GBASwi16(struct ARMCore* cpu, int immediate) { case 0x15: if (cpu->gprs[0] < BASE_WORKING_RAM) { GBALog(gba, GBA_LOG_GAME_ERROR, "Bad RL source"); + break; } switch (cpu->gprs[1] >> BASE_OFFSET) { default: @@ -278,6 +281,7 @@ void GBASwi16(struct ARMCore* cpu, int immediate) { case 0x18: if (cpu->gprs[0] < BASE_WORKING_RAM) { GBALog(gba, GBA_LOG_GAME_ERROR, "Bad UnFilter source"); + break; } switch (cpu->gprs[1] >> BASE_OFFSET) { default: From 6835ac8a81288301ddc852b20d6d9c3e93969df6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 20:43:18 -0800 Subject: [PATCH 024/101] GBA: Better const correctness for serialization --- src/gba/hardware.c | 4 ++-- src/gba/hardware.h | 4 ++-- src/gba/io.c | 2 +- src/gba/io.h | 2 +- src/gba/memory.c | 4 ++-- src/gba/memory.h | 4 ++-- src/gba/serialize.c | 2 +- src/gba/serialize.h | 2 +- src/gba/video.c | 4 ++-- src/gba/video.h | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gba/hardware.c b/src/gba/hardware.c index a584886e3..9f27bf17a 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -424,7 +424,7 @@ uint8_t GBAHardwareTiltRead(struct GBACartridgeHardware* hw, uint32_t address) { // == Serialization -void GBAHardwareSerialize(struct GBACartridgeHardware* hw, struct GBASerializedState* state) { +void GBAHardwareSerialize(const struct GBACartridgeHardware* hw, struct GBASerializedState* state) { state->hw.readWrite = hw->readWrite; state->hw.pinState = hw->pinState; state->hw.pinDirection = hw->direction; @@ -440,7 +440,7 @@ void GBAHardwareSerialize(struct GBACartridgeHardware* hw, struct GBASerializedS state->hw.lightEdge = hw->lightEdge; } -void GBAHardwareDeserialize(struct GBACartridgeHardware* hw, struct GBASerializedState* state) { +void GBAHardwareDeserialize(struct GBACartridgeHardware* hw, const struct GBASerializedState* state) { hw->readWrite = state->hw.readWrite; hw->pinState = state->hw.pinState; hw->direction = state->hw.pinDirection; diff --git a/src/gba/hardware.h b/src/gba/hardware.h index 841388a6c..55c62794c 100644 --- a/src/gba/hardware.h +++ b/src/gba/hardware.h @@ -149,7 +149,7 @@ void GBAHardwareTiltWrite(struct GBACartridgeHardware* gpio, uint32_t address, u uint8_t GBAHardwareTiltRead(struct GBACartridgeHardware* gpio, uint32_t address); struct GBASerializedState; -void GBAHardwareSerialize(struct GBACartridgeHardware* gpio, struct GBASerializedState* state); -void GBAHardwareDeserialize(struct GBACartridgeHardware* gpio, struct GBASerializedState* state); +void GBAHardwareSerialize(const struct GBACartridgeHardware* gpio, struct GBASerializedState* state); +void GBAHardwareDeserialize(struct GBACartridgeHardware* gpio, const struct GBASerializedState* state); #endif diff --git a/src/gba/io.c b/src/gba/io.c index 271aec632..76305cb1d 100644 --- a/src/gba/io.c +++ b/src/gba/io.c @@ -675,7 +675,7 @@ void GBAIOSerialize(struct GBA* gba, struct GBASerializedState* state) { GBAHardwareSerialize(&gba->memory.hw, state); } -void GBAIODeserialize(struct GBA* gba, struct GBASerializedState* state) { +void GBAIODeserialize(struct GBA* gba, const struct GBASerializedState* state) { int i; for (i = 0; i < REG_MAX; i += 2) { if (_isSpecialRegister[i >> 1]) { diff --git a/src/gba/io.h b/src/gba/io.h index 77b28861a..c6e988097 100644 --- a/src/gba/io.h +++ b/src/gba/io.h @@ -161,6 +161,6 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address); struct GBASerializedState; void GBAIOSerialize(struct GBA* gba, struct GBASerializedState* state); -void GBAIODeserialize(struct GBA* gba, struct GBASerializedState* state); +void GBAIODeserialize(struct GBA* gba, const struct GBASerializedState* state); #endif diff --git a/src/gba/memory.c b/src/gba/memory.c index a0d0e16d4..3ea0b7ece 100644 --- a/src/gba/memory.c +++ b/src/gba/memory.c @@ -1461,12 +1461,12 @@ void GBAMemoryServiceDMA(struct GBA* gba, int number, struct GBADMA* info) { cpu->cycles += cycles; } -void GBAMemorySerialize(struct GBAMemory* memory, struct GBASerializedState* state) { +void GBAMemorySerialize(const struct GBAMemory* memory, struct GBASerializedState* state) { memcpy(state->wram, memory->wram, SIZE_WORKING_RAM); memcpy(state->iwram, memory->iwram, SIZE_WORKING_IRAM); } -void GBAMemoryDeserialize(struct GBAMemory* memory, struct GBASerializedState* state) { +void GBAMemoryDeserialize(struct GBAMemory* memory, const struct GBASerializedState* state) { memcpy(memory->wram, state->wram, SIZE_WORKING_RAM); memcpy(memory->iwram, state->iwram, SIZE_WORKING_IRAM); } diff --git a/src/gba/memory.h b/src/gba/memory.h index aaa948337..db044d35b 100644 --- a/src/gba/memory.h +++ b/src/gba/memory.h @@ -172,7 +172,7 @@ void GBAMemoryUpdateDMAs(struct GBA* gba, int32_t cycles); int32_t GBAMemoryRunDMAs(struct GBA* gba, int32_t cycles); struct GBASerializedState; -void GBAMemorySerialize(struct GBAMemory* memory, struct GBASerializedState* state); -void GBAMemoryDeserialize(struct GBAMemory* memory, struct GBASerializedState* state); +void GBAMemorySerialize(const struct GBAMemory* memory, struct GBASerializedState* state); +void GBAMemoryDeserialize(struct GBAMemory* memory, const struct GBASerializedState* state); #endif diff --git a/src/gba/serialize.c b/src/gba/serialize.c index 93a873c6e..5b0d8e868 100644 --- a/src/gba/serialize.c +++ b/src/gba/serialize.c @@ -55,7 +55,7 @@ void GBASerialize(struct GBA* gba, struct GBASerializedState* state) { } } -void GBADeserialize(struct GBA* gba, struct GBASerializedState* state) { +void GBADeserialize(struct GBA* gba, const struct GBASerializedState* state) { if (state->versionMagic != GBA_SAVESTATE_MAGIC) { GBALog(gba, GBA_LOG_WARN, "Invalid or too new savestate"); return; diff --git a/src/gba/serialize.h b/src/gba/serialize.h index d9e051614..50c0f717c 100644 --- a/src/gba/serialize.h +++ b/src/gba/serialize.h @@ -292,7 +292,7 @@ struct VDir; struct GBAThread; void GBASerialize(struct GBA* gba, struct GBASerializedState* state); -void GBADeserialize(struct GBA* gba, struct GBASerializedState* state); +void GBADeserialize(struct GBA* gba, const struct GBASerializedState* state); bool GBASaveState(struct GBAThread* thread, struct VDir* dir, int slot, bool screenshot); bool GBALoadState(struct GBAThread* thread, struct VDir* dir, int slot); diff --git a/src/gba/video.c b/src/gba/video.c index 88710f152..06a6042bb 100644 --- a/src/gba/video.c +++ b/src/gba/video.c @@ -235,7 +235,7 @@ static void GBAVideoDummyRendererGetPixels(struct GBAVideoRenderer* renderer, un } -void GBAVideoSerialize(struct GBAVideo* video, struct GBASerializedState* state) { +void GBAVideoSerialize(const struct GBAVideo* video, struct GBASerializedState* state) { memcpy(state->vram, video->renderer->vram, SIZE_VRAM); memcpy(state->oam, video->oam.raw, SIZE_OAM); memcpy(state->pram, video->palette, SIZE_PALETTE_RAM); @@ -249,7 +249,7 @@ void GBAVideoSerialize(struct GBAVideo* video, struct GBASerializedState* state) state->video.frameCounter = video->frameCounter; } -void GBAVideoDeserialize(struct GBAVideo* video, struct GBASerializedState* state) { +void GBAVideoDeserialize(struct GBAVideo* video, const struct GBASerializedState* state) { memcpy(video->renderer->vram, state->vram, SIZE_VRAM); int i; for (i = 0; i < SIZE_OAM; i += 2) { diff --git a/src/gba/video.h b/src/gba/video.h index b34a9a159..b7648719e 100644 --- a/src/gba/video.h +++ b/src/gba/video.h @@ -201,7 +201,7 @@ int32_t GBAVideoProcessEvents(struct GBAVideo* video, int32_t cycles); void GBAVideoWriteDISPSTAT(struct GBAVideo* video, uint16_t value); struct GBASerializedState; -void GBAVideoSerialize(struct GBAVideo* video, struct GBASerializedState* state); -void GBAVideoDeserialize(struct GBAVideo* video, struct GBASerializedState* state); +void GBAVideoSerialize(const struct GBAVideo* video, struct GBASerializedState* state); +void GBAVideoDeserialize(struct GBAVideo* video, const struct GBASerializedState* state); #endif From 2a6ff14a3b646492ca371c76ed715aba0a4c2647 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 21:43:29 -0800 Subject: [PATCH 025/101] GBA: Fix crash if no components are defined --- src/gba/gba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/gba.c b/src/gba/gba.c index 07dcc512b..0724e36c6 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -716,7 +716,7 @@ void GBAFrameEnded(struct GBA* gba) { gba->rr->nextFrame(gba->rr); } - if (gba->cpu->components[GBA_COMPONENT_CHEAT_DEVICE]) { + if (gba->cpu->components && gba->cpu->components[GBA_COMPONENT_CHEAT_DEVICE]) { struct GBACheatDevice* device = (struct GBACheatDevice*) gba->cpu->components[GBA_COMPONENT_CHEAT_DEVICE]; size_t i; for (i = 0; i < GBACheatSetsSize(&device->cheats); ++i) { From 5feec0317fea4e258be0b8fcdd7b4bc2b5bb54d3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 19:49:48 -0700 Subject: [PATCH 026/101] Video: Fix FFmpeg encoder support for 15- and 16-bit video pixel formats --- src/platform/ffmpeg/ffmpeg-encoder.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/platform/ffmpeg/ffmpeg-encoder.c b/src/platform/ffmpeg/ffmpeg-encoder.c index 1c69d96dd..184ac5a8d 100644 --- a/src/platform/ffmpeg/ffmpeg-encoder.c +++ b/src/platform/ffmpeg/ffmpeg-encoder.c @@ -288,10 +288,18 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) { encoder->videoFrame->height = encoder->video->height; encoder->videoFrame->pts = 0; encoder->scaleContext = sws_getContext(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, +#ifdef COLOR_16_BIT +#ifdef COLOR_5_6_5 + AV_PIX_FMT_RGB565, +#else + AV_PIX_FMT_BGR555, +#endif +#else #ifndef USE_LIBAV AV_PIX_FMT_0BGR32, #else AV_PIX_FMT_BGR32, +#endif #endif encoder->videoFrame->width, encoder->videoFrame->height, encoder->video->pix_fmt, SWS_POINT, 0, 0, 0); @@ -416,7 +424,7 @@ void _ffmpegPostVideoFrame(struct GBAAVStream* stream, struct GBAVideoRenderer* uint8_t* pixels; unsigned stride; renderer->getPixels(renderer, &stride, (void**) &pixels); - stride *= 4; + stride *= BYTES_PER_PIXEL; AVPacket packet; From 06a0399186da39ec196382d996c8993d3ea517d3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 19:54:50 -0700 Subject: [PATCH 027/101] Qt: Fix 15- and 16-bit modes in Qt port --- src/platform/qt/Display.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/platform/qt/Display.cpp b/src/platform/qt/Display.cpp index 4c4745b16..989d967b7 100644 --- a/src/platform/qt/Display.cpp +++ b/src/platform/qt/Display.cpp @@ -271,7 +271,15 @@ void Painter::performDraw() { } } glViewport((w - drawW) / 2, (h - drawH) / 2, drawW, drawH); +#ifdef COLOR_16_BIT +#ifdef COLOR_5_6_5 + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, m_backing); +#else + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, m_backing); +#endif +#else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, m_backing); +#endif glDrawArrays(GL_TRIANGLE_FAN, 0, 4); if (m_context->sync.videoFrameWait) { glFlush(); From 9a76ba6b43bbf46ee11800ca885bee45436d9594 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 22:27:18 -0700 Subject: [PATCH 028/101] Video: Fix warnings in ImageMagick --- src/platform/imagemagick/imagemagick-gif-encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/imagemagick/imagemagick-gif-encoder.c b/src/platform/imagemagick/imagemagick-gif-encoder.c index 59505f7e7..3a85db133 100644 --- a/src/platform/imagemagick/imagemagick-gif-encoder.c +++ b/src/platform/imagemagick/imagemagick-gif-encoder.c @@ -8,7 +8,7 @@ #include "gba/video.h" static void _magickPostVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer); -static void _magickPostAudioFrame(struct GBAAVStream*, int32_t left, int32_t right); +static void _magickPostAudioFrame(struct GBAAVStream*, int16_t left, int16_t right); void ImageMagickGIFEncoderInit(struct ImageMagickGIFEncoder* encoder) { encoder->wand = 0; @@ -70,7 +70,7 @@ static void _magickPostVideoFrame(struct GBAAVStream* stream, struct GBAVideoRen ++encoder->currentFrame; } -static void _magickPostAudioFrame(struct GBAAVStream* stream, int32_t left, int32_t right) { +static void _magickPostAudioFrame(struct GBAAVStream* stream, int16_t left, int16_t right) { UNUSED(stream); UNUSED(left); UNUSED(right); From 3f9abf2b05396e7219a7e9a6034c95b74cb0c055 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 22:45:40 -0700 Subject: [PATCH 029/101] SDL: Reserve correct number of bytes for video buffer allocation --- src/platform/sdl/gl-sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/sdl/gl-sdl.c b/src/platform/sdl/gl-sdl.c index 66d46b0c9..0a0d73e21 100644 --- a/src/platform/sdl/gl-sdl.c +++ b/src/platform/sdl/gl-sdl.c @@ -59,7 +59,7 @@ bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { #endif #endif - renderer->d.outputBuffer = malloc(VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * 4); + renderer->d.outputBuffer = malloc(VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * BYTES_PER_PIXEL); renderer->d.outputBufferStride = VIDEO_HORIZONTAL_PIXELS; glGenTextures(1, &renderer->tex); glBindTexture(GL_TEXTURE_2D, renderer->tex); From eb21dd722f3660e0f832e11225048304a15b1d07 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 20:42:37 -0800 Subject: [PATCH 030/101] GBA: Move logging construct into GBA struct --- src/gba/gba.c | 8 ++++---- src/gba/gba.h | 6 +++++- src/gba/supervisor/thread.c | 1 + src/gba/supervisor/thread.h | 3 +-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/gba/gba.c b/src/gba/gba.c index 0724e36c6..bb18400bb 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -547,10 +547,10 @@ static void _GBAVLog(struct GBA* gba, enum GBALogLevel level, const char* format threadContext->state = THREAD_CRASHED; MutexUnlock(&threadContext->stateMutex); } - if (threadContext->logHandler) { - threadContext->logHandler(threadContext, level, format, args); - return; - } + } + if (gba->logHandler) { + gba->logHandler(threadContext, level, format, args); + return; } vprintf(format, args); diff --git a/src/gba/gba.h b/src/gba/gba.h index 630530ff8..4c67a662c 100644 --- a/src/gba/gba.h +++ b/src/gba/gba.h @@ -90,9 +90,12 @@ enum { struct GBA; struct GBARotationSource; +struct GBAThread; struct Patch; struct VFile; +typedef void (*GBALogHandler)(struct GBAThread*, enum GBALogLevel, const char* format, va_list args); + struct GBATimer { uint16_t reload; uint16_t oldReload; @@ -141,7 +144,8 @@ struct GBA { const char* activeFile; - int logLevel; + GBALogHandler logHandler; + enum GBALogLevel logLevel; enum GBAIdleLoopOptimization idleOptimization; uint32_t idleLoop; diff --git a/src/gba/supervisor/thread.c b/src/gba/supervisor/thread.c index a8eb1bc09..ae08c440d 100644 --- a/src/gba/supervisor/thread.c +++ b/src/gba/supervisor/thread.c @@ -134,6 +134,7 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { gba.sync = &threadContext->sync; threadContext->gba = &gba; gba.logLevel = threadContext->logLevel; + gba.logHandler = threadContext->logHandler; gba.idleOptimization = threadContext->idleOptimization; #ifdef USE_PTHREADS pthread_setspecific(_contextKey, threadContext); diff --git a/src/gba/supervisor/thread.h b/src/gba/supervisor/thread.h index 11b435d26..a39c52a4e 100644 --- a/src/gba/supervisor/thread.h +++ b/src/gba/supervisor/thread.h @@ -20,7 +20,6 @@ struct GBACheatSet; struct GBAOptions; typedef void (*ThreadCallback)(struct GBAThread* threadContext); -typedef void (*LogHandler)(struct GBAThread*, enum GBALogLevel, const char* format, va_list args); enum ThreadState { THREAD_INITIALIZED = -1, @@ -95,7 +94,7 @@ struct GBAThread { enum ThreadState savedState; int interruptDepth; - LogHandler logHandler; + GBALogHandler logHandler; int logLevel; ThreadCallback startCallback; ThreadCallback cleanCallback; From cf71d39bf031322cdec54ffffe947bda070f4125 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 5 Mar 2015 21:43:57 -0800 Subject: [PATCH 031/101] Libretro: Add initial libretro version --- CMakeLists.txt | 8 + src/platform/libretro/libretro.c | 267 +++++ src/platform/libretro/libretro.h | 1926 ++++++++++++++++++++++++++++++ 3 files changed, 2201 insertions(+) create mode 100644 src/platform/libretro/libretro.c create mode 100644 src/platform/libretro/libretro.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d0a7b77d..3cef45f6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ set(USE_BLIP ON CACHE BOOL "Whether or not to enable blip_buf support") set(USE_LZMA ON CACHE BOOL "Whether or not to enable 7-Zip support") set(BUILD_QT ON CACHE BOOL "Build Qt frontend") set(BUILD_SDL ON CACHE BOOL "Build SDL frontend") +set(BUILD_LIBRETRO OFF CACHE BOOL "Build libretro core") set(BUILD_PERF OFF CACHE BOOL "Build performance profiling tool") set(BUILD_STATIC OFF CACHE BOOL "Build a static library") set(BUILD_SHARED ON CACHE BOOL "Build a shared library") @@ -309,6 +310,12 @@ if(BUILD_QT) add_subdirectory(${CMAKE_SOURCE_DIR}/src/platform/qt ${CMAKE_BINARY_DIR}/qt) endif() +if(BUILD_LIBRETRO) + file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c) + add_library(${BINARY_NAME}-libretro SHARED ${RETRO_SRC}) + target_link_libraries(${BINARY_NAME}-libretro ${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) +endif() + if(BUILD_PERF) set(PERF_SRC ${CMAKE_SOURCE_DIR}/src/platform/perf-main.c) if(UNIX AND NOT APPLE) @@ -355,6 +362,7 @@ message(STATUS " Better audio resampling: ${USE_BLIP}") message(STATUS "Frontend summary:") message(STATUS " Qt: ${BUILD_QT}") message(STATUS " SDL (${SDL_VERSION}): ${BUILD_SDL}") +message(STATUS " Libretro core: ${BUILD_LIBRETRO}") message(STATUS " Profiling: ${BUILD_PERF}") message(STATUS "Library summary:") message(STATUS " Static: ${BUILD_STATIC}") diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c new file mode 100644 index 000000000..0be8d1507 --- /dev/null +++ b/src/platform/libretro/libretro.c @@ -0,0 +1,267 @@ +#include "libretro.h" + +#include "gba/gba.h" +#include "gba/renderers/video-software.h" +#include "gba/serialize.h" +#include "gba/video.h" +#include "util/vfs.h" + +static retro_environment_t environCallback; +static retro_video_refresh_t videoCallback; +static retro_input_poll_t inputPollCallback; +static retro_input_state_t inputCallback; +static retro_log_printf_t logCallback; + +static void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args); + +static struct GBA gba; +static struct ARMCore cpu; +static struct GBAVideoSoftwareRenderer renderer; +static struct VFile* rom; +static struct VFile* save; +static void* savedata; + +unsigned retro_api_version(void) { + return RETRO_API_VERSION; +} + +void retro_set_environment(retro_environment_t environ) { + environCallback = environ; +} + +void retro_set_video_refresh(retro_video_refresh_t video) { + videoCallback = video; +} + +void retro_set_audio_sample(retro_audio_sample_t audio) { + UNUSED(audio); +} + +void retro_set_audio_sample_batch(retro_audio_sample_batch_t audioBatch) { + UNUSED(audioBatch); +} + +void retro_set_input_poll(retro_input_poll_t inputPoll) { + inputPollCallback = inputPoll; +} + +void retro_set_input_state(retro_input_state_t input) { + inputCallback = input; +} + +void retro_get_system_info(struct retro_system_info* info) { + info->need_fullpath = false; + info->valid_extensions = "gba"; + info->library_version = PROJECT_VERSION; + info->library_name = PROJECT_NAME; + info->block_extract = false; +} + +void retro_get_system_av_info(struct retro_system_av_info* info) { + info->geometry.base_width = VIDEO_HORIZONTAL_PIXELS; + info->geometry.base_height = VIDEO_VERTICAL_PIXELS; + info->geometry.max_width = VIDEO_HORIZONTAL_PIXELS; + info->geometry.max_height = VIDEO_VERTICAL_PIXELS; + info->timing.fps = GBA_ARM7TDMI_FREQUENCY / (float) VIDEO_TOTAL_LENGTH; + info->timing.sample_rate = 32768; +} + +void retro_init(void) { + enum retro_pixel_format fmt; +#ifdef COLOR_16_BIT +#ifdef COLOR_5_6_5 + fmt = RETRO_PIXEL_FORMAT_RGB565; +#else + fmt = RETRO_PIXEL_FORMAT_0RGB1555; +#endif +#else + fmt = RETRO_PIXEL_FORMAT_XRGB8888; +#endif + environCallback(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt); + + struct retro_input_descriptor inputDescriptors[] = { + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R" }, + { 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L" } + }; + environCallback(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, &inputDescriptors); + + // TODO: RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME when BIOS booting is supported + // TODO: RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE + + struct retro_log_callback log; + if (environCallback(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log)) { + logCallback = log.log; + } else { + logCallback = 0; + } + + GBACreate(&gba); + ARMSetComponents(&cpu, &gba.d, 0, 0); + ARMInit(&cpu); + gba.logLevel = 0; // TODO: Settings + gba.logHandler = GBARetroLog; + gba.idleOptimization = IDLE_LOOP_REMOVE; // TODO: Settings + rom = 0; + + GBAVideoSoftwareRendererCreate(&renderer); + renderer.outputBuffer = malloc(256 * VIDEO_VERTICAL_PIXELS * BYTES_PER_PIXEL); + renderer.outputBufferStride = 256; + GBAVideoAssociateRenderer(&gba.video, &renderer.d); +} + +void retro_deinit(void) { + GBADestroy(&gba); +} + +void retro_run(void) { + int keys; + gba.keySource = &keys; + inputPollCallback(); + + keys = 0; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A)) << 0; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B)) << 1; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT)) << 2; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START)) << 3; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)) << 4; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)) << 5; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP)) << 6; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN)) << 7; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R)) << 8; + keys |= (!!inputCallback(0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L)) << 9; + + int frameCount = gba.video.frameCounter; + while (gba.video.frameCounter == frameCount) { + ARMRunLoop(&cpu); + } + videoCallback(renderer.outputBuffer, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, BYTES_PER_PIXEL * 256); +} + +void retro_reset(void) { + ARMReset(&cpu); +} + +bool retro_load_game(const struct retro_game_info* game) { + if (game->data) { + rom = VFileFromMemory((void*) game->data, game->size); // TODO: readonly VFileMem + } else { + rom = VFileOpen(game->path, O_RDONLY); + } + if (!rom) { + return false; + } + if (!GBAIsROM(rom)) { + return false; + } + + // TODO + save = 0; + savedata = 0; + + GBALoadROM(&gba, rom, save, game->path); + ARMReset(&cpu); + return true; +} + +void retro_unload_game(void) { + // TODO +} + +size_t retro_serialize_size(void) { + return sizeof(struct GBASerializedState); +} + +bool retro_serialize(void* data, size_t size) { + if (size != retro_serialize_size()) { + return false; + } + GBASerialize(&gba, data); + return true; +} + +bool retro_unserialize(const void* data, size_t size) { + if (size != retro_serialize_size()) { + return false; + } + GBADeserialize(&gba, data); + return true; +} + +void retro_cheat_reset(void) { + // TODO: Cheats +} + +void retro_cheat_set(unsigned index, bool enabled, const char* code) { + // TODO: Cheats + UNUSED(index); + UNUSED(enabled); + UNUSED(code); +} + +unsigned retro_get_region(void) { + return RETRO_REGION_NTSC; // TODO: This isn't strictly true +} + +void retro_set_controller_port_device(unsigned port, unsigned device) { + UNUSED(port); + UNUSED(device); +} + +bool retro_load_game_special(unsigned game_type, const struct retro_game_info* info, size_t num_info) { + UNUSED(game_type); + UNUSED(info); + UNUSED(num_info); + return false; +} + +void* retro_get_memory_data(unsigned id) { + // TODO + UNUSED(id); + return 0; +} + +size_t retro_get_memory_size(unsigned id) { + // TODO + UNUSED(id); + return 0; +} + +void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args) { + UNUSED(thread); + if (!logCallback) { + return; + } + + char message[128]; + vsnprintf(message, sizeof(message), format, args); + + enum retro_log_level retroLevel = RETRO_LOG_INFO; + switch (level) { + case GBA_LOG_ALL: + case GBA_LOG_ERROR: + case GBA_LOG_FATAL: + retroLevel = RETRO_LOG_ERROR; + break; + case GBA_LOG_WARN: + retroLevel = RETRO_LOG_WARN; + break; + case GBA_LOG_INFO: + case GBA_LOG_GAME_ERROR: + case GBA_LOG_SWI: + retroLevel = RETRO_LOG_INFO; + break; + case GBA_LOG_DEBUG: + case GBA_LOG_STUB: + retroLevel = RETRO_LOG_DEBUG; + break; + } + logCallback(retroLevel, "%s\n", message); +} diff --git a/src/platform/libretro/libretro.h b/src/platform/libretro/libretro.h new file mode 100644 index 000000000..73882da71 --- /dev/null +++ b/src/platform/libretro/libretro.h @@ -0,0 +1,1926 @@ +/* Copyright (C) 2010-2015 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this libretro API header (libretro.h). + * --------------------------------------------------------------------------------------- + * + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef LIBRETRO_H__ +#define LIBRETRO_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __cplusplus +#if defined(_MSC_VER) && !defined(SN_TARGET_PS3) +/* Hack applied for MSVC when compiling in C89 mode + * as it isn't C99-compliant. */ +#define bool unsigned char +#define true 1 +#define false 0 +#else +#include +#endif +#endif + +/* Used for checking API/ABI mismatches that can break libretro + * implementations. + * It is not incremented for compatible changes to the API. + */ +#define RETRO_API_VERSION 1 + +/* + * Libretro's fundamental device abstractions. + * + * Libretro's input system consists of some standardized device types, + * such as a joypad (with/without analog), mouse, keyboard, lightgun + * and a pointer. + * + * The functionality of these devices are fixed, and individual cores + * map their own concept of a controller to libretro's abstractions. + * This makes it possible for frontends to map the abstract types to a + * real input device, and not having to worry about binding input + * correctly to arbitrary controller layouts. + */ + +#define RETRO_DEVICE_TYPE_SHIFT 8 +#define RETRO_DEVICE_MASK ((1 << RETRO_DEVICE_TYPE_SHIFT) - 1) +#define RETRO_DEVICE_SUBCLASS(base, id) (((id + 1) << RETRO_DEVICE_TYPE_SHIFT) | base) + +/* Input disabled. */ +#define RETRO_DEVICE_NONE 0 + +/* The JOYPAD is called RetroPad. It is essentially a Super Nintendo + * controller, but with additional L2/R2/L3/R3 buttons, similar to a + * PS1 DualShock. */ +#define RETRO_DEVICE_JOYPAD 1 + +/* The mouse is a simple mouse, similar to Super Nintendo's mouse. + * X and Y coordinates are reported relatively to last poll (poll callback). + * It is up to the libretro implementation to keep track of where the mouse + * pointer is supposed to be on the screen. + * The frontend must make sure not to interfere with its own hardware + * mouse pointer. + */ +#define RETRO_DEVICE_MOUSE 2 + +/* KEYBOARD device lets one poll for raw key pressed. + * It is poll based, so input callback will return with the current + * pressed state. + * For event/text based keyboard input, see + * RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK. + */ +#define RETRO_DEVICE_KEYBOARD 3 + +/* Lightgun X/Y coordinates are reported relatively to last poll, + * similar to mouse. */ +#define RETRO_DEVICE_LIGHTGUN 4 + +/* The ANALOG device is an extension to JOYPAD (RetroPad). + * Similar to DualShock it adds two analog sticks. + * This is treated as a separate device type as it returns values in the + * full analog range of [-0x8000, 0x7fff]. Positive X axis is right. + * Positive Y axis is down. + * Only use ANALOG type when polling for analog values of the axes. + */ +#define RETRO_DEVICE_ANALOG 5 + +/* Abstracts the concept of a pointing mechanism, e.g. touch. + * This allows libretro to query in absolute coordinates where on the + * screen a mouse (or something similar) is being placed. + * For a touch centric device, coordinates reported are the coordinates + * of the press. + * + * Coordinates in X and Y are reported as: + * [-0x7fff, 0x7fff]: -0x7fff corresponds to the far left/top of the screen, + * and 0x7fff corresponds to the far right/bottom of the screen. + * The "screen" is here defined as area that is passed to the frontend and + * later displayed on the monitor. + * + * The frontend is free to scale/resize this screen as it sees fit, however, + * (X, Y) = (-0x7fff, -0x7fff) will correspond to the top-left pixel of the + * game image, etc. + * + * To check if the pointer coordinates are valid (e.g. a touch display + * actually being touched), PRESSED returns 1 or 0. + * + * If using a mouse on a desktop, PRESSED will usually correspond to the + * left mouse button, but this is a frontend decision. + * PRESSED will only return 1 if the pointer is inside the game screen. + * + * For multi-touch, the index variable can be used to successively query + * more presses. + * If index = 0 returns true for _PRESSED, coordinates can be extracted + * with _X, _Y for index = 0. One can then query _PRESSED, _X, _Y with + * index = 1, and so on. + * Eventually _PRESSED will return false for an index. No further presses + * are registered at this point. */ +#define RETRO_DEVICE_POINTER 6 + +/* Buttons for the RetroPad (JOYPAD). + * The placement of these is equivalent to placements on the + * Super Nintendo controller. + * L2/R2/L3/R3 buttons correspond to the PS1 DualShock. */ +#define RETRO_DEVICE_ID_JOYPAD_B 0 +#define RETRO_DEVICE_ID_JOYPAD_Y 1 +#define RETRO_DEVICE_ID_JOYPAD_SELECT 2 +#define RETRO_DEVICE_ID_JOYPAD_START 3 +#define RETRO_DEVICE_ID_JOYPAD_UP 4 +#define RETRO_DEVICE_ID_JOYPAD_DOWN 5 +#define RETRO_DEVICE_ID_JOYPAD_LEFT 6 +#define RETRO_DEVICE_ID_JOYPAD_RIGHT 7 +#define RETRO_DEVICE_ID_JOYPAD_A 8 +#define RETRO_DEVICE_ID_JOYPAD_X 9 +#define RETRO_DEVICE_ID_JOYPAD_L 10 +#define RETRO_DEVICE_ID_JOYPAD_R 11 +#define RETRO_DEVICE_ID_JOYPAD_L2 12 +#define RETRO_DEVICE_ID_JOYPAD_R2 13 +#define RETRO_DEVICE_ID_JOYPAD_L3 14 +#define RETRO_DEVICE_ID_JOYPAD_R3 15 + +/* Index / Id values for ANALOG device. */ +#define RETRO_DEVICE_INDEX_ANALOG_LEFT 0 +#define RETRO_DEVICE_INDEX_ANALOG_RIGHT 1 +#define RETRO_DEVICE_ID_ANALOG_X 0 +#define RETRO_DEVICE_ID_ANALOG_Y 1 + +/* Id values for MOUSE. */ +#define RETRO_DEVICE_ID_MOUSE_X 0 +#define RETRO_DEVICE_ID_MOUSE_Y 1 +#define RETRO_DEVICE_ID_MOUSE_LEFT 2 +#define RETRO_DEVICE_ID_MOUSE_RIGHT 3 +#define RETRO_DEVICE_ID_MOUSE_WHEELUP 4 +#define RETRO_DEVICE_ID_MOUSE_WHEELDOWN 5 +#define RETRO_DEVICE_ID_MOUSE_MIDDLE 6 + +/* Id values for LIGHTGUN types. */ +#define RETRO_DEVICE_ID_LIGHTGUN_X 0 +#define RETRO_DEVICE_ID_LIGHTGUN_Y 1 +#define RETRO_DEVICE_ID_LIGHTGUN_TRIGGER 2 +#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR 3 +#define RETRO_DEVICE_ID_LIGHTGUN_TURBO 4 +#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE 5 +#define RETRO_DEVICE_ID_LIGHTGUN_START 6 + +/* Id values for POINTER. */ +#define RETRO_DEVICE_ID_POINTER_X 0 +#define RETRO_DEVICE_ID_POINTER_Y 1 +#define RETRO_DEVICE_ID_POINTER_PRESSED 2 + +/* Returned from retro_get_region(). */ +#define RETRO_REGION_NTSC 0 +#define RETRO_REGION_PAL 1 + +/* Id values for LANGUAGE */ +enum retro_language +{ + RETRO_LANGUAGE_ENGLISH = 0, + RETRO_LANGUAGE_JAPANESE = 1, + RETRO_LANGUAGE_FRENCH = 2, + RETRO_LANGUAGE_SPANISH = 3, + RETRO_LANGUAGE_GERMAN = 4, + RETRO_LANGUAGE_ITALIAN = 5, + RETRO_LANGUAGE_DUTCH = 6, + RETRO_LANGUAGE_PORTUGUESE = 7, + RETRO_LANGUAGE_RUSSIAN = 8, + RETRO_LANGUAGE_KOREAN = 9, + RETRO_LANGUAGE_CHINESE_TRADITIONAL = 10, + RETRO_LANGUAGE_CHINESE_SIMPLIFIED = 11, + RETRO_LANGUAGE_LAST, + + /* Ensure sizeof(enum) == sizeof(int) */ + RETRO_LANGUAGE_DUMMY = INT_MAX +}; + +/* Passed to retro_get_memory_data/size(). + * If the memory type doesn't apply to the + * implementation NULL/0 can be returned. + */ +#define RETRO_MEMORY_MASK 0xff + +/* Regular save RAM. This RAM is usually found on a game cartridge, + * backed up by a battery. + * If save game data is too complex for a single memory buffer, + * the SAVE_DIRECTORY (preferably) or SYSTEM_DIRECTORY environment + * callback can be used. */ +#define RETRO_MEMORY_SAVE_RAM 0 + +/* Some games have a built-in clock to keep track of time. + * This memory is usually just a couple of bytes to keep track of time. + */ +#define RETRO_MEMORY_RTC 1 + +/* System ram lets a frontend peek into a game systems main RAM. */ +#define RETRO_MEMORY_SYSTEM_RAM 2 + +/* Video ram lets a frontend peek into a game systems video RAM (VRAM). */ +#define RETRO_MEMORY_VIDEO_RAM 3 + +/* Keysyms used for ID in input state callback when polling RETRO_KEYBOARD. */ +enum retro_key +{ + RETROK_UNKNOWN = 0, + RETROK_FIRST = 0, + RETROK_BACKSPACE = 8, + RETROK_TAB = 9, + RETROK_CLEAR = 12, + RETROK_RETURN = 13, + RETROK_PAUSE = 19, + RETROK_ESCAPE = 27, + RETROK_SPACE = 32, + RETROK_EXCLAIM = 33, + RETROK_QUOTEDBL = 34, + RETROK_HASH = 35, + RETROK_DOLLAR = 36, + RETROK_AMPERSAND = 38, + RETROK_QUOTE = 39, + RETROK_LEFTPAREN = 40, + RETROK_RIGHTPAREN = 41, + RETROK_ASTERISK = 42, + RETROK_PLUS = 43, + RETROK_COMMA = 44, + RETROK_MINUS = 45, + RETROK_PERIOD = 46, + RETROK_SLASH = 47, + RETROK_0 = 48, + RETROK_1 = 49, + RETROK_2 = 50, + RETROK_3 = 51, + RETROK_4 = 52, + RETROK_5 = 53, + RETROK_6 = 54, + RETROK_7 = 55, + RETROK_8 = 56, + RETROK_9 = 57, + RETROK_COLON = 58, + RETROK_SEMICOLON = 59, + RETROK_LESS = 60, + RETROK_EQUALS = 61, + RETROK_GREATER = 62, + RETROK_QUESTION = 63, + RETROK_AT = 64, + RETROK_LEFTBRACKET = 91, + RETROK_BACKSLASH = 92, + RETROK_RIGHTBRACKET = 93, + RETROK_CARET = 94, + RETROK_UNDERSCORE = 95, + RETROK_BACKQUOTE = 96, + RETROK_a = 97, + RETROK_b = 98, + RETROK_c = 99, + RETROK_d = 100, + RETROK_e = 101, + RETROK_f = 102, + RETROK_g = 103, + RETROK_h = 104, + RETROK_i = 105, + RETROK_j = 106, + RETROK_k = 107, + RETROK_l = 108, + RETROK_m = 109, + RETROK_n = 110, + RETROK_o = 111, + RETROK_p = 112, + RETROK_q = 113, + RETROK_r = 114, + RETROK_s = 115, + RETROK_t = 116, + RETROK_u = 117, + RETROK_v = 118, + RETROK_w = 119, + RETROK_x = 120, + RETROK_y = 121, + RETROK_z = 122, + RETROK_DELETE = 127, + + RETROK_KP0 = 256, + RETROK_KP1 = 257, + RETROK_KP2 = 258, + RETROK_KP3 = 259, + RETROK_KP4 = 260, + RETROK_KP5 = 261, + RETROK_KP6 = 262, + RETROK_KP7 = 263, + RETROK_KP8 = 264, + RETROK_KP9 = 265, + RETROK_KP_PERIOD = 266, + RETROK_KP_DIVIDE = 267, + RETROK_KP_MULTIPLY = 268, + RETROK_KP_MINUS = 269, + RETROK_KP_PLUS = 270, + RETROK_KP_ENTER = 271, + RETROK_KP_EQUALS = 272, + + RETROK_UP = 273, + RETROK_DOWN = 274, + RETROK_RIGHT = 275, + RETROK_LEFT = 276, + RETROK_INSERT = 277, + RETROK_HOME = 278, + RETROK_END = 279, + RETROK_PAGEUP = 280, + RETROK_PAGEDOWN = 281, + + RETROK_F1 = 282, + RETROK_F2 = 283, + RETROK_F3 = 284, + RETROK_F4 = 285, + RETROK_F5 = 286, + RETROK_F6 = 287, + RETROK_F7 = 288, + RETROK_F8 = 289, + RETROK_F9 = 290, + RETROK_F10 = 291, + RETROK_F11 = 292, + RETROK_F12 = 293, + RETROK_F13 = 294, + RETROK_F14 = 295, + RETROK_F15 = 296, + + RETROK_NUMLOCK = 300, + RETROK_CAPSLOCK = 301, + RETROK_SCROLLOCK = 302, + RETROK_RSHIFT = 303, + RETROK_LSHIFT = 304, + RETROK_RCTRL = 305, + RETROK_LCTRL = 306, + RETROK_RALT = 307, + RETROK_LALT = 308, + RETROK_RMETA = 309, + RETROK_LMETA = 310, + RETROK_LSUPER = 311, + RETROK_RSUPER = 312, + RETROK_MODE = 313, + RETROK_COMPOSE = 314, + + RETROK_HELP = 315, + RETROK_PRINT = 316, + RETROK_SYSREQ = 317, + RETROK_BREAK = 318, + RETROK_MENU = 319, + RETROK_POWER = 320, + RETROK_EURO = 321, + RETROK_UNDO = 322, + + RETROK_LAST, + + RETROK_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */ +}; + +enum retro_mod +{ + RETROKMOD_NONE = 0x0000, + + RETROKMOD_SHIFT = 0x01, + RETROKMOD_CTRL = 0x02, + RETROKMOD_ALT = 0x04, + RETROKMOD_META = 0x08, + + RETROKMOD_NUMLOCK = 0x10, + RETROKMOD_CAPSLOCK = 0x20, + RETROKMOD_SCROLLOCK = 0x40, + + RETROKMOD_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */ +}; + +/* If set, this call is not part of the public libretro API yet. It can + * change or be removed at any time. */ +#define RETRO_ENVIRONMENT_EXPERIMENTAL 0x10000 +/* Environment callback to be used internally in frontend. */ +#define RETRO_ENVIRONMENT_PRIVATE 0x20000 + +/* Environment commands. */ +#define RETRO_ENVIRONMENT_SET_ROTATION 1 /* const unsigned * -- + * Sets screen rotation of graphics. + * Is only implemented if rotation can be accelerated by hardware. + * Valid values are 0, 1, 2, 3, which rotates screen by 0, 90, 180, + * 270 degrees counter-clockwise respectively. + */ +#define RETRO_ENVIRONMENT_GET_OVERSCAN 2 /* bool * -- + * Boolean value whether or not the implementation should use overscan, + * or crop away overscan. + */ +#define RETRO_ENVIRONMENT_GET_CAN_DUPE 3 /* bool * -- + * Boolean value whether or not frontend supports frame duping, + * passing NULL to video frame callback. + */ + + /* Environ 4, 5 are no longer supported (GET_VARIABLE / SET_VARIABLES), + * and reserved to avoid possible ABI clash. + */ + +#define RETRO_ENVIRONMENT_SET_MESSAGE 6 /* const struct retro_message * -- + * Sets a message to be displayed in implementation-specific manner + * for a certain amount of 'frames'. + * Should not be used for trivial messages, which should simply be + * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a + * fallback, stderr). + */ +#define RETRO_ENVIRONMENT_SHUTDOWN 7 /* N/A (NULL) -- + * Requests the frontend to shutdown. + * Should only be used if game has a specific + * way to shutdown the game from a menu item or similar. + */ +#define RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL 8 + /* const unsigned * -- + * Gives a hint to the frontend how demanding this implementation + * is on a system. E.g. reporting a level of 2 means + * this implementation should run decently on all frontends + * of level 2 and up. + * + * It can be used by the frontend to potentially warn + * about too demanding implementations. + * + * The levels are "floating". + * + * This function can be called on a per-game basis, + * as certain games an implementation can play might be + * particularly demanding. + * If called, it should be called in retro_load_game(). + */ +#define RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY 9 + /* const char ** -- + * Returns the "system" directory of the frontend. + * This directory can be used to store system specific + * content such as BIOSes, configuration data, etc. + * The returned value can be NULL. + * If so, no such directory is defined, + * and it's up to the implementation to find a suitable directory. + * + * NOTE: Some cores used this folder also for "save" data such as + * memory cards, etc, for lack of a better place to put it. + * This is now discouraged, and if possible, cores should try to + * use the new GET_SAVE_DIRECTORY. + */ +#define RETRO_ENVIRONMENT_SET_PIXEL_FORMAT 10 + /* const enum retro_pixel_format * -- + * Sets the internal pixel format used by the implementation. + * The default pixel format is RETRO_PIXEL_FORMAT_0RGB1555. + * This pixel format however, is deprecated (see enum retro_pixel_format). + * If the call returns false, the frontend does not support this pixel + * format. + * + * This function should be called inside retro_load_game() or + * retro_get_system_av_info(). + */ +#define RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS 11 + /* const struct retro_input_descriptor * -- + * Sets an array of retro_input_descriptors. + * It is up to the frontend to present this in a usable way. + * The array is terminated by retro_input_descriptor::description + * being set to NULL. + * This function can be called at any time, but it is recommended + * to call it as early as possible. + */ +#define RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK 12 + /* const struct retro_keyboard_callback * -- + * Sets a callback function used to notify core about keyboard events. + */ +#define RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE 13 + /* const struct retro_disk_control_callback * -- + * Sets an interface which frontend can use to eject and insert + * disk images. + * This is used for games which consist of multiple images and + * must be manually swapped out by the user (e.g. PSX). + */ +#define RETRO_ENVIRONMENT_SET_HW_RENDER 14 + /* struct retro_hw_render_callback * -- + * Sets an interface to let a libretro core render with + * hardware acceleration. + * Should be called in retro_load_game(). + * If successful, libretro cores will be able to render to a + * frontend-provided framebuffer. + * The size of this framebuffer will be at least as large as + * max_width/max_height provided in get_av_info(). + * If HW rendering is used, pass only RETRO_HW_FRAME_BUFFER_VALID or + * NULL to retro_video_refresh_t. + */ +#define RETRO_ENVIRONMENT_GET_VARIABLE 15 + /* struct retro_variable * -- + * Interface to acquire user-defined information from environment + * that cannot feasibly be supported in a multi-system way. + * 'key' should be set to a key which has already been set by + * SET_VARIABLES. + * 'data' will be set to a value or NULL. + */ +#define RETRO_ENVIRONMENT_SET_VARIABLES 16 + /* const struct retro_variable * -- + * Allows an implementation to signal the environment + * which variables it might want to check for later using + * GET_VARIABLE. + * This allows the frontend to present these variables to + * a user dynamically. + * This should be called as early as possible (ideally in + * retro_set_environment). + * + * 'data' points to an array of retro_variable structs + * terminated by a { NULL, NULL } element. + * retro_variable::key should be namespaced to not collide + * with other implementations' keys. E.g. A core called + * 'foo' should use keys named as 'foo_option'. + * retro_variable::value should contain a human readable + * description of the key as well as a '|' delimited list + * of expected values. + * + * The number of possible options should be very limited, + * i.e. it should be feasible to cycle through options + * without a keyboard. + * + * First entry should be treated as a default. + * + * Example entry: + * { "foo_option", "Speed hack coprocessor X; false|true" } + * + * Text before first ';' is description. This ';' must be + * followed by a space, and followed by a list of possible + * values split up with '|'. + * + * Only strings are operated on. The possible values will + * generally be displayed and stored as-is by the frontend. + */ +#define RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE 17 + /* bool * -- + * Result is set to true if some variables are updated by + * frontend since last call to RETRO_ENVIRONMENT_GET_VARIABLE. + * Variables should be queried with GET_VARIABLE. + */ +#define RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME 18 + /* const bool * -- + * If true, the libretro implementation supports calls to + * retro_load_game() with NULL as argument. + * Used by cores which can run without particular game data. + * This should be called within retro_set_environment() only. + */ +#define RETRO_ENVIRONMENT_GET_LIBRETRO_PATH 19 + /* const char ** -- + * Retrieves the absolute path from where this libretro + * implementation was loaded. + * NULL is returned if the libretro was loaded statically + * (i.e. linked statically to frontend), or if the path cannot be + * determined. + * Mostly useful in cooperation with SET_SUPPORT_NO_GAME as assets can + * be loaded without ugly hacks. + */ + + /* Environment 20 was an obsolete version of SET_AUDIO_CALLBACK. + * It was not used by any known core at the time, + * and was removed from the API. */ +#define RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK 22 + /* const struct retro_audio_callback * -- + * Sets an interface which is used to notify a libretro core about audio + * being available for writing. + * The callback can be called from any thread, so a core using this must + * have a thread safe audio implementation. + * It is intended for games where audio and video are completely + * asynchronous and audio can be generated on the fly. + * This interface is not recommended for use with emulators which have + * highly synchronous audio. + * + * The callback only notifies about writability; the libretro core still + * has to call the normal audio callbacks + * to write audio. The audio callbacks must be called from within the + * notification callback. + * The amount of audio data to write is up to the implementation. + * Generally, the audio callback will be called continously in a loop. + * + * Due to thread safety guarantees and lack of sync between audio and + * video, a frontend can selectively disallow this interface based on + * internal configuration. A core using this interface must also + * implement the "normal" audio interface. + * + * A libretro core using SET_AUDIO_CALLBACK should also make use of + * SET_FRAME_TIME_CALLBACK. + */ +#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21 + /* const struct retro_frame_time_callback * -- + * Lets the core know how much time has passed since last + * invocation of retro_run(). + * The frontend can tamper with the timing to fake fast-forward, + * slow-motion, frame stepping, etc. + * In this case the delta time will use the reference value + * in frame_time_callback.. + */ +#define RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE 23 + /* struct retro_rumble_interface * -- + * Gets an interface which is used by a libretro core to set + * state of rumble motors in controllers. + * A strong and weak motor is supported, and they can be + * controlled indepedently. + */ +#define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24 + /* uint64_t * -- + * Gets a bitmask telling which device type are expected to be + * handled properly in a call to retro_input_state_t. + * Devices which are not handled or recognized always return + * 0 in retro_input_state_t. + * Example bitmask: caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG). + * Should only be called in retro_run(). + */ +#define RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE (25 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* struct retro_sensor_interface * -- + * Gets access to the sensor interface. + * The purpose of this interface is to allow + * setting state related to sensors such as polling rate, + * enabling/disable it entirely, etc. + * Reading sensor state is done via the normal + * input_state_callback API. + */ +#define RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE (26 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* struct retro_camera_callback * -- + * Gets an interface to a video camera driver. + * A libretro core can use this interface to get access to a + * video camera. + * New video frames are delivered in a callback in same + * thread as retro_run(). + * + * GET_CAMERA_INTERFACE should be called in retro_load_game(). + * + * Depending on the camera implementation used, camera frames + * will be delivered as a raw framebuffer, + * or as an OpenGL texture directly. + * + * The core has to tell the frontend here which types of + * buffers can be handled properly. + * An OpenGL texture can only be handled when using a + * libretro GL core (SET_HW_RENDER). + * It is recommended to use a libretro GL core when + * using camera interface. + * + * The camera is not started automatically. The retrieved start/stop + * functions must be used to explicitly + * start and stop the camera driver. + */ +#define RETRO_ENVIRONMENT_GET_LOG_INTERFACE 27 + /* struct retro_log_callback * -- + * Gets an interface for logging. This is useful for + * logging in a cross-platform way + * as certain platforms cannot use use stderr for logging. + * It also allows the frontend to + * show logging information in a more suitable way. + * If this interface is not used, libretro cores should + * log to stderr as desired. + */ +#define RETRO_ENVIRONMENT_GET_PERF_INTERFACE 28 + /* struct retro_perf_callback * -- + * Gets an interface for performance counters. This is useful + * for performance logging in a cross-platform way and for detecting + * architecture-specific features, such as SIMD support. + */ +#define RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE 29 + /* struct retro_location_callback * -- + * Gets access to the location interface. + * The purpose of this interface is to be able to retrieve + * location-based information from the host device, + * such as current latitude / longitude. + */ +#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 + /* const char ** -- + * Returns the "content" directory of the frontend. + * This directory can be used to store specific assets that the + * core relies upon, such as art assets, + * input data, etc etc. + * The returned value can be NULL. + * If so, no such directory is defined, + * and it's up to the implementation to find a suitable directory. + */ +#define RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY 31 + /* const char ** -- + * Returns the "save" directory of the frontend. + * This directory can be used to store SRAM, memory cards, + * high scores, etc, if the libretro core + * cannot use the regular memory interface (retro_get_memory_data()). + * + * NOTE: libretro cores used to check GET_SYSTEM_DIRECTORY for + * similar things before. + * They should still check GET_SYSTEM_DIRECTORY if they want to + * be backwards compatible. + * The path here can be NULL. It should only be non-NULL if the + * frontend user has set a specific save path. + */ +#define RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO 32 + /* const struct retro_system_av_info * -- + * Sets a new av_info structure. This can only be called from + * within retro_run(). + * This should *only* be used if the core is completely altering the + * internal resolutions, aspect ratios, timings, sampling rate, etc. + * Calling this can require a full reinitialization of video/audio + * drivers in the frontend, + * + * so it is important to call it very sparingly, and usually only with + * the users explicit consent. + * An eventual driver reinitialize will happen so that video and + * audio callbacks + * happening after this call within the same retro_run() call will + * target the newly initialized driver. + * + * This callback makes it possible to support configurable resolutions + * in games, which can be useful to + * avoid setting the "worst case" in max_width/max_height. + * + * ***HIGHLY RECOMMENDED*** Do not call this callback every time + * resolution changes in an emulator core if it's + * expected to be a temporary change, for the reasons of possible + * driver reinitialization. + * This call is not a free pass for not trying to provide + * correct values in retro_get_system_av_info(). If you need to change + * things like aspect ratio or nominal width/height, + * use RETRO_ENVIRONMENT_SET_GEOMETRY, which is a softer variant + * of SET_SYSTEM_AV_INFO. + * + * If this returns false, the frontend does not acknowledge a + * changed av_info struct. + */ +#define RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK 33 + /* const struct retro_get_proc_address_interface * -- + * Allows a libretro core to announce support for the + * get_proc_address() interface. + * This interface allows for a standard way to extend libretro where + * use of environment calls are too indirect, + * e.g. for cases where the frontend wants to call directly into the core. + * + * If a core wants to expose this interface, SET_PROC_ADDRESS_CALLBACK + * **MUST** be called from within retro_set_environment(). + */ +#define RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO 34 + /* const struct retro_subsystem_info * -- + * This environment call introduces the concept of libretro "subsystems". + * A subsystem is a variant of a libretro core which supports + * different kinds of games. + * The purpose of this is to support e.g. emulators which might + * have special needs, e.g. Super Nintendo's Super GameBoy, Sufami Turbo. + * It can also be used to pick among subsystems in an explicit way + * if the libretro implementation is a multi-system emulator itself. + * + * Loading a game via a subsystem is done with retro_load_game_special(), + * and this environment call allows a libretro core to expose which + * subsystems are supported for use with retro_load_game_special(). + * A core passes an array of retro_game_special_info which is terminated + * with a zeroed out retro_game_special_info struct. + * + * If a core wants to use this functionality, SET_SUBSYSTEM_INFO + * **MUST** be called from within retro_set_environment(). + */ +#define RETRO_ENVIRONMENT_SET_CONTROLLER_INFO 35 + /* const struct retro_controller_info * -- + * This environment call lets a libretro core tell the frontend + * which controller types are recognized in calls to + * retro_set_controller_port_device(). + * + * Some emulators such as Super Nintendo + * support multiple lightgun types which must be specifically + * selected from. + * It is therefore sometimes necessary for a frontend to be able + * to tell the core about a special kind of input device which is + * not covered by the libretro input API. + * + * In order for a frontend to understand the workings of an input device, + * it must be a specialized type + * of the generic device types already defined in the libretro API. + * + * Which devices are supported can vary per input port. + * The core must pass an array of const struct retro_controller_info which + * is terminated with a blanked out struct. Each element of the struct + * corresponds to an ascending port index to + * retro_set_controller_port_device(). + * Even if special device types are set in the libretro core, + * libretro should only poll input based on the base input device types. + */ +#define RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* const struct retro_memory_map * -- + * This environment call lets a libretro core tell the frontend + * about the memory maps this core emulates. + * This can be used to implement, for example, cheats in a core-agnostic way. + * + * Should only be used by emulators; it doesn't make much sense for + * anything else. + * It is recommended to expose all relevant pointers through + * retro_get_memory_* as well. + * + * Can be called from retro_init and retro_load_game. + */ +#define RETRO_ENVIRONMENT_SET_GEOMETRY 37 + /* const struct retro_game_geometry * -- + * This environment call is similar to SET_SYSTEM_AV_INFO for changing + * video parameters, but provides a guarantee that drivers will not be + * reinitialized. + * This can only be called from within retro_run(). + * + * The purpose of this call is to allow a core to alter nominal + * width/heights as well as aspect ratios on-the-fly, which can be + * useful for some emulators to change in run-time. + * + * max_width/max_height arguments are ignored and cannot be changed + * with this call as this could potentially require a reinitialization or a + * non-constant time operation. + * If max_width/max_height are to be changed, SET_SYSTEM_AV_INFO is required. + * + * A frontend must guarantee that this environment call completes in + * constant time. + */ +#define RETRO_ENVIRONMENT_GET_USERNAME 38 + /* const char ** + * Returns the specified username of the frontend, if specified by the user. + * This username can be used as a nickname for a core that has online facilities + * or any other mode where personalization of the user is desirable. + * The returned value can be NULL. + * If this environ callback is used by a core that requires a valid username, + * a default username should be specified by the core. + */ +#define RETRO_ENVIRONMENT_GET_LANGUAGE 39 + /* unsigned * -- + * Returns the specified language of the frontend, if specified by the user. + * It can be used by the core for localization purposes. + */ + +#define RETRO_MEMDESC_CONST (1 << 0) /* The frontend will never change this memory area once retro_load_game has returned. */ +#define RETRO_MEMDESC_BIGENDIAN (1 << 1) /* The memory area contains big endian data. Default is little endian. */ +#define RETRO_MEMDESC_ALIGN_2 (1 << 16) /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */ +#define RETRO_MEMDESC_ALIGN_4 (2 << 16) +#define RETRO_MEMDESC_ALIGN_8 (3 << 16) +#define RETRO_MEMDESC_MINSIZE_2 (1 << 24) /* All memory in this region is accessed at least 2 bytes at the time. */ +#define RETRO_MEMDESC_MINSIZE_4 (2 << 24) +#define RETRO_MEMDESC_MINSIZE_8 (3 << 24) +struct retro_memory_descriptor +{ + uint64_t flags; + + /* Pointer to the start of the relevant ROM or RAM chip. + * It's strongly recommended to use 'offset' if possible, rather than + * doing math on the pointer. + * + * If the same byte is mapped my multiple descriptors, their descriptors + * must have the same pointer. + * If 'start' does not point to the first byte in the pointer, put the + * difference in 'offset' instead. + * + * May be NULL if there's nothing usable here (e.g. hardware registers and + * open bus). No flags should be set if the pointer is NULL. + * It's recommended to minimize the number of descriptors if possible, + * but not mandatory. */ + void *ptr; + size_t offset; + + /* This is the location in the emulated address space + * where the mapping starts. */ + size_t start; + + /* Which bits must be same as in 'start' for this mapping to apply. + * The first memory descriptor to claim a certain byte is the one + * that applies. + * A bit which is set in 'start' must also be set in this. + * Can be zero, in which case each byte is assumed mapped exactly once. + * In this case, 'len' must be a power of two. */ + size_t select; + + /* If this is nonzero, the set bits are assumed not connected to the + * memory chip's address pins. */ + size_t disconnect; + + /* This one tells the size of the current memory area. + * If, after start+disconnect are applied, the address is higher than + * this, the highest bit of the address is cleared. + * + * If the address is still too high, the next highest bit is cleared. + * Can be zero, in which case it's assumed to be infinite (as limited + * by 'select' and 'disconnect'). */ + size_t len; + + /* To go from emulated address to physical address, the following + * order applies: + * Subtract 'start', pick off 'disconnect', apply 'len', add 'offset'. + * + * The address space name must consist of only a-zA-Z0-9_-, + * should be as short as feasible (maximum length is 8 plus the NUL), + * and may not be any other address space plus one or more 0-9A-F + * at the end. + * However, multiple memory descriptors for the same address space is + * allowed, and the address space name can be empty. NULL is treated + * as empty. + * + * Address space names are case sensitive, but avoid lowercase if possible. + * The same pointer may exist in multiple address spaces. + * + * Examples: + * blank+blank - valid (multiple things may be mapped in the same namespace) + * 'Sp'+'Sp' - valid (multiple things may be mapped in the same namespace) + * 'A'+'B' - valid (neither is a prefix of each other) + * 'S'+blank - valid ('S' is not in 0-9A-F) + * 'a'+blank - valid ('a' is not in 0-9A-F) + * 'a'+'A' - valid (neither is a prefix of each other) + * 'AR'+blank - valid ('R' is not in 0-9A-F) + * 'ARB'+blank - valid (the B can't be part of the address either, because + * there is no namespace 'AR') + * blank+'B' - not valid, because it's ambigous which address space B1234 + * would refer to. + * The length can't be used for that purpose; the frontend may want + * to append arbitrary data to an address, without a separator. */ + const char *addrspace; +}; + +/* The frontend may use the largest value of 'start'+'select' in a + * certain namespace to infer the size of the address space. + * + * If the address space is larger than that, a mapping with .ptr=NULL + * should be at the end of the array, with .select set to all ones for + * as long as the address space is big. + * + * Sample descriptors (minus .ptr, and RETRO_MEMFLAG_ on the flags): + * SNES WRAM: + * .start=0x7E0000, .len=0x20000 + * (Note that this must be mapped before the ROM in most cases; some of the + * ROM mappers + * try to claim $7E0000, or at least $7E8000.) + * SNES SPC700 RAM: + * .addrspace="S", .len=0x10000 + * SNES WRAM mirrors: + * .flags=MIRROR, .start=0x000000, .select=0xC0E000, .len=0x2000 + * .flags=MIRROR, .start=0x800000, .select=0xC0E000, .len=0x2000 + * SNES WRAM mirrors, alternate equivalent descriptor: + * .flags=MIRROR, .select=0x40E000, .disconnect=~0x1FFF + * (Various similar constructions can be created by combining parts of + * the above two.) + * SNES LoROM (512KB, mirrored a couple of times): + * .flags=CONST, .start=0x008000, .select=0x408000, .disconnect=0x8000, .len=512*1024 + * .flags=CONST, .start=0x400000, .select=0x400000, .disconnect=0x8000, .len=512*1024 + * SNES HiROM (4MB): + * .flags=CONST, .start=0x400000, .select=0x400000, .len=4*1024*1024 + * .flags=CONST, .offset=0x8000, .start=0x008000, .select=0x408000, .len=4*1024*1024 + * SNES ExHiROM (8MB): + * .flags=CONST, .offset=0, .start=0xC00000, .select=0xC00000, .len=4*1024*1024 + * .flags=CONST, .offset=4*1024*1024, .start=0x400000, .select=0xC00000, .len=4*1024*1024 + * .flags=CONST, .offset=0x8000, .start=0x808000, .select=0xC08000, .len=4*1024*1024 + * .flags=CONST, .offset=4*1024*1024+0x8000, .start=0x008000, .select=0xC08000, .len=4*1024*1024 + * Clarify the size of the address space: + * .ptr=NULL, .select=0xFFFFFF + * .len can be implied by .select in many of them, but was included for clarity. + */ + +struct retro_memory_map +{ + const struct retro_memory_descriptor *descriptors; + unsigned num_descriptors; +}; + +struct retro_controller_description +{ + /* Human-readable description of the controller. Even if using a generic + * input device type, this can be set to the particular device type the + * core uses. */ + const char *desc; + + /* Device type passed to retro_set_controller_port_device(). If the device + * type is a sub-class of a generic input device type, use the + * RETRO_DEVICE_SUBCLASS macro to create an ID. + * + * E.g. RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1). */ + unsigned id; +}; + +struct retro_controller_info +{ + const struct retro_controller_description *types; + unsigned num_types; +}; + +struct retro_subsystem_memory_info +{ + /* The extension associated with a memory type, e.g. "psram". */ + const char *extension; + + /* The memory type for retro_get_memory(). This should be at + * least 0x100 to avoid conflict with standardized + * libretro memory types. */ + unsigned type; +}; + +struct retro_subsystem_rom_info +{ + /* Describes what the content is (SGB BIOS, GB ROM, etc). */ + const char *desc; + + /* Same definition as retro_get_system_info(). */ + const char *valid_extensions; + + /* Same definition as retro_get_system_info(). */ + bool need_fullpath; + + /* Same definition as retro_get_system_info(). */ + bool block_extract; + + /* This is set if the content is required to load a game. + * If this is set to false, a zeroed-out retro_game_info can be passed. */ + bool required; + + /* Content can have multiple associated persistent + * memory types (retro_get_memory()). */ + const struct retro_subsystem_memory_info *memory; + unsigned num_memory; +}; + +struct retro_subsystem_info +{ + /* Human-readable string of the subsystem type, e.g. "Super GameBoy" */ + const char *desc; + + /* A computer friendly short string identifier for the subsystem type. + * This name must be [a-z]. + * E.g. if desc is "Super GameBoy", this can be "sgb". + * This identifier can be used for command-line interfaces, etc. + */ + const char *ident; + + /* Infos for each content file. The first entry is assumed to be the + * "most significant" content for frontend purposes. + * E.g. with Super GameBoy, the first content should be the GameBoy ROM, + * as it is the most "significant" content to a user. + * If a frontend creates new file paths based on the content used + * (e.g. savestates), it should use the path for the first ROM to do so. */ + const struct retro_subsystem_rom_info *roms; + + /* Number of content files associated with a subsystem. */ + unsigned num_roms; + + /* The type passed to retro_load_game_special(). */ + unsigned id; +}; + +typedef void (*retro_proc_address_t)(void); + +/* libretro API extension functions: + * (None here so far). + * + * Get a symbol from a libretro core. + * Cores should only return symbols which are actual + * extensions to the libretro API. + * + * Frontends should not use this to obtain symbols to standard + * libretro entry points (static linking or dlsym). + * + * The symbol name must be equal to the function name, + * e.g. if void retro_foo(void); exists, the symbol must be called "retro_foo". + * The returned function pointer must be cast to the corresponding type. + */ +typedef retro_proc_address_t (*retro_get_proc_address_t)(const char *sym); + +struct retro_get_proc_address_interface +{ + retro_get_proc_address_t get_proc_address; +}; + +enum retro_log_level +{ + RETRO_LOG_DEBUG = 0, + RETRO_LOG_INFO, + RETRO_LOG_WARN, + RETRO_LOG_ERROR, + + RETRO_LOG_DUMMY = INT_MAX +}; + +/* Logging function. Takes log level argument as well. */ +typedef void (*retro_log_printf_t)(enum retro_log_level level, + const char *fmt, ...); + +struct retro_log_callback +{ + retro_log_printf_t log; +}; + +/* Performance related functions */ + +/* ID values for SIMD CPU features */ +#define RETRO_SIMD_SSE (1 << 0) +#define RETRO_SIMD_SSE2 (1 << 1) +#define RETRO_SIMD_VMX (1 << 2) +#define RETRO_SIMD_VMX128 (1 << 3) +#define RETRO_SIMD_AVX (1 << 4) +#define RETRO_SIMD_NEON (1 << 5) +#define RETRO_SIMD_SSE3 (1 << 6) +#define RETRO_SIMD_SSSE3 (1 << 7) +#define RETRO_SIMD_MMX (1 << 8) +#define RETRO_SIMD_MMXEXT (1 << 9) +#define RETRO_SIMD_SSE4 (1 << 10) +#define RETRO_SIMD_SSE42 (1 << 11) +#define RETRO_SIMD_AVX2 (1 << 12) +#define RETRO_SIMD_VFPU (1 << 13) +#define RETRO_SIMD_PS (1 << 14) +#define RETRO_SIMD_AES (1 << 15) + +typedef uint64_t retro_perf_tick_t; +typedef int64_t retro_time_t; + +struct retro_perf_counter +{ + const char *ident; + retro_perf_tick_t start; + retro_perf_tick_t total; + retro_perf_tick_t call_cnt; + + bool registered; +}; + +/* Returns current time in microseconds. + * Tries to use the most accurate timer available. + */ +typedef retro_time_t (*retro_perf_get_time_usec_t)(void); + +/* A simple counter. Usually nanoseconds, but can also be CPU cycles. + * Can be used directly if desired (when creating a more sophisticated + * performance counter system). + * */ +typedef retro_perf_tick_t (*retro_perf_get_counter_t)(void); + +/* Returns a bit-mask of detected CPU features (RETRO_SIMD_*). */ +typedef uint64_t (*retro_get_cpu_features_t)(void); + +/* Asks frontend to log and/or display the state of performance counters. + * Performance counters can always be poked into manually as well. + */ +typedef void (*retro_perf_log_t)(void); + +/* Register a performance counter. + * ident field must be set with a discrete value and other values in + * retro_perf_counter must be 0. + * Registering can be called multiple times. To avoid calling to + * frontend redundantly, you can check registered field first. */ +typedef void (*retro_perf_register_t)(struct retro_perf_counter *counter); + +/* Starts a registered counter. */ +typedef void (*retro_perf_start_t)(struct retro_perf_counter *counter); + +/* Stops a registered counter. */ +typedef void (*retro_perf_stop_t)(struct retro_perf_counter *counter); + +/* For convenience it can be useful to wrap register, start and stop in macros. + * E.g.: + * #ifdef LOG_PERFORMANCE + * #define RETRO_PERFORMANCE_INIT(perf_cb, name) static struct retro_perf_counter name = {#name}; if (!name.registered) perf_cb.perf_register(&(name)) + * #define RETRO_PERFORMANCE_START(perf_cb, name) perf_cb.perf_start(&(name)) + * #define RETRO_PERFORMANCE_STOP(perf_cb, name) perf_cb.perf_stop(&(name)) + * #else + * ... Blank macros ... + * #endif + * + * These can then be used mid-functions around code snippets. + * + * extern struct retro_perf_callback perf_cb; * Somewhere in the core. + * + * void do_some_heavy_work(void) + * { + * RETRO_PERFORMANCE_INIT(cb, work_1; + * RETRO_PERFORMANCE_START(cb, work_1); + * heavy_work_1(); + * RETRO_PERFORMANCE_STOP(cb, work_1); + * + * RETRO_PERFORMANCE_INIT(cb, work_2); + * RETRO_PERFORMANCE_START(cb, work_2); + * heavy_work_2(); + * RETRO_PERFORMANCE_STOP(cb, work_2); + * } + * + * void retro_deinit(void) + * { + * perf_cb.perf_log(); * Log all perf counters here for example. + * } + */ + +struct retro_perf_callback +{ + retro_perf_get_time_usec_t get_time_usec; + retro_get_cpu_features_t get_cpu_features; + + retro_perf_get_counter_t get_perf_counter; + retro_perf_register_t perf_register; + retro_perf_start_t perf_start; + retro_perf_stop_t perf_stop; + retro_perf_log_t perf_log; +}; + +/* FIXME: Document the sensor API and work out behavior. + * It will be marked as experimental until then. + */ +enum retro_sensor_action +{ + RETRO_SENSOR_ACCELEROMETER_ENABLE = 0, + RETRO_SENSOR_ACCELEROMETER_DISABLE, + + RETRO_SENSOR_DUMMY = INT_MAX +}; + +/* Id values for SENSOR types. */ +#define RETRO_SENSOR_ACCELEROMETER_X 0 +#define RETRO_SENSOR_ACCELEROMETER_Y 1 +#define RETRO_SENSOR_ACCELEROMETER_Z 2 + +typedef bool (*retro_set_sensor_state_t)(unsigned port, + enum retro_sensor_action action, unsigned rate); + +typedef float (*retro_sensor_get_input_t)(unsigned port, unsigned id); + +struct retro_sensor_interface +{ + retro_set_sensor_state_t set_sensor_state; + retro_sensor_get_input_t get_sensor_input; +}; + +enum retro_camera_buffer +{ + RETRO_CAMERA_BUFFER_OPENGL_TEXTURE = 0, + RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER, + + RETRO_CAMERA_BUFFER_DUMMY = INT_MAX +}; + +/* Starts the camera driver. Can only be called in retro_run(). */ +typedef bool (*retro_camera_start_t)(void); + +/* Stops the camera driver. Can only be called in retro_run(). */ +typedef void (*retro_camera_stop_t)(void); + +/* Callback which signals when the camera driver is initialized + * and/or deinitialized. + * retro_camera_start_t can be called in initialized callback. + */ +typedef void (*retro_camera_lifetime_status_t)(void); + +/* A callback for raw framebuffer data. buffer points to an XRGB8888 buffer. + * Width, height and pitch are similar to retro_video_refresh_t. + * First pixel is top-left origin. + */ +typedef void (*retro_camera_frame_raw_framebuffer_t)(const uint32_t *buffer, + unsigned width, unsigned height, size_t pitch); + +/* A callback for when OpenGL textures are used. + * + * texture_id is a texture owned by camera driver. + * Its state or content should be considered immutable, except for things like + * texture filtering and clamping. + * + * texture_target is the texture target for the GL texture. + * These can include e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE, and possibly + * more depending on extensions. + * + * affine points to a packed 3x3 column-major matrix used to apply an affine + * transform to texture coordinates. (affine_matrix * vec3(coord_x, coord_y, 1.0)) + * After transform, normalized texture coord (0, 0) should be bottom-left + * and (1, 1) should be top-right (or (width, height) for RECTANGLE). + * + * GL-specific typedefs are avoided here to avoid relying on gl.h in + * the API definition. + */ +typedef void (*retro_camera_frame_opengl_texture_t)(unsigned texture_id, + unsigned texture_target, const float *affine); + +struct retro_camera_callback +{ + /* Set by libretro core. + * Example bitmask: caps = (1 << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE) | (1 << RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER). + */ + uint64_t caps; + + unsigned width; /* Desired resolution for camera. Is only used as a hint. */ + unsigned height; + retro_camera_start_t start; /* Set by frontend. */ + retro_camera_stop_t stop; /* Set by frontend. */ + + /* Set by libretro core if raw framebuffer callbacks will be used. */ + retro_camera_frame_raw_framebuffer_t frame_raw_framebuffer; + /* Set by libretro core if OpenGL texture callbacks will be used. */ + retro_camera_frame_opengl_texture_t frame_opengl_texture; + + /* Set by libretro core. Called after camera driver is initialized and + * ready to be started. + * Can be NULL, in which this callback is not called. + */ + retro_camera_lifetime_status_t initialized; + + /* Set by libretro core. Called right before camera driver is + * deinitialized. + * Can be NULL, in which this callback is not called. + */ + retro_camera_lifetime_status_t deinitialized; +}; + +/* Sets the interval of time and/or distance at which to update/poll + * location-based data. + * + * To ensure compatibility with all location-based implementations, + * values for both interval_ms and interval_distance should be provided. + * + * interval_ms is the interval expressed in milliseconds. + * interval_distance is the distance interval expressed in meters. + */ +typedef void (*retro_location_set_interval_t)(unsigned interval_ms, + unsigned interval_distance); + +/* Start location services. The device will start listening for changes to the + * current location at regular intervals (which are defined with + * retro_location_set_interval_t). */ +typedef bool (*retro_location_start_t)(void); + +/* Stop location services. The device will stop listening for changes + * to the current location. */ +typedef void (*retro_location_stop_t)(void); + +/* Get the position of the current location. Will set parameters to + * 0 if no new location update has happened since the last time. */ +typedef bool (*retro_location_get_position_t)(double *lat, double *lon, + double *horiz_accuracy, double *vert_accuracy); + +/* Callback which signals when the location driver is initialized + * and/or deinitialized. + * retro_location_start_t can be called in initialized callback. + */ +typedef void (*retro_location_lifetime_status_t)(void); + +struct retro_location_callback +{ + retro_location_start_t start; + retro_location_stop_t stop; + retro_location_get_position_t get_position; + retro_location_set_interval_t set_interval; + + retro_location_lifetime_status_t initialized; + retro_location_lifetime_status_t deinitialized; +}; + +enum retro_rumble_effect +{ + RETRO_RUMBLE_STRONG = 0, + RETRO_RUMBLE_WEAK = 1, + + RETRO_RUMBLE_DUMMY = INT_MAX +}; + +/* Sets rumble state for joypad plugged in port 'port'. + * Rumble effects are controlled independently, + * and setting e.g. strong rumble does not override weak rumble. + * Strength has a range of [0, 0xffff]. + * + * Returns true if rumble state request was honored. + * Calling this before first retro_run() is likely to return false. */ +typedef bool (*retro_set_rumble_state_t)(unsigned port, + enum retro_rumble_effect effect, uint16_t strength); + +struct retro_rumble_interface +{ + retro_set_rumble_state_t set_rumble_state; +}; + +/* Notifies libretro that audio data should be written. */ +typedef void (*retro_audio_callback_t)(void); + +/* True: Audio driver in frontend is active, and callback is + * expected to be called regularily. + * False: Audio driver in frontend is paused or inactive. + * Audio callback will not be called until set_state has been + * called with true. + * Initial state is false (inactive). + */ +typedef void (*retro_audio_set_state_callback_t)(bool enabled); + +struct retro_audio_callback +{ + retro_audio_callback_t callback; + retro_audio_set_state_callback_t set_state; +}; + +/* Notifies a libretro core of time spent since last invocation + * of retro_run() in microseconds. + * + * It will be called right before retro_run() every frame. + * The frontend can tamper with timing to support cases like + * fast-forward, slow-motion and framestepping. + * + * In those scenarios the reference frame time value will be used. */ +typedef int64_t retro_usec_t; +typedef void (*retro_frame_time_callback_t)(retro_usec_t usec); +struct retro_frame_time_callback +{ + retro_frame_time_callback_t callback; + /* Represents the time of one frame. It is computed as + * 1000000 / fps, but the implementation will resolve the + * rounding to ensure that framestepping, etc is exact. */ + retro_usec_t reference; +}; + +/* Pass this to retro_video_refresh_t if rendering to hardware. + * Passing NULL to retro_video_refresh_t is still a frame dupe as normal. + * */ +#define RETRO_HW_FRAME_BUFFER_VALID ((void*)-1) + +/* Invalidates the current HW context. + * Any GL state is lost, and must not be deinitialized explicitly. + * If explicit deinitialization is desired by the libretro core, + * it should implement context_destroy callback. + * If called, all GPU resources must be reinitialized. + * Usually called when frontend reinits video driver. + * Also called first time video driver is initialized, + * allowing libretro core to initialize resources. + */ +typedef void (*retro_hw_context_reset_t)(void); + +/* Gets current framebuffer which is to be rendered to. + * Could change every frame potentially. + */ +typedef uintptr_t (*retro_hw_get_current_framebuffer_t)(void); + +/* Get a symbol from HW context. */ +typedef retro_proc_address_t (*retro_hw_get_proc_address_t)(const char *sym); + +enum retro_hw_context_type +{ + RETRO_HW_CONTEXT_NONE = 0, + /* OpenGL 2.x. Driver can choose to use latest compatibility context. */ + RETRO_HW_CONTEXT_OPENGL = 1, + /* OpenGL ES 2.0. */ + RETRO_HW_CONTEXT_OPENGLES2 = 2, + /* Modern desktop core GL context. Use version_major/ + * version_minor fields to set GL version. */ + RETRO_HW_CONTEXT_OPENGL_CORE = 3, + /* OpenGL ES 3.0 */ + RETRO_HW_CONTEXT_OPENGLES3 = 4, + /* OpenGL ES 3.1+. Set version_major/version_minor. For GLES2 and GLES3, + * use the corresponding enums directly. */ + RETRO_HW_CONTEXT_OPENGLES_VERSION = 5, + + RETRO_HW_CONTEXT_DUMMY = INT_MAX +}; + +struct retro_hw_render_callback +{ + /* Which API to use. Set by libretro core. */ + enum retro_hw_context_type context_type; + + /* Called when a context has been created or when it has been reset. + * An OpenGL context is only valid after context_reset() has been called. + * + * When context_reset is called, OpenGL resources in the libretro + * implementation are guaranteed to be invalid. + * + * It is possible that context_reset is called multiple times during an + * application lifecycle. + * If context_reset is called without any notification (context_destroy), + * the OpenGL context was lost and resources should just be recreated + * without any attempt to "free" old resources. + */ + retro_hw_context_reset_t context_reset; + + /* Set by frontend. */ + retro_hw_get_current_framebuffer_t get_current_framebuffer; + + /* Set by frontend. */ + retro_hw_get_proc_address_t get_proc_address; + + /* Set if render buffers should have depth component attached. */ + bool depth; + + /* Set if stencil buffers should be attached. */ + bool stencil; + + /* If depth and stencil are true, a packed 24/8 buffer will be added. + * Only attaching stencil is invalid and will be ignored. */ + + /* Use conventional bottom-left origin convention. If false, + * standard libretro top-left origin semantics are used. */ + bool bottom_left_origin; + + /* Major version number for core GL context or GLES 3.1+. */ + unsigned version_major; + + /* Minor version number for core GL context or GLES 3.1+. */ + unsigned version_minor; + + /* If this is true, the frontend will go very far to avoid + * resetting context in scenarios like toggling fullscreen, etc. + */ + bool cache_context; + + /* The reset callback might still be called in extreme situations + * such as if the context is lost beyond recovery. + * + * For optimal stability, set this to false, and allow context to be + * reset at any time. + */ + + /* A callback to be called before the context is destroyed in a + * controlled way by the frontend. */ + retro_hw_context_reset_t context_destroy; + + /* OpenGL resources can be deinitialized cleanly at this step. + * context_destroy can be set to NULL, in which resources will + * just be destroyed without any notification. + * + * Even when context_destroy is non-NULL, it is possible that + * context_reset is called without any destroy notification. + * This happens if context is lost by external factors (such as + * notified by GL_ARB_robustness). + * + * In this case, the context is assumed to be already dead, + * and the libretro implementation must not try to free any OpenGL + * resources in the subsequent context_reset. + */ + + /* Creates a debug context. */ + bool debug_context; +}; + +/* Callback type passed in RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK. + * Called by the frontend in response to keyboard events. + * down is set if the key is being pressed, or false if it is being released. + * keycode is the RETROK value of the char. + * character is the text character of the pressed key. (UTF-32). + * key_modifiers is a set of RETROKMOD values or'ed together. + * + * The pressed/keycode state can be indepedent of the character. + * It is also possible that multiple characters are generated from a + * single keypress. + * Keycode events should be treated separately from character events. + * However, when possible, the frontend should try to synchronize these. + * If only a character is posted, keycode should be RETROK_UNKNOWN. + * + * Similarily if only a keycode event is generated with no corresponding + * character, character should be 0. + */ +typedef void (*retro_keyboard_event_t)(bool down, unsigned keycode, + uint32_t character, uint16_t key_modifiers); + +struct retro_keyboard_callback +{ + retro_keyboard_event_t callback; +}; + +/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE. + * Should be set for implementations which can swap out multiple disk + * images in runtime. + * + * If the implementation can do this automatically, it should strive to do so. + * However, there are cases where the user must manually do so. + * + * Overview: To swap a disk image, eject the disk image with + * set_eject_state(true). + * Set the disk index with set_image_index(index). Insert the disk again + * with set_eject_state(false). + */ + +/* If ejected is true, "ejects" the virtual disk tray. + * When ejected, the disk image index can be set. + */ +typedef bool (*retro_set_eject_state_t)(bool ejected); + +/* Gets current eject state. The initial state is 'not ejected'. */ +typedef bool (*retro_get_eject_state_t)(void); + +/* Gets current disk index. First disk is index 0. + * If return value is >= get_num_images(), no disk is currently inserted. + */ +typedef unsigned (*retro_get_image_index_t)(void); + +/* Sets image index. Can only be called when disk is ejected. + * The implementation supports setting "no disk" by using an + * index >= get_num_images(). + */ +typedef bool (*retro_set_image_index_t)(unsigned index); + +/* Gets total number of images which are available to use. */ +typedef unsigned (*retro_get_num_images_t)(void); + +struct retro_game_info; + +/* Replaces the disk image associated with index. + * Arguments to pass in info have same requirements as retro_load_game(). + * Virtual disk tray must be ejected when calling this. + * + * Replacing a disk image with info = NULL will remove the disk image + * from the internal list. + * As a result, calls to get_image_index() can change. + * + * E.g. replace_image_index(1, NULL), and previous get_image_index() + * returned 4 before. + * Index 1 will be removed, and the new index is 3. + */ +typedef bool (*retro_replace_image_index_t)(unsigned index, + const struct retro_game_info *info); + +/* Adds a new valid index (get_num_images()) to the internal disk list. + * This will increment subsequent return values from get_num_images() by 1. + * This image index cannot be used until a disk image has been set + * with replace_image_index. */ +typedef bool (*retro_add_image_index_t)(void); + +struct retro_disk_control_callback +{ + retro_set_eject_state_t set_eject_state; + retro_get_eject_state_t get_eject_state; + + retro_get_image_index_t get_image_index; + retro_set_image_index_t set_image_index; + retro_get_num_images_t get_num_images; + + retro_replace_image_index_t replace_image_index; + retro_add_image_index_t add_image_index; +}; + +enum retro_pixel_format +{ + /* 0RGB1555, native endian. + * 0 bit must be set to 0. + * This pixel format is default for compatibility concerns only. + * If a 15/16-bit pixel format is desired, consider using RGB565. */ + RETRO_PIXEL_FORMAT_0RGB1555 = 0, + + /* XRGB8888, native endian. + * X bits are ignored. */ + RETRO_PIXEL_FORMAT_XRGB8888 = 1, + + /* RGB565, native endian. + * This pixel format is the recommended format to use if a 15/16-bit + * format is desired as it is the pixel format that is typically + * available on a wide range of low-power devices. + * + * It is also natively supported in APIs like OpenGL ES. */ + RETRO_PIXEL_FORMAT_RGB565 = 2, + + /* Ensure sizeof() == sizeof(int). */ + RETRO_PIXEL_FORMAT_UNKNOWN = INT_MAX +}; + +struct retro_message +{ + const char *msg; /* Message to be displayed. */ + unsigned frames; /* Duration in frames of message. */ +}; + +/* Describes how the libretro implementation maps a libretro input bind + * to its internal input system through a human readable string. + * This string can be used to better let a user configure input. */ +struct retro_input_descriptor +{ + /* Associates given parameters with a description. */ + unsigned port; + unsigned device; + unsigned index; + unsigned id; + + /* Human readable description for parameters. + * The pointer must remain valid until + * retro_unload_game() is called. */ + const char *description; +}; + +struct retro_system_info +{ + /* All pointers are owned by libretro implementation, and pointers must + * remain valid until retro_deinit() is called. */ + + const char *library_name; /* Descriptive name of library. Should not + * contain any version numbers, etc. */ + const char *library_version; /* Descriptive version of core. */ + + const char *valid_extensions; /* A string listing probably content + * extensions the core will be able to + * load, separated with pipe. + * I.e. "bin|rom|iso". + * Typically used for a GUI to filter + * out extensions. */ + + /* If true, retro_load_game() is guaranteed to provide a valid pathname + * in retro_game_info::path. + * ::data and ::size are both invalid. + * + * If false, ::data and ::size are guaranteed to be valid, but ::path + * might not be valid. + * + * This is typically set to true for libretro implementations that must + * load from file. + * Implementations should strive for setting this to false, as it allows + * the frontend to perform patching, etc. */ + bool need_fullpath; + + /* If true, the frontend is not allowed to extract any archives before + * loading the real content. + * Necessary for certain libretro implementations that load games + * from zipped archives. */ + bool block_extract; +}; + +struct retro_game_geometry +{ + unsigned base_width; /* Nominal video width of game. */ + unsigned base_height; /* Nominal video height of game. */ + unsigned max_width; /* Maximum possible width of game. */ + unsigned max_height; /* Maximum possible height of game. */ + + float aspect_ratio; /* Nominal aspect ratio of game. If + * aspect_ratio is <= 0.0, an aspect ratio + * of base_width / base_height is assumed. + * A frontend could override this setting, + * if desired. */ +}; + +struct retro_system_timing +{ + double fps; /* FPS of video content. */ + double sample_rate; /* Sampling rate of audio. */ +}; + +struct retro_system_av_info +{ + struct retro_game_geometry geometry; + struct retro_system_timing timing; +}; + +struct retro_variable +{ + /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE. + * If NULL, obtains the complete environment string if more + * complex parsing is necessary. + * The environment string is formatted as key-value pairs + * delimited by semicolons as so: + * "key1=value1;key2=value2;..." + */ + const char *key; + + /* Value to be obtained. If key does not exist, it is set to NULL. */ + const char *value; +}; + +struct retro_game_info +{ + const char *path; /* Path to game, UTF-8 encoded. + * Usually used as a reference. + * May be NULL if rom was loaded from stdin + * or similar. + * retro_system_info::need_fullpath guaranteed + * that this path is valid. */ + const void *data; /* Memory buffer of loaded game. Will be NULL + * if need_fullpath was set. */ + size_t size; /* Size of memory buffer. */ + const char *meta; /* String of implementation specific meta-data. */ +}; + +/* Callbacks */ + +/* Environment callback. Gives implementations a way of performing + * uncommon tasks. Extensible. */ +typedef bool (*retro_environment_t)(unsigned cmd, void *data); + +/* Render a frame. Pixel format is 15-bit 0RGB1555 native endian + * unless changed (see RETRO_ENVIRONMENT_SET_PIXEL_FORMAT). + * + * Width and height specify dimensions of buffer. + * Pitch specifices length in bytes between two lines in buffer. + * + * For performance reasons, it is highly recommended to have a frame + * that is packed in memory, i.e. pitch == width * byte_per_pixel. + * Certain graphic APIs, such as OpenGL ES, do not like textures + * that are not packed in memory. + */ +typedef void (*retro_video_refresh_t)(const void *data, unsigned width, + unsigned height, size_t pitch); + +/* Renders a single audio frame. Should only be used if implementation + * generates a single sample at a time. + * Format is signed 16-bit native endian. + */ +typedef void (*retro_audio_sample_t)(int16_t left, int16_t right); + +/* Renders multiple audio frames in one go. + * + * One frame is defined as a sample of left and right channels, interleaved. + * I.e. int16_t buf[4] = { l, r, l, r }; would be 2 frames. + * Only one of the audio callbacks must ever be used. + */ +typedef size_t (*retro_audio_sample_batch_t)(const int16_t *data, + size_t frames); + +/* Polls input. */ +typedef void (*retro_input_poll_t)(void); + +/* Queries for input for player 'port'. device will be masked with + * RETRO_DEVICE_MASK. + * + * Specialization of devices such as RETRO_DEVICE_JOYPAD_MULTITAP that + * have been set with retro_set_controller_port_device() + * will still use the higher level RETRO_DEVICE_JOYPAD to request input. + */ +typedef int16_t (*retro_input_state_t)(unsigned port, unsigned device, + unsigned index, unsigned id); + +/* Sets callbacks. retro_set_environment() is guaranteed to be called + * before retro_init(). + * + * The rest of the set_* functions are guaranteed to have been called + * before the first call to retro_run() is made. */ +void retro_set_environment(retro_environment_t); +void retro_set_video_refresh(retro_video_refresh_t); +void retro_set_audio_sample(retro_audio_sample_t); +void retro_set_audio_sample_batch(retro_audio_sample_batch_t); +void retro_set_input_poll(retro_input_poll_t); +void retro_set_input_state(retro_input_state_t); + +/* Library global initialization/deinitialization. */ +void retro_init(void); +void retro_deinit(void); + +/* Must return RETRO_API_VERSION. Used to validate ABI compatibility + * when the API is revised. */ +unsigned retro_api_version(void); + +/* Gets statically known system info. Pointers provided in *info + * must be statically allocated. + * Can be called at any time, even before retro_init(). */ +void retro_get_system_info(struct retro_system_info *info); + +/* Gets information about system audio/video timings and geometry. + * Can be called only after retro_load_game() has successfully completed. + * NOTE: The implementation of this function might not initialize every + * variable if needed. + * E.g. geom.aspect_ratio might not be initialized if core doesn't + * desire a particular aspect ratio. */ +void retro_get_system_av_info(struct retro_system_av_info *info); + +/* Sets device to be used for player 'port'. + * By default, RETRO_DEVICE_JOYPAD is assumed to be plugged into all + * available ports. + * Setting a particular device type is not a guarantee that libretro cores + * will only poll input based on that particular device type. It is only a + * hint to the libretro core when a core cannot automatically detect the + * appropriate input device type on its own. It is also relevant when a + * core can change its behavior depending on device type. */ +void retro_set_controller_port_device(unsigned port, unsigned device); + +/* Resets the current game. */ +void retro_reset(void); + +/* Runs the game for one video frame. + * During retro_run(), input_poll callback must be called at least once. + * + * If a frame is not rendered for reasons where a game "dropped" a frame, + * this still counts as a frame, and retro_run() should explicitly dupe + * a frame if GET_CAN_DUPE returns true. + * In this case, the video callback can take a NULL argument for data. + */ +void retro_run(void); + +/* Returns the amount of data the implementation requires to serialize + * internal state (save states). + * Between calls to retro_load_game() and retro_unload_game(), the + * returned size is never allowed to be larger than a previous returned + * value, to ensure that the frontend can allocate a save state buffer once. + */ +size_t retro_serialize_size(void); + +/* Serializes internal state. If failed, or size is lower than + * retro_serialize_size(), it should return false, true otherwise. */ +bool retro_serialize(void *data, size_t size); +bool retro_unserialize(const void *data, size_t size); + +void retro_cheat_reset(void); +void retro_cheat_set(unsigned index, bool enabled, const char *code); + +/* Loads a game. */ +bool retro_load_game(const struct retro_game_info *game); + +/* Loads a "special" kind of game. Should not be used, + * except in extreme cases. */ +bool retro_load_game_special( + unsigned game_type, + const struct retro_game_info *info, size_t num_info +); + +/* Unloads a currently loaded game. */ +void retro_unload_game(void); + +/* Gets region of game. */ +unsigned retro_get_region(void); + +/* Gets region of memory. */ +void *retro_get_memory_data(unsigned id); +size_t retro_get_memory_size(unsigned id); + +#ifdef __cplusplus +} +#endif + +#endif From a000f219db86e17722c87fc58a44602f6ce98292 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 20:56:42 -0700 Subject: [PATCH 032/101] GBA: Move A/V stream interface into core --- CHANGES | 1 + src/gba/audio.c | 5 ++--- src/gba/gba.c | 6 ++++-- src/gba/gba.h | 6 ++++++ src/gba/supervisor/thread.c | 1 + src/gba/supervisor/thread.h | 5 ----- src/platform/ffmpeg/ffmpeg-encoder.c | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 231f24112..6450d53d1 100644 --- a/CHANGES +++ b/CHANGES @@ -70,6 +70,7 @@ Misc: - Qt: Move frame upload back onto main thread - All: Enable link-time optimization - GBA Thread: Make GBASyncWaitFrameStart time out + - GBA: Move A/V stream interface into core 0.1.1: (2015-01-24) Bugfixes: diff --git a/src/gba/audio.c b/src/gba/audio.c index 63b83556f..6d30f9f08 100644 --- a/src/gba/audio.c +++ b/src/gba/audio.c @@ -822,9 +822,8 @@ static void _sample(struct GBAAudio* audio) { } produced = blip_samples_avail(audio->left); #endif - struct GBAThread* thread = GBAThreadGetContext(); - if (thread && thread->stream) { - thread->stream->postAudioFrame(thread->stream, sampleLeft, sampleRight); + if (audio->p->stream) { + audio->p->stream->postAudioFrame(audio->p->stream, sampleLeft, sampleRight); } GBASyncProduceAudio(audio->p->sync, produced >= audio->samples); } diff --git a/src/gba/gba.c b/src/gba/gba.c index bb18400bb..c55aeffba 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -77,7 +77,9 @@ static void GBAInit(struct ARMCore* cpu, struct ARMComponent* component) { gba->romVf = 0; gba->biosVf = 0; + gba->logHandler = 0; gba->logLevel = GBA_LOG_INFO | GBA_LOG_WARN | GBA_LOG_ERROR | GBA_LOG_FATAL; + gba->stream = 0; gba->biosChecksum = GBAChecksum(gba->memory.bios, SIZE_BIOS); @@ -733,8 +735,8 @@ void GBAFrameEnded(struct GBA* gba) { return; } - if (thread->stream) { - thread->stream->postVideoFrame(thread->stream, thread->renderer); + if (gba->stream) { + gba->stream->postVideoFrame(gba->stream, gba->video.renderer); } if (thread->frameCallback) { diff --git a/src/gba/gba.h b/src/gba/gba.h index 4c67a662c..386dae68d 100644 --- a/src/gba/gba.h +++ b/src/gba/gba.h @@ -96,6 +96,11 @@ struct VFile; typedef void (*GBALogHandler)(struct GBAThread*, enum GBALogLevel, const char* format, va_list args); +struct GBAAVStream { + void (*postVideoFrame)(struct GBAAVStream*, struct GBAVideoRenderer* renderer); + void (*postAudioFrame)(struct GBAAVStream*, int16_t left, int16_t right); +}; + struct GBATimer { uint16_t reload; uint16_t oldReload; @@ -146,6 +151,7 @@ struct GBA { GBALogHandler logHandler; enum GBALogLevel logLevel; + struct GBAAVStream* stream; enum GBAIdleLoopOptimization idleOptimization; uint32_t idleLoop; diff --git a/src/gba/supervisor/thread.c b/src/gba/supervisor/thread.c index ae08c440d..d39d74730 100644 --- a/src/gba/supervisor/thread.c +++ b/src/gba/supervisor/thread.c @@ -135,6 +135,7 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { threadContext->gba = &gba; gba.logLevel = threadContext->logLevel; gba.logHandler = threadContext->logHandler; + gba.stream = threadContext->stream; gba.idleOptimization = threadContext->idleOptimization; #ifdef USE_PTHREADS pthread_setspecific(_contextKey, threadContext); diff --git a/src/gba/supervisor/thread.h b/src/gba/supervisor/thread.h index a39c52a4e..7a2a3778b 100644 --- a/src/gba/supervisor/thread.h +++ b/src/gba/supervisor/thread.h @@ -48,11 +48,6 @@ struct GBASync { Mutex audioBufferMutex; }; -struct GBAAVStream { - void (*postVideoFrame)(struct GBAAVStream*, struct GBAVideoRenderer* renderer); - void (*postAudioFrame)(struct GBAAVStream*, int32_t left, int32_t right); -}; - struct GBAThread { // Output enum ThreadState state; diff --git a/src/platform/ffmpeg/ffmpeg-encoder.c b/src/platform/ffmpeg/ffmpeg-encoder.c index 184ac5a8d..a53106a76 100644 --- a/src/platform/ffmpeg/ffmpeg-encoder.c +++ b/src/platform/ffmpeg/ffmpeg-encoder.c @@ -22,7 +22,7 @@ #include static void _ffmpegPostVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer); -static void _ffmpegPostAudioFrame(struct GBAAVStream*, int32_t left, int32_t right); +static void _ffmpegPostAudioFrame(struct GBAAVStream*, int16_t left, int16_t right); enum { PREFERRED_SAMPLE_RATE = 0x8000 @@ -357,7 +357,7 @@ bool FFmpegEncoderIsOpen(struct FFmpegEncoder* encoder) { return !!encoder->context; } -void _ffmpegPostAudioFrame(struct GBAAVStream* stream, int32_t left, int32_t right) { +void _ffmpegPostAudioFrame(struct GBAAVStream* stream, int16_t left, int16_t right) { struct FFmpegEncoder* encoder = (struct FFmpegEncoder*) stream; if (!encoder->context || !encoder->audioCodec) { return; From 70b01f99adac07384cf131553e870bd1ecb34373 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 21:05:26 -0700 Subject: [PATCH 033/101] Libretro: Force 5-6-5 build for Libretro core --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cef45f6e..b1749d476 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -301,6 +301,13 @@ target_link_libraries(${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LI install(TARGETS ${BINARY_NAME} DESTINATION lib COMPONENT lib${BINARY_NAME}) set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI}) +if(BUILD_LIBRETRO) + add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5) + file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c) + add_library(${BINARY_NAME}-libretro SHARED ${RETRO_SRC}) + target_link_libraries(${BINARY_NAME}-libretro ${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) +endif() + if(BUILD_SDL) add_definitions(-DBUILD_SDL) add_subdirectory(${CMAKE_SOURCE_DIR}/src/platform/sdl ${CMAKE_BINARY_DIR}/sdl) @@ -310,12 +317,6 @@ if(BUILD_QT) add_subdirectory(${CMAKE_SOURCE_DIR}/src/platform/qt ${CMAKE_BINARY_DIR}/qt) endif() -if(BUILD_LIBRETRO) - file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c) - add_library(${BINARY_NAME}-libretro SHARED ${RETRO_SRC}) - target_link_libraries(${BINARY_NAME}-libretro ${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) -endif() - if(BUILD_PERF) set(PERF_SRC ${CMAKE_SOURCE_DIR}/src/platform/perf-main.c) if(UNIX AND NOT APPLE) From 1b591b5844dcc5095462b50eb4051ee72b62518e Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 21:06:11 -0700 Subject: [PATCH 034/101] Libretro: Use callbacks for audio and video --- src/platform/libretro/libretro.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index 0be8d1507..1fe3814d6 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -8,18 +8,23 @@ static retro_environment_t environCallback; static retro_video_refresh_t videoCallback; +static retro_audio_sample_t audioCallback; static retro_input_poll_t inputPollCallback; static retro_input_state_t inputCallback; static retro_log_printf_t logCallback; static void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args); +static void _postAudioFrame(struct GBAAVStream*, int16_t left, int16_t right); +static void _postVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer); + static struct GBA gba; static struct ARMCore cpu; static struct GBAVideoSoftwareRenderer renderer; static struct VFile* rom; static struct VFile* save; static void* savedata; +static struct GBAAVStream stream; unsigned retro_api_version(void) { return RETRO_API_VERSION; @@ -34,7 +39,7 @@ void retro_set_video_refresh(retro_video_refresh_t video) { } void retro_set_audio_sample(retro_audio_sample_t audio) { - UNUSED(audio); + audioCallback = audio; } void retro_set_audio_sample_batch(retro_audio_sample_batch_t audioBatch) { @@ -103,11 +108,15 @@ void retro_init(void) { logCallback = 0; } + stream.postAudioFrame = _postAudioFrame; + stream.postVideoFrame = _postVideoFrame; + GBACreate(&gba); ARMSetComponents(&cpu, &gba.d, 0, 0); ARMInit(&cpu); gba.logLevel = 0; // TODO: Settings gba.logHandler = GBARetroLog; + gba.stream = &stream; gba.idleOptimization = IDLE_LOOP_REMOVE; // TODO: Settings rom = 0; @@ -265,3 +274,16 @@ void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* f } logCallback(retroLevel, "%s\n", message); } + +static void _postAudioFrame(struct GBAAVStream* stream, int16_t left, int16_t right) { + UNUSED(stream); + audioCallback(left, right); +} + +static void _postVideoFrame(struct GBAAVStream* stream, struct GBAVideoRenderer* renderer) { + UNUSED(stream); + void* pixels; + unsigned stride; + renderer->getPixels(renderer, &stride, &pixels); + videoCallback(pixels, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, BYTES_PER_PIXEL * stride); +} From de7bd2fb551d860dc234c341117d523c1efc5e4a Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 22:24:29 -0700 Subject: [PATCH 035/101] Libretro: Add savedata support --- src/platform/libretro/libretro.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index 1fe3814d6..d6f67a34d 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -171,9 +171,8 @@ bool retro_load_game(const struct retro_game_info* game) { return false; } - // TODO - save = 0; - savedata = 0; + savedata = malloc(SIZE_CART_FLASH1M); + save = VFileFromMemory(savedata, SIZE_CART_FLASH1M); GBALoadROM(&gba, rom, save, game->path); ARMReset(&cpu); @@ -232,15 +231,29 @@ bool retro_load_game_special(unsigned game_type, const struct retro_game_info* i } void* retro_get_memory_data(unsigned id) { - // TODO - UNUSED(id); - return 0; + if (id != RETRO_MEMORY_SAVE_RAM) { + return 0; + } + return savedata; } size_t retro_get_memory_size(unsigned id) { - // TODO - UNUSED(id); - return 0; + if (id != RETRO_MEMORY_SAVE_RAM) { + return 0; + } + switch (gba.memory.savedata.type) { + case SAVEDATA_AUTODETECT: + case SAVEDATA_FLASH1M: + return SIZE_CART_FLASH1M; + case SAVEDATA_FLASH512: + return SIZE_CART_FLASH512; + case SAVEDATA_EEPROM: + return SIZE_CART_EEPROM; + case SAVEDATA_SRAM: + return SIZE_CART_SRAM; + case SAVEDATA_FORCE_NONE: + return 0; + } } void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args) { From 6c5a1315ea314587e3387538ccbe2eb42157fb70 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 22:26:24 -0700 Subject: [PATCH 036/101] Libretro: Add warnings about pixel formats --- src/platform/libretro/libretro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index d6f67a34d..c5277ca97 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -77,9 +77,11 @@ void retro_init(void) { #ifdef COLOR_5_6_5 fmt = RETRO_PIXEL_FORMAT_RGB565; #else +#warning This pixel format is unsupported. Please use -DCOLOR_16-BIT -DCOLOR_5_6_5 fmt = RETRO_PIXEL_FORMAT_0RGB1555; #endif #else +#warning This pixel format is unsupported. Please use -DCOLOR_16-BIT -DCOLOR_5_6_5 fmt = RETRO_PIXEL_FORMAT_XRGB8888; #endif environCallback(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt); From f90ac6e9a9195765d373ad8d918cf0150f52e8bd Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 22:49:53 -0700 Subject: [PATCH 037/101] Libretro: Do game unload cleanup --- src/platform/libretro/libretro.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index c5277ca97..fb6b955eb 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -182,7 +182,12 @@ bool retro_load_game(const struct retro_game_info* game) { } void retro_unload_game(void) { - // TODO + rom->close(rom); + rom = 0; + save->close(save); + save = 0; + free(savedata); + savedata = 0; } size_t retro_serialize_size(void) { From 53a17bc96fb5f462592513750b70d5775e5b2cee Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 8 Mar 2015 22:52:52 -0700 Subject: [PATCH 038/101] All: Update CHANGES --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index 6450d53d1..562b180f1 100644 --- a/CHANGES +++ b/CHANGES @@ -26,6 +26,7 @@ Features: - Debugger: Add CLI functions for examining memory regions - Runtime configurable audio driver - Debugger: Add CLI function for writing a register + - Libretro core for use with RetroArch and other front-ends Bugfixes: - ARM7: Extend prefetch by one stage - GBA Audio: Support 16-bit writes to FIFO audio From ad10b5dedf834106ad7416527b136bd46d2e5d9a Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 9 Mar 2015 21:16:41 -0700 Subject: [PATCH 039/101] GBA: Fix crash if GBALog is called with a null context --- src/gba/gba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/gba.c b/src/gba/gba.c index c55aeffba..750f289b7 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -550,7 +550,7 @@ static void _GBAVLog(struct GBA* gba, enum GBALogLevel level, const char* format MutexUnlock(&threadContext->stateMutex); } } - if (gba->logHandler) { + if (gba && gba->logHandler) { gba->logHandler(threadContext, level, format, args); return; } From 11f0e690f8bbc7a3d7dcf5257027f7038fed8ec0 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 9 Mar 2015 21:17:41 -0700 Subject: [PATCH 040/101] GBA: Initialize gba.sync to null --- CHANGES | 1 + src/gba/gba.c | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index 562b180f1..119309e02 100644 --- a/CHANGES +++ b/CHANGES @@ -49,6 +49,7 @@ Bugfixes: - Util: Fix sockets on Windows - Qt: Fix crash when loading a game after stopping GDB server - GBA BIOS: Fix BIOS decompression routines with invalid source addresses + - GBA: Initialize gba.sync to null Misc: - GBA Audio: Change internal audio sample buffer from 32-bit to 16-bit samples - GBA Memory: Simplify memory API and use fixed bus width diff --git a/src/gba/gba.c b/src/gba/gba.c index 750f289b7..97b4668fe 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -47,6 +47,7 @@ static void GBAInit(struct ARMCore* cpu, struct ARMComponent* component) { struct GBA* gba = (struct GBA*) component; gba->cpu = cpu; gba->debugger = 0; + gba->sync = 0; GBAInterruptHandlerInit(&cpu->irqh); GBAMemoryInit(gba); From 207219b25e8a770e2cb58d72ceefee4f9b388245 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 9 Mar 2015 21:18:00 -0700 Subject: [PATCH 041/101] Libretro: Use predefined overrides --- src/platform/libretro/libretro.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index fb6b955eb..5abee42b7 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -1,8 +1,14 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "libretro.h" #include "gba/gba.h" #include "gba/renderers/video-software.h" #include "gba/serialize.h" +#include "gba/supervisor/overrides.h" #include "gba/video.h" #include "util/vfs.h" @@ -177,6 +183,14 @@ bool retro_load_game(const struct retro_game_info* game) { save = VFileFromMemory(savedata, SIZE_CART_FLASH1M); GBALoadROM(&gba, rom, save, game->path); + + struct GBACartridgeOverride override; + const struct GBACartridge* cart = (const struct GBACartridge*) gba.memory.rom; + memcpy(override.id, &cart->id, sizeof(override.id)); + if (GBAOverrideFind(0, &override)) { + GBAOverrideApply(&gba, &override); + } + ARMReset(&cpu); return true; } From 589b5f473c86c3874d858817f19c2d89f8359996 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 9 Mar 2015 22:07:50 -0700 Subject: [PATCH 042/101] Libretro: Copy game data; apparently it is freed by the frontend before starting the game --- src/platform/libretro/libretro.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index 5abee42b7..9050de160 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -28,6 +28,7 @@ static struct GBA gba; static struct ARMCore cpu; static struct GBAVideoSoftwareRenderer renderer; static struct VFile* rom; +static void* data; static struct VFile* save; static void* savedata; static struct GBAAVStream stream; @@ -168,8 +169,11 @@ void retro_reset(void) { bool retro_load_game(const struct retro_game_info* game) { if (game->data) { - rom = VFileFromMemory((void*) game->data, game->size); // TODO: readonly VFileMem + data = malloc(game->size); + memcpy(data, game->data, game->size); + rom = VFileFromMemory(data, game->size); } else { + data = 0; rom = VFileOpen(game->path, O_RDONLY); } if (!rom) { @@ -198,6 +202,8 @@ bool retro_load_game(const struct retro_game_info* game) { void retro_unload_game(void) { rom->close(rom); rom = 0; + free(data); + data = 0; save->close(save); save = 0; free(savedata); From 3b0a42921cd648c5999e2c6e634b434d09d1705d Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 9 Mar 2015 23:41:38 -0700 Subject: [PATCH 043/101] Libretro: Fix module output name --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1749d476..c2cdda362 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,8 +304,9 @@ set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SO if(BUILD_LIBRETRO) add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5) file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c) - add_library(${BINARY_NAME}-libretro SHARED ${RETRO_SRC}) - target_link_libraries(${BINARY_NAME}-libretro ${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) + add_library(${BINARY_NAME}_libretro SHARED ${RETRO_SRC}) + set_target_properties(${BINARY_NAME}_libretro PROPERTIES PREFIX "") + target_link_libraries(${BINARY_NAME}_libretro ${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) endif() if(BUILD_SDL) From 54a30af1aad4f5d48563883e9286db0377e59ca3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 10 Mar 2015 00:33:04 -0700 Subject: [PATCH 044/101] Qt: Fix PulseAudio output with small buffer size --- src/platform/qt/AudioProcessorQt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/qt/AudioProcessorQt.cpp b/src/platform/qt/AudioProcessorQt.cpp index c32b83ce4..eb8f1ff14 100644 --- a/src/platform/qt/AudioProcessorQt.cpp +++ b/src/platform/qt/AudioProcessorQt.cpp @@ -47,6 +47,7 @@ void AudioProcessorQt::start() { format.setSampleType(QAudioFormat::SignedInt); m_audioOutput = new QAudioOutput(format, this); + m_audioOutput->setCategory("game"); } m_device->setInput(input()); From bf589762908876a4ed7338c330b554469ecce710 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 10 Mar 2015 01:17:24 -0700 Subject: [PATCH 045/101] Libretro: Fix a warning in gcc --- src/platform/libretro/libretro.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index 9050de160..a9c6855d4 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -281,6 +281,7 @@ size_t retro_get_memory_size(unsigned id) { case SAVEDATA_FORCE_NONE: return 0; } + return 0; } void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args) { From f59932a295955b10e5d9897a0be811edc36de8a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 10 Mar 2015 01:32:06 -0700 Subject: [PATCH 046/101] All: Add option to disable LTO --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2cdda362..952f4ce3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,10 +76,11 @@ set(LIB_VERSION_ABI 0.2) set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH}) # Advanced settings -set(BUILD_PGO CACHE BOOL "Build with profiling-guided optimization") +set(BUILD_LTO ON CACHE BOOL "Build with link-time optimization") +set(BUILD_PGO OFF CACHE BOOL "Build with profiling-guided optimization") set(PGO_STAGE_2 CACHE BOOL "Rebuild for profiling-guided optimization after profiles have been generated") set(PGO_DIR "/tmp/gba-pgo/" CACHE PATH "Profiling-guided optimization profiles path") -mark_as_advanced(BUILD_PGO PGO_STAGE_2 PGO_DIR) +mark_as_advanced(BUILD_LTO BUILD_PGO PGO_STAGE_2 PGO_DIR) set(PGO_PRE_FLAGS "-pg -fprofile-generate=${PGO_DIR} -fprofile-arcs") set(PGO_POST_FLAGS "-fprofile-use=${PGO_DIR} -fbranch-probabilities") @@ -125,7 +126,7 @@ if(APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6") endif() -if(APPLE OR CMAKE_C_COMPILER_ID STREQUAL "GNU") +if(APPLE OR CMAKE_C_COMPILER_ID STREQUAL "GNU" AND BUILD_LTO) set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") endif() From 17d61564c9d853184bcc63276cde0999797e3678 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 11 Mar 2015 02:16:48 -0700 Subject: [PATCH 047/101] All: All ARM targets should enable ASM --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 952f4ce3c..7e5d16429 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,12 +132,15 @@ if(APPLE OR CMAKE_C_COMPILER_ID STREQUAL "GNU" AND BUILD_LTO) endif() if(BUILD_BBB OR BUILD_RASPI) - enable_language(ASM) if(NOT BUILD_EGL) add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5) endif() endif() +if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm") + enable_language(ASM) +endif() + include(CheckFunctionExists) check_function_exists(strndup HAVE_STRNDUP) check_function_exists(snprintf_l HAVE_SNPRINTF_L) From 513b9fb7518e9c06da0ec9ee609bdd72a1344c77 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 11 Mar 2015 02:17:45 -0700 Subject: [PATCH 048/101] All: Unify how feature defines work, allowing specific targets to not use them --- CMakeLists.txt | 54 ++++++++++++++++++------------ src/gba/supervisor/thread.c | 6 ++-- src/platform/qt/CMakeLists.txt | 1 + src/platform/qt/GameController.cpp | 4 +-- src/platform/sdl/CMakeLists.txt | 2 ++ src/util/vfs.h | 4 +-- src/util/vfs/vfs-lzma.c | 2 +- src/util/vfs/vfs-zip.c | 2 +- 8 files changed, 45 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e5d16429..d9fc6fab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,6 +97,7 @@ endif() add_definitions(-DBINARY_NAME="${BINARY_NAME}" -DPROJECT_NAME="${PROJECT_NAME}" -DPROJECT_VERSION="${LIB_VERSION_STRING}") # Feature dependencies +set(FEATURES) if(CMAKE_SYSTEM_NAME MATCHES .*BSD) set(LIBEDIT_LIBRARIES -ledit) else() @@ -171,13 +172,14 @@ endif() # Features set(DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/debugger.c ${CMAKE_SOURCE_DIR}/src/debugger/memory-debugger.c) +set(FEATURE_SRC) set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6") if(USE_CLI_DEBUGGER) - add_definitions(-DUSE_CLI_DEBUGGER) - list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c) - list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c) - list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/cli.c) + list(APPEND FEATURES CLI_DEBUGGER) + list(APPEND FEATURE_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c) + list(APPEND FEATURE_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c) + list(APPEND FEATURE_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/cli.c) include_directories(AFTER ${LIBEDIT_INCLUDE_DIRS}) link_directories(${LIBEDIT_LIBRARY_DIRS}) set(DEBUGGER_LIB ${LIBEDIT_LIBRARIES}) @@ -187,20 +189,20 @@ else() endif() if(USE_GDB_STUB) - add_definitions(-DUSE_GDB_STUB) + list(APPEND FEATURES GDB_STUB) list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/gdb-stub.c) endif() source_group("ARM debugger" FILES ${DEBUGGER_SRC}) if(USE_FFMPEG) - add_definitions(-DUSE_FFMPEG) + list(APPEND FEATURES FFMPEG) pkg_search_module(LIBSWRESAMPLE QUIET libswresample) if(NOT LIBSWRESAMPLE_FOUND) - add_definitions(-DUSE_LIBAV) + list(APPEND FEATURES LIBAV) endif() include_directories(AFTER ${LIBAVCODEC_INCLUDE_DIRS} ${LIBAVFORMAT_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS} ${LIBAVUTIL_INCLUDE_DIRS} ${LIBSWSCALE_INCLUDE_DIRS}) link_directories(${LIBAVCODEC_LIBRARY_DIRS} ${LIBAVFORMAT_LIBRARY_DIRS} ${LIBAVRESAMPLE_LIBRARY_DIRS} ${LIBAVUTIL_LIBRARY_DIRS} ${LIBSWSCALE_LIBRARY_DIRS}) - list(APPEND UTIL_SRC "${CMAKE_SOURCE_DIR}/src/platform/ffmpeg/ffmpeg-encoder.c") + list(APPEND FEATURE_SRC "${CMAKE_SOURCE_DIR}/src/platform/ffmpeg/ffmpeg-encoder.c") string(REGEX MATCH "^[0-9]+" LIBAVCODEC_VERSION_MAJOR ${libavcodec_VERSION}) string(REGEX MATCH "^[0-9]+" LIBAVFORMAT_VERSION_MAJOR ${libavformat_VERSION}) string(REGEX MATCH "^[0-9]+" LIBAVRESAMPLE_VERSION_MAJOR ${libavresample_VERSION}) @@ -212,17 +214,17 @@ if(USE_FFMPEG) endif() if(USE_BLIP) - list(APPEND UTIL_SRC "${CMAKE_SOURCE_DIR}/src/third-party/blip_buf/blip_buf.c") + list(APPEND FEATURE_SRC "${CMAKE_SOURCE_DIR}/src/third-party/blip_buf/blip_buf.c") add_definitions(-DRESAMPLE_LIBRARY=RESAMPLE_BLIP_BUF) else() add_definitions(-DRESAMPLE_LIBRARY=RESAMPLE_NN) endif() if(USE_MAGICK) - add_definitions(-DUSE_MAGICK) + list(APPEND FEATURES MAGICK) include_directories(AFTER ${MAGICKWAND_INCLUDE_DIRS}) link_directories(${MAGICKWAND_LIBRARY_DIRS}) - list(APPEND UTIL_SRC "${CMAKE_SOURCE_DIR}/src/platform/imagemagick/imagemagick-gif-encoder.c") + list(APPEND FEATURE_SRC "${CMAKE_SOURCE_DIR}/src/platform/imagemagick/imagemagick-gif-encoder.c") list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES}) string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION}) if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7") @@ -234,7 +236,7 @@ if(USE_MAGICK) endif() if(USE_PNG) - add_definitions(-DUSE_PNG) + list(APPEND FEATURES PNG) include_directories(AFTER ${PNG_INCLUDE_DIRS}) list(APPEND DEPENDENCY_LIB ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libpng12-0,zlib1g") @@ -244,7 +246,7 @@ if(USE_LIBZIP) include_directories(AFTER ${LIBZIP_INCLUDE_DIRS}) link_directories(${LIBZIP_LIBRARY_DIRS}) list(APPEND DEPENDENCY_LIB ${LIBZIP_LIBRARIES}) - add_definitions(-DENABLE_LIBZIP) + list(APPEND FEATURES LIBZIP) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libzip2") endif() @@ -252,7 +254,6 @@ if (USE_LZMA) include_directories(AFTER ${CMAKE_SOURCE_DIR}/third-party/lzma) add_definitions(-D_7ZIP_PPMD_SUPPPORT) set(LZMA_SRC - ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-lzma.c ${CMAKE_SOURCE_DIR}/src/third-party/lzma/7zAlloc.c ${CMAKE_SOURCE_DIR}/src/third-party/lzma/7zArcIn.c ${CMAKE_SOURCE_DIR}/src/third-party/lzma/7zBuf.c @@ -270,12 +271,17 @@ if (USE_LZMA) ${CMAKE_SOURCE_DIR}/src/third-party/lzma/Ppmd7Dec.c ${CMAKE_SOURCE_DIR}/src/third-party/lzma/7zFile.c ${CMAKE_SOURCE_DIR}/src/third-party/lzma/7zStream.c) - list(APPEND UTIL_SRC ${LZMA_SRC}) - add_definitions(-DENABLE_LZMA) + list(APPEND FEATURE_SRC ${LZMA_SRC}) + list(APPEND FEATURES LZMA) endif() +set(FEATURE_DEFINES) +foreach(FEATURE IN LISTS FEATURES) + list(APPEND FEATURE_DEFINES "USE_${FEATURE}") +endforeach() + # Binaries -set(SRC +set(CORE_SRC ${ARM_SRC} ${GBA_SRC} ${GBA_RR_SRC} @@ -287,6 +293,10 @@ set(SRC ${OS_SRC} ${THIRD_PARTY_SRC}) +set(SRC + ${CORE_SRC} + ${FEATURE_SRC}) + if(NOT BUILD_STATIC AND NOT BUILD_SHARED) set(BUILD_SHARED ON) endif() @@ -295,6 +305,7 @@ if(BUILD_SHARED) add_library(${BINARY_NAME} SHARED ${SRC}) if(BUILD_STATIC) add_library(${BINARY_NAME}-static STATIC ${SRC}) + target_compile_definitions(${BINARY_NAME}-static PRIVATE ${FEATURE_DEFINES}) install(TARGETS ${BINARY_NAME}-static DESTINATION lib COMPONENT lib${BINARY_NAME}) endif() else() @@ -302,15 +313,16 @@ else() endif() target_link_libraries(${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) +target_compile_definitions(${BINARY_NAME} PRIVATE ${FEATURE_DEFINES}) install(TARGETS ${BINARY_NAME} DESTINATION lib COMPONENT lib${BINARY_NAME}) set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI}) if(BUILD_LIBRETRO) - add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5) file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c) - add_library(${BINARY_NAME}_libretro SHARED ${RETRO_SRC}) - set_target_properties(${BINARY_NAME}_libretro PROPERTIES PREFIX "") - target_link_libraries(${BINARY_NAME}_libretro ${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) + add_library(${BINARY_NAME}_libretro SHARED ${CORE_SRC} ${RETRO_SRC}) + set_target_properties(${BINARY_NAME}_libretro PROPERTIES PREFIX "" COMPILE_DEFINITIONS "") + target_compile_definitions(${BINARY_NAME}_libretro PRIVATE COLOR_16_BIT;COLOR_5_6_5 PUBLIC "" INTERFACE "") + target_link_libraries(${BINARY_NAME}_libretro m ${OS_LIB}) endif() if(BUILD_SDL) diff --git a/src/gba/supervisor/thread.c b/src/gba/supervisor/thread.c index d39d74730..0a7d6515f 100644 --- a/src/gba/supervisor/thread.c +++ b/src/gba/supervisor/thread.c @@ -177,7 +177,7 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { if (threadContext->movie) { struct VDir* movieDir = VDirOpen(threadContext->movie); -#ifdef ENABLE_LIBZIP +#ifdef USE_LIBZIP if (!movieDir) { movieDir = VDirOpenZip(threadContext->movie, 0); } @@ -341,12 +341,12 @@ void GBAMapArgumentsToContext(const struct GBAArguments* args, struct GBAThread* } else { threadContext->rom = VFileOpen(args->fname, O_RDONLY); threadContext->gameDir = 0; -#if ENABLE_LIBZIP +#if USE_LIBZIP if (!threadContext->gameDir) { threadContext->gameDir = VDirOpenZip(args->fname, 0); } #endif -#if ENABLE_LZMA +#if USE_LZMA if (!threadContext->gameDir) { threadContext->gameDir = VDirOpen7z(args->fname, 0); } diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 531ab4886..887f03edc 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -109,6 +109,7 @@ if(WIN32) list(APPEND RESOURCES ${CMAKE_SOURCE_DIR}/res/mgba.rc) endif() add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/mgba.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_FILES} ${AUDIO_SRC} ${RESOURCES}) +target_compile_definitions(${BINARY_NAME}-qt PRIVATE ${FEATURE_DEFINES}) set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in) list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::OpenGL) diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index aea188833..b324ce9f3 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -216,12 +216,12 @@ void GameController::openGame() { m_threadContext.stateDir = m_threadContext.gameDir; } else { m_threadContext.rom = VFileOpen(m_threadContext.fname, O_RDONLY); -#if ENABLE_LIBZIP +#if USE_LIBZIP if (!m_threadContext.gameDir) { m_threadContext.gameDir = VDirOpenZip(m_threadContext.fname, 0); } #endif -#if ENABLE_LZMA +#if USE_LZMA if (!m_threadContext.gameDir) { m_threadContext.gameDir = VDirOpen7z(m_threadContext.fname, 0); } diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index 517057ddc..76d3f6825 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -38,6 +38,7 @@ if(BUILD_RASPI) set(EGL_LIBRARY "-lEGL -lGLESv2 -lbcm_host") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fgnu89-inline") add_executable(${BINARY_NAME}-rpi ${PLATFORM_SRC} ${MAIN_SRC} ${EGL_MAIN_SRC}) + target_compile_definitions(${BINARY_NAME}-rpi PRIVATE ${FEATURE_DEFINES}) target_link_libraries(${BINARY_NAME}-rpi ${BINARY_NAME} ${PLATFORM_LIBRARY} ${EGL_LIBRARY}) install(TARGETS ${BINARY_NAME}-rpi DESTINATION bin COMPONENT ${BINARY_NAME}-rpi) endif() @@ -52,6 +53,7 @@ else() endif() add_executable(${BINARY_NAME}-sdl WIN32 ${PLATFORM_SRC} ${MAIN_SRC}) +target_compile_definitions(${BINARY_NAME}-sdl PRIVATE ${FEATURE_DEFINES}) target_link_libraries(${BINARY_NAME}-sdl ${BINARY_NAME} ${PLATFORM_LIBRARY} ${OPENGL_LIBRARY}) set_target_properties(${BINARY_NAME}-sdl PROPERTIES OUTPUT_NAME ${BINARY_NAME}) install(TARGETS ${BINARY_NAME}-sdl DESTINATION bin COMPONENT ${BINARY_NAME}-sdl) diff --git a/src/util/vfs.h b/src/util/vfs.h index 3586ad315..17be7577f 100644 --- a/src/util/vfs.h +++ b/src/util/vfs.h @@ -42,11 +42,11 @@ struct VFile* VFileFromMemory(void* mem, size_t size); struct VDir* VDirOpen(const char* path); -#ifdef ENABLE_LIBZIP +#ifdef USE_LIBZIP struct VDir* VDirOpenZip(const char* path, int flags); #endif -#ifdef ENABLE_LZMA +#ifdef USE_LZMA struct VDir* VDirOpen7z(const char* path, int flags); #endif diff --git a/src/util/vfs/vfs-lzma.c b/src/util/vfs/vfs-lzma.c index dff53156a..f41639505 100644 --- a/src/util/vfs/vfs-lzma.c +++ b/src/util/vfs/vfs-lzma.c @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "util/vfs.h" -#ifdef ENABLE_LZMA +#ifdef USE_LZMA #include "util/string.h" diff --git a/src/util/vfs/vfs-zip.c b/src/util/vfs/vfs-zip.c index 18789e423..5a1de8781 100644 --- a/src/util/vfs/vfs-zip.c +++ b/src/util/vfs/vfs-zip.c @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "util/vfs.h" -#ifdef ENABLE_LIBZIP +#ifdef USE_LIBZIP #include From 24f40a7959731a553110f692f267ed5bdfe24f72 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 11 Mar 2015 23:50:06 -0700 Subject: [PATCH 049/101] GBA: Fix GBAInputUnbindKey prototype --- src/gba/input.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/input.h b/src/gba/input.h index a1628720f..24956659a 100644 --- a/src/gba/input.h +++ b/src/gba/input.h @@ -31,7 +31,7 @@ void GBAInputMapDeinit(struct GBAInputMap*); enum GBAKey GBAInputMapKey(const struct GBAInputMap*, uint32_t type, int key); void GBAInputBindKey(struct GBAInputMap*, uint32_t type, int key, enum GBAKey input); -void GBAInputUnbindKey(struct GBAInputMap*, uint32_t type, int key); +void GBAInputUnbindKey(struct GBAInputMap*, uint32_t type, enum GBAKey input); int GBAInputQueryBinding(const struct GBAInputMap*, uint32_t type, enum GBAKey input); enum GBAKey GBAInputMapAxis(const struct GBAInputMap*, uint32_t type, int axis, int value); From f8933f23c4978cab76be1aed4efda8fb4fb1e978 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 12 Mar 2015 00:44:20 -0700 Subject: [PATCH 050/101] All: Fix blip_buf build --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9fc6fab5..6504f4714 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,7 +214,7 @@ if(USE_FFMPEG) endif() if(USE_BLIP) - list(APPEND FEATURE_SRC "${CMAKE_SOURCE_DIR}/src/third-party/blip_buf/blip_buf.c") + list(APPEND THIRD_PARTY_SRC "${CMAKE_SOURCE_DIR}/src/third-party/blip_buf/blip_buf.c") add_definitions(-DRESAMPLE_LIBRARY=RESAMPLE_BLIP_BUF) else() add_definitions(-DRESAMPLE_LIBRARY=RESAMPLE_NN) From b6e274c3d46784309ceee0306d9973f31902228f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 12 Mar 2015 00:45:08 -0700 Subject: [PATCH 051/101] GBA: Add postAudioBuffer callback --- src/gba/audio.c | 9 +++++++-- src/gba/gba.h | 1 + src/platform/ffmpeg/ffmpeg-encoder.c | 1 + src/platform/imagemagick/imagemagick-gif-encoder.c | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gba/audio.c b/src/gba/audio.c index 6d30f9f08..dce744a45 100644 --- a/src/gba/audio.c +++ b/src/gba/audio.c @@ -822,10 +822,15 @@ static void _sample(struct GBAAudio* audio) { } produced = blip_samples_avail(audio->left); #endif - if (audio->p->stream) { + if (audio->p->stream && audio->p->stream->postAudioFrame) { audio->p->stream->postAudioFrame(audio->p->stream, sampleLeft, sampleRight); } - GBASyncProduceAudio(audio->p->sync, produced >= audio->samples); + bool wait = produced >= audio->samples; + GBASyncProduceAudio(audio->p->sync, wait); + + if (wait && audio->p->stream && audio->p->stream->postAudioBuffer) { + audio->p->stream->postAudioBuffer(audio->p->stream, audio); + } } void GBAAudioSerialize(const struct GBAAudio* audio, struct GBASerializedState* state) { diff --git a/src/gba/gba.h b/src/gba/gba.h index 386dae68d..3594b4ab8 100644 --- a/src/gba/gba.h +++ b/src/gba/gba.h @@ -99,6 +99,7 @@ typedef void (*GBALogHandler)(struct GBAThread*, enum GBALogLevel, const char* f struct GBAAVStream { void (*postVideoFrame)(struct GBAAVStream*, struct GBAVideoRenderer* renderer); void (*postAudioFrame)(struct GBAAVStream*, int16_t left, int16_t right); + void (*postAudioBuffer)(struct GBAAVStream*, struct GBAAudio*); }; struct GBATimer { diff --git a/src/platform/ffmpeg/ffmpeg-encoder.c b/src/platform/ffmpeg/ffmpeg-encoder.c index a53106a76..5d19bfd8c 100644 --- a/src/platform/ffmpeg/ffmpeg-encoder.c +++ b/src/platform/ffmpeg/ffmpeg-encoder.c @@ -33,6 +33,7 @@ void FFmpegEncoderInit(struct FFmpegEncoder* encoder) { encoder->d.postVideoFrame = _ffmpegPostVideoFrame; encoder->d.postAudioFrame = _ffmpegPostAudioFrame; + encoder->d.postAudioBuffer = 0; encoder->audioCodec = 0; encoder->videoCodec = 0; diff --git a/src/platform/imagemagick/imagemagick-gif-encoder.c b/src/platform/imagemagick/imagemagick-gif-encoder.c index 3a85db133..e47451d00 100644 --- a/src/platform/imagemagick/imagemagick-gif-encoder.c +++ b/src/platform/imagemagick/imagemagick-gif-encoder.c @@ -15,6 +15,7 @@ void ImageMagickGIFEncoderInit(struct ImageMagickGIFEncoder* encoder) { encoder->d.postVideoFrame = _magickPostVideoFrame; encoder->d.postAudioFrame = _magickPostAudioFrame; + encoder->d.postAudioBuffer = 0; encoder->frameskip = 2; } From 3c652a10b5c2872b6834ccfa5fe464f3f337c159 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 12 Mar 2015 00:45:29 -0700 Subject: [PATCH 052/101] Libretro: Use audio buffer callback instead of audio sample callback --- src/platform/libretro/libretro.c | 37 ++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index a9c6855d4..2a23fcacc 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -12,16 +12,18 @@ #include "gba/video.h" #include "util/vfs.h" +#define SAMPLES 1024 + static retro_environment_t environCallback; static retro_video_refresh_t videoCallback; -static retro_audio_sample_t audioCallback; +static retro_audio_sample_batch_t audioCallback; static retro_input_poll_t inputPollCallback; static retro_input_state_t inputCallback; static retro_log_printf_t logCallback; static void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args); -static void _postAudioFrame(struct GBAAVStream*, int16_t left, int16_t right); +static void _postAudioBuffer(struct GBAAVStream*, struct GBAAudio* audio); static void _postVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer); static struct GBA gba; @@ -46,11 +48,11 @@ void retro_set_video_refresh(retro_video_refresh_t video) { } void retro_set_audio_sample(retro_audio_sample_t audio) { - audioCallback = audio; + UNUSED(audio); } void retro_set_audio_sample_batch(retro_audio_sample_batch_t audioBatch) { - UNUSED(audioBatch); + audioCallback = audioBatch; } void retro_set_input_poll(retro_input_poll_t inputPoll) { @@ -117,7 +119,8 @@ void retro_init(void) { logCallback = 0; } - stream.postAudioFrame = _postAudioFrame; + stream.postAudioFrame = 0; + stream.postAudioBuffer = _postAudioBuffer; stream.postVideoFrame = _postVideoFrame; GBACreate(&gba); @@ -133,6 +136,13 @@ void retro_init(void) { renderer.outputBuffer = malloc(256 * VIDEO_VERTICAL_PIXELS * BYTES_PER_PIXEL); renderer.outputBufferStride = 256; GBAVideoAssociateRenderer(&gba.video, &renderer.d); + + GBAAudioResizeBuffer(&gba.audio, SAMPLES); + +#if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF + blip_set_rates(gba.audio.left, GBA_ARM7TDMI_FREQUENCY, 32768); + blip_set_rates(gba.audio.right, GBA_ARM7TDMI_FREQUENCY, 32768); +#endif } void retro_deinit(void) { @@ -316,9 +326,22 @@ void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* f logCallback(retroLevel, "%s\n", message); } -static void _postAudioFrame(struct GBAAVStream* stream, int16_t left, int16_t right) { +static void _postAudioBuffer(struct GBAAVStream* stream, struct GBAAudio* audio) { UNUSED(stream); - audioCallback(left, right); + int16_t samples[SAMPLES * 2]; +#if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF + blip_read_samples(audio->left, samples, SAMPLES, true); + blip_read_samples(audio->right, samples + 1, SAMPLES, true); +#else + int16_t samplesR[SAMPLES]; + GBAAudioCopy(audio, &samples[SAMPLES], samplesR, SAMPLES); + size_t i; + for (i = 0; i < SAMPLES; ++i) { + samples[i * 2] = samples[SAMPLES + i]; + samples[i * 2 + 1] = samplesR[i]; + } +#endif + audioCallback(samples, SAMPLES); } static void _postVideoFrame(struct GBAAVStream* stream, struct GBAVideoRenderer* renderer) { From bdf6d7f7ec86fa7e8d934333455f44ceb53b2b2e Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 12 Mar 2015 01:09:12 -0700 Subject: [PATCH 053/101] All: Fix CMake files to not use function defined in CMake 2.8.11 --- CMakeLists.txt | 8 +++----- src/platform/qt/CMakeLists.txt | 3 +-- src/platform/sdl/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6504f4714..f1a75f6ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,7 +305,7 @@ if(BUILD_SHARED) add_library(${BINARY_NAME} SHARED ${SRC}) if(BUILD_STATIC) add_library(${BINARY_NAME}-static STATIC ${SRC}) - target_compile_definitions(${BINARY_NAME}-static PRIVATE ${FEATURE_DEFINES}) + set_target_properties(${BINARY_NAME}-static PROPERTIES COMPILE_DEFINITIONS "${FEATURE_DEFINES}") install(TARGETS ${BINARY_NAME}-static DESTINATION lib COMPONENT lib${BINARY_NAME}) endif() else() @@ -313,15 +313,13 @@ else() endif() target_link_libraries(${BINARY_NAME} m ${DEBUGGER_LIB} ${OS_LIB} ${DEPENDENCY_LIB}) -target_compile_definitions(${BINARY_NAME} PRIVATE ${FEATURE_DEFINES}) install(TARGETS ${BINARY_NAME} DESTINATION lib COMPONENT lib${BINARY_NAME}) -set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI}) +set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI} COMPILE_DEFINITIONS "${FEATURE_DEFINES}") if(BUILD_LIBRETRO) file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c) add_library(${BINARY_NAME}_libretro SHARED ${CORE_SRC} ${RETRO_SRC}) - set_target_properties(${BINARY_NAME}_libretro PROPERTIES PREFIX "" COMPILE_DEFINITIONS "") - target_compile_definitions(${BINARY_NAME}_libretro PRIVATE COLOR_16_BIT;COLOR_5_6_5 PUBLIC "" INTERFACE "") + set_target_properties(${BINARY_NAME}_libretro PROPERTIES PREFIX "" COMPILE_DEFINITIONS "COLOR_16_BIT;COLOR_5_6_5") target_link_libraries(${BINARY_NAME}_libretro m ${OS_LIB}) endif() diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 887f03edc..85cd6631a 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -109,8 +109,7 @@ if(WIN32) list(APPEND RESOURCES ${CMAKE_SOURCE_DIR}/res/mgba.rc) endif() add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/mgba.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_FILES} ${AUDIO_SRC} ${RESOURCES}) -target_compile_definitions(${BINARY_NAME}-qt PRIVATE ${FEATURE_DEFINES}) -set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in) +set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES}") list(APPEND QT_LIBRARIES Qt5::Widgets Qt5::OpenGL) target_link_libraries(${BINARY_NAME}-qt ${PLATFORM_LIBRARY} ${OPENGL_LIBRARY} ${BINARY_NAME} ${QT_LIBRARIES}) diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index 76d3f6825..d964eff1a 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -38,7 +38,7 @@ if(BUILD_RASPI) set(EGL_LIBRARY "-lEGL -lGLESv2 -lbcm_host") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fgnu89-inline") add_executable(${BINARY_NAME}-rpi ${PLATFORM_SRC} ${MAIN_SRC} ${EGL_MAIN_SRC}) - target_compile_definitions(${BINARY_NAME}-rpi PRIVATE ${FEATURE_DEFINES}) + set_target_properties(${BINARY_NAME}-rpi PROPERTIES COMPILE_DEFINITIONS "${FEATURE_DEFINES}") target_link_libraries(${BINARY_NAME}-rpi ${BINARY_NAME} ${PLATFORM_LIBRARY} ${EGL_LIBRARY}) install(TARGETS ${BINARY_NAME}-rpi DESTINATION bin COMPONENT ${BINARY_NAME}-rpi) endif() @@ -53,7 +53,7 @@ else() endif() add_executable(${BINARY_NAME}-sdl WIN32 ${PLATFORM_SRC} ${MAIN_SRC}) -target_compile_definitions(${BINARY_NAME}-sdl PRIVATE ${FEATURE_DEFINES}) +set_target_properties(${BINARY_NAME}-sdl PROPERTIES COMPILE_DEFINITIONS "${FEATURE_DEFINES}") target_link_libraries(${BINARY_NAME}-sdl ${BINARY_NAME} ${PLATFORM_LIBRARY} ${OPENGL_LIBRARY}) set_target_properties(${BINARY_NAME}-sdl PROPERTIES OUTPUT_NAME ${BINARY_NAME}) install(TARGETS ${BINARY_NAME}-sdl DESTINATION bin COMPONENT ${BINARY_NAME}-sdl) From b9427cc0ce0e7c36c61e2ecb51b7430d8b62e88c Mon Sep 17 00:00:00 2001 From: clobber Date: Thu, 12 Mar 2015 00:49:13 -0500 Subject: [PATCH 054/101] GBA: Add additional overrides (Merge pull request #5) These are the ones I could verify so far that fix game loading and save issues. There could still be others needed from VBA's vba-over.ini that have problems due to AP further in-game that require more effort to verify. --- src/gba/supervisor/overrides.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/gba/supervisor/overrides.c b/src/gba/supervisor/overrides.c index 5fccc8b08..2c5759040 100644 --- a/src/gba/supervisor/overrides.c +++ b/src/gba/supervisor/overrides.c @@ -21,6 +21,13 @@ static const struct GBACartridgeOverride _overrides[] = { { "U32E", SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, IDLE_LOOP_NONE }, { "U32P", SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, IDLE_LOOP_NONE }, + // Dragon Ball Z - The Legacy of Goku + { "ALGP", SAVEDATA_EEPROM, HW_NONE, IDLE_LOOP_NONE }, + + // Dragon Ball Z - Taiketsu + { "BDBE", SAVEDATA_EEPROM, HW_NONE, IDLE_LOOP_NONE }, + { "BDBP", SAVEDATA_EEPROM, HW_NONE, IDLE_LOOP_NONE }, + // Drill Dozer { "V49J", SAVEDATA_SRAM, HW_RUMBLE, IDLE_LOOP_NONE }, { "V49E", SAVEDATA_SRAM, HW_RUMBLE, IDLE_LOOP_NONE }, @@ -28,6 +35,9 @@ static const struct GBACartridgeOverride _overrides[] = { // Final Fantasy Tactics Advance { "AFXE", SAVEDATA_FLASH512, HW_NONE, 0x8000428 }, + // F-Zero - Climax + { "BFTJ", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + // Golden Sun: The Lost Age { "AGFE", SAVEDATA_FLASH512, HW_NONE, 0x801353A }, @@ -77,15 +87,30 @@ static const struct GBACartridgeOverride _overrides[] = { { "BPRJ", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, { "BPRE", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, { "BPRP", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPRI", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPRS", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPRD", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPRF", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, // Pokemon LeafGreen { "BPGJ", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, { "BPGE", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, { "BPGP", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPGI", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPGS", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPGD", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, + { "BPGF", SAVEDATA_FLASH1M, HW_NONE, IDLE_LOOP_NONE }, // RockMan EXE 4.5 - Real Operation { "BR4J", SAVEDATA_FLASH512, HW_RTC, IDLE_LOOP_NONE }, + // Rocky + { "AR8E", SAVEDATA_EEPROM, HW_NONE, IDLE_LOOP_NONE }, + { "AROP", SAVEDATA_EEPROM, HW_NONE, IDLE_LOOP_NONE }, + + // Sennen Kazoku + { "BKAJ", SAVEDATA_FLASH1M, HW_RTC, IDLE_LOOP_NONE }, + // Shin Bokura no Taiyou: Gyakushuu no Sabata { "U33J", SAVEDATA_EEPROM, HW_RTC | HW_LIGHT_SENSOR, IDLE_LOOP_NONE }, From f3c723d7139b877de358c9e88ac9b401b2c58320 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 12 Mar 2015 23:35:33 -0700 Subject: [PATCH 055/101] Qt: Clear all override settings when closing a game --- src/platform/qt/OverrideView.cpp | 3 ++- src/platform/qt/OverrideView.ui | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/platform/qt/OverrideView.cpp b/src/platform/qt/OverrideView.cpp index 20ddbb70f..6366b97de 100644 --- a/src/platform/qt/OverrideView.cpp +++ b/src/platform/qt/OverrideView.cpp @@ -143,6 +143,7 @@ void OverrideView::gameStopped() { m_ui.hwTilt->setEnabled(!m_ui.hwAutodetect->isChecked()); m_ui.hwRumble->setEnabled(!m_ui.hwAutodetect->isChecked()); + m_ui.hwAutodetect->setChecked(true); m_ui.hwRTC->setChecked(false); m_ui.hwGyro->setChecked(false); m_ui.hwLight->setChecked(false); @@ -150,7 +151,7 @@ void OverrideView::gameStopped() { m_ui.hwRumble->setChecked(false); m_ui.idleLoop->setEnabled(true); + m_ui.idleLoop->clear(); - m_ui.clear->setEnabled(false); m_ui.save->setEnabled(false); } diff --git a/src/platform/qt/OverrideView.ui b/src/platform/qt/OverrideView.ui index b00f2415d..5f45887df 100644 --- a/src/platform/qt/OverrideView.ui +++ b/src/platform/qt/OverrideView.ui @@ -35,16 +35,6 @@ - - - - false - - - Clear - - - From 2c5d11539a2f7cd8672fc6272a63363cd36c9016 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 12 Mar 2015 23:49:22 -0700 Subject: [PATCH 056/101] Qt: Ensure closing a game clears overrides in backend too --- src/platform/qt/OverrideView.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/platform/qt/OverrideView.cpp b/src/platform/qt/OverrideView.cpp index 6366b97de..7c2b0495c 100644 --- a/src/platform/qt/OverrideView.cpp +++ b/src/platform/qt/OverrideView.cpp @@ -154,4 +154,6 @@ void OverrideView::gameStopped() { m_ui.idleLoop->clear(); m_ui.save->setEnabled(false); + + updateOverrides(); } From 943b805306a362a0c20bbe6d7d4ee660cc75f036 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 13 Mar 2015 00:07:59 -0700 Subject: [PATCH 057/101] Qt: Sync light sensor window with current state --- src/platform/qt/GameController.cpp | 1 + src/platform/qt/GameController.h | 3 +++ src/platform/qt/SensorView.cpp | 9 ++++++--- src/platform/qt/SensorView.h | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index b324ce9f3..2fa530ee6 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -489,6 +489,7 @@ void GameController::setLuminanceValue(uint8_t value) { break; } } + emit luminanceValueChanged(m_luxValue); } void GameController::setLuminanceLevel(int level) { diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index 32cfb2352..d13d0c579 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -79,6 +79,8 @@ signals: void gameFailed(); void stateLoaded(GBAThread*); + void luminanceValueChanged(int); + void postLog(int level, const QString& log); public slots: @@ -109,6 +111,7 @@ public slots: void reloadAudioDriver(); void setLuminanceValue(uint8_t value); + uint8_t luminanceValue() const { return m_luxValue; } void setLuminanceLevel(int level); void increaseLuminanceLevel() { setLuminanceLevel(m_luxLevel + 1); } void decreaseLuminanceLevel() { setLuminanceLevel(m_luxLevel - 1); } diff --git a/src/platform/qt/SensorView.cpp b/src/platform/qt/SensorView.cpp index fba647f54..31914f0b4 100644 --- a/src/platform/qt/SensorView.cpp +++ b/src/platform/qt/SensorView.cpp @@ -31,12 +31,17 @@ SensorView::SensorView(GameController* controller, QWidget* parent) connect(m_ui.timeNow, &QPushButton::clicked, [controller, this] () { m_ui.time->setDateTime(QDateTime::currentDateTime()); }); + + connect(m_controller, SIGNAL(luminanceValueChanged(int)), this, SLOT(luminanceValueChanged(int))); } void SensorView::setLuminanceValue(int value) { - bool oldState; value = std::max(0, std::min(value, 255)); + m_controller->setLuminanceValue(value); +} +void SensorView::luminanceValueChanged(int value) { + bool oldState; oldState = m_ui.lightSpin->blockSignals(true); m_ui.lightSpin->setValue(value); m_ui.lightSpin->blockSignals(oldState); @@ -44,6 +49,4 @@ void SensorView::setLuminanceValue(int value) { oldState = m_ui.lightSlide->blockSignals(true); m_ui.lightSlide->setValue(value); m_ui.lightSlide->blockSignals(oldState); - - m_controller->setLuminanceValue(value); } diff --git a/src/platform/qt/SensorView.h b/src/platform/qt/SensorView.h index 956f8be1a..bd7ef8f27 100644 --- a/src/platform/qt/SensorView.h +++ b/src/platform/qt/SensorView.h @@ -23,6 +23,7 @@ public: private slots: void setLuminanceValue(int); + void luminanceValueChanged(int); private: Ui::SensorView m_ui; From d9797cf0843aaf537303c33be2d6ed0ac842639b Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 13 Mar 2015 00:11:10 -0700 Subject: [PATCH 058/101] Qt: Move soloar sensor menu items into submenu --- src/platform/qt/Window.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 4c3279a6b..ce85b6b2f 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -698,22 +698,22 @@ void Window::setupMenu(QMenuBar* menubar) { addControlledAction(toolsMenu, gdbWindow, "gdbWindow"); #endif - toolsMenu->addSeparator(); - QAction* solarIncrease = new QAction(tr("Increase solar level"), toolsMenu); + QMenu* solarMenu = toolsMenu->addMenu(tr("Solar sensor")); + QAction* solarIncrease = new QAction(tr("Increase solar level"), solarMenu); connect(solarIncrease, SIGNAL(triggered()), m_controller, SLOT(increaseLuminanceLevel())); - addControlledAction(toolsMenu, solarIncrease, "increaseLuminanceLevel"); + addControlledAction(solarMenu, solarIncrease, "increaseLuminanceLevel"); - QAction* solarDecrease = new QAction(tr("Decrease solar level"), toolsMenu); + QAction* solarDecrease = new QAction(tr("Decrease solar level"), solarMenu); connect(solarDecrease, SIGNAL(triggered()), m_controller, SLOT(decreaseLuminanceLevel())); - addControlledAction(toolsMenu, solarDecrease, "decreaseLuminanceLevel"); + addControlledAction(solarMenu, solarDecrease, "decreaseLuminanceLevel"); - QAction* maxSolar = new QAction(tr("Brightest solar level"), toolsMenu); + QAction* maxSolar = new QAction(tr("Brightest solar level"), solarMenu); connect(maxSolar, &QAction::triggered, [this]() { m_controller->setLuminanceLevel(10); }); - addControlledAction(toolsMenu, maxSolar, "maxLuminanceLevel"); + addControlledAction(solarMenu, maxSolar, "maxLuminanceLevel"); - QAction* minSolar = new QAction(tr("Darkest solar level"), toolsMenu); + QAction* minSolar = new QAction(tr("Darkest solar level"), solarMenu); connect(minSolar, &QAction::triggered, [this]() { m_controller->setLuminanceLevel(0); }); - addControlledAction(toolsMenu, minSolar, "minLuminanceLevel"); + addControlledAction(solarMenu, minSolar, "minLuminanceLevel"); toolsMenu->addSeparator(); addControlledAction(toolsMenu, toolsMenu->addAction(tr("Settings..."), this, SLOT(openSettingsWindow())), "settings"); From 84a14b6c00c5e099d35ecb4556ee84d5906d370a Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 14 Mar 2015 00:22:06 -0700 Subject: [PATCH 059/101] Util: NEONize 16-bit color packing --- src/gba/renderers/video-software.c | 2 +- src/util/arm-algo.S | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c index e989366f5..ac9059143 100644 --- a/src/gba/renderers/video-software.c +++ b/src/gba/renderers/video-software.c @@ -560,7 +560,7 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render } #ifdef COLOR_16_BIT -#ifdef __arm__ +#ifdef __ARM_NEON _to16Bit(row, softwareRenderer->row, VIDEO_HORIZONTAL_PIXELS); #else for (x = 0; x < VIDEO_HORIZONTAL_PIXELS; ++x) { diff --git a/src/util/arm-algo.S b/src/util/arm-algo.S index 2c80e337c..cb344e4c1 100644 --- a/src/util/arm-algo.S +++ b/src/util/arm-algo.S @@ -1,8 +1,9 @@ -# Copyright (c) 2013-2014 Jeffrey Pfau +# Copyright (c) 2013-2015 Jeffrey Pfau # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +#ifdef __ARM_NEON # r0: Destination # r1: Source # r2: Number of words to copy as halfwords @@ -13,28 +14,22 @@ mov r8, r0 mov r9, r1 mov r10, r2 .L0: -tst r10, #7 +tst r10, #15 beq .L1 ldr r0, [r9], #4 strh r0, [r8], #2 sub r10, #1 b .L0 .L1: -ldmia r9!, {r0-r7} -strh r0, [r8], #2 -strh r1, [r8], #2 -strh r2, [r8], #2 -strh r3, [r8], #2 -strh r4, [r8], #2 -strh r5, [r8], #2 -strh r6, [r8], #2 -strh r7, [r8], #2 -subs r10, #8 +vld4.16 {d0, d1, d2, d3}, [r9]! +vld4.16 {d4, d5, d6, d7}, [r9]! +vst2.16 {d0, d2}, [r8]! +vst2.16 {d4, d6}, [r8]! +subs r10, #16 bne .L1 pop {r4-r10} bx lr -#ifdef __ARM_NEON # r0: Destination # r1: Source # r2: Width From 1584687c141cf9b00babf9bf299094419e6f0ccd Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 14 Mar 2015 00:22:29 -0700 Subject: [PATCH 060/101] Util: Ensure stack is not marked executable --- src/util/arm-algo.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/arm-algo.S b/src/util/arm-algo.S index cb344e4c1..38eaccddc 100644 --- a/src/util/arm-algo.S +++ b/src/util/arm-algo.S @@ -92,3 +92,5 @@ bne .n40 pop {r4-r7} bx lr #endif + +.section .note.GNU-stack,"",%progbits From e6c10428ce32753b1727aa2afd10884d451d41d1 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 14 Mar 2015 00:23:18 -0700 Subject: [PATCH 061/101] All: Properly match ARM processor name in CMakeLists --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1a75f6ff..716e4b09e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,7 @@ if(BUILD_BBB OR BUILD_RASPI) endif() endif() -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") enable_language(ASM) endif() From f80406efb02fc1470c532e01611d946e5852632c Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 14 Mar 2015 00:56:24 -0700 Subject: [PATCH 062/101] GBA: Replace RTC bitpacked structs with bitfields --- src/gba/hardware.c | 36 ++++++++++++++++++------------------ src/gba/hardware.h | 32 ++++++++++++-------------------- 2 files changed, 30 insertions(+), 38 deletions(-) diff --git a/src/gba/hardware.c b/src/gba/hardware.c index 9f27bf17a..b7682ce19 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -81,8 +81,8 @@ void GBAHardwareInitRTC(struct GBACartridgeHardware* hw) { hw->rtc.bitsRead = 0; hw->rtc.bits = 0; hw->rtc.commandActive = 0; - hw->rtc.command.packed = 0; - hw->rtc.control.packed = 0x40; + hw->rtc.command = 0; + hw->rtc.control = 0x40; memset(hw->rtc.time, 0, sizeof(hw->rtc.time)); } @@ -146,7 +146,7 @@ void _rtcReadPins(struct GBACartridgeHardware* hw) { if (hw->p2) { // GPIO direction should always != reading if (hw->dir1) { - if (hw->rtc.command.reading) { + if (RTCCommandDataIsReading(hw->rtc.command)) { GBALog(hw->p, GBA_LOG_GAME_ERROR, "Attempting to write to RTC while in read mode"); } ++hw->rtc.bitsRead; @@ -160,7 +160,7 @@ void _rtcReadPins(struct GBACartridgeHardware* hw) { --hw->rtc.bytesRemaining; if (hw->rtc.bytesRemaining <= 0) { hw->rtc.commandActive = 0; - hw->rtc.command.reading = 0; + hw->rtc.command = RTCCommandDataClearReading(hw->rtc.command); } hw->rtc.bitsRead = 0; } @@ -169,7 +169,7 @@ void _rtcReadPins(struct GBACartridgeHardware* hw) { hw->rtc.bitsRead = 0; hw->rtc.bytesRemaining = 0; hw->rtc.commandActive = 0; - hw->rtc.command.reading = 0; + hw->rtc.command = RTCCommandDataClearReading(hw->rtc.command); hw->rtc.transferStep = 0; } } @@ -180,16 +180,16 @@ void _rtcReadPins(struct GBACartridgeHardware* hw) { void _rtcProcessByte(struct GBACartridgeHardware* hw) { --hw->rtc.bytesRemaining; if (!hw->rtc.commandActive) { - union RTCCommandData command; - command.packed = hw->rtc.bits; - if (command.magic == 0x06) { + RTCCommandData command; + command = hw->rtc.bits; + if (RTCCommandDataGetMagic(command) == 0x06) { hw->rtc.command = command; - hw->rtc.bytesRemaining = RTC_BYTES[hw->rtc.command.command]; + hw->rtc.bytesRemaining = RTC_BYTES[RTCCommandDataGetCommand(command)]; hw->rtc.commandActive = hw->rtc.bytesRemaining > 0; - switch (command.command) { + switch (RTCCommandDataGetCommand(command)) { case RTC_RESET: - hw->rtc.control.packed = 0; + hw->rtc.control = 0; break; case RTC_DATETIME: case RTC_TIME: @@ -203,12 +203,12 @@ void _rtcProcessByte(struct GBACartridgeHardware* hw) { GBALog(hw->p, GBA_LOG_WARN, "Invalid RTC command byte: %02X", hw->rtc.bits); } } else { - switch (hw->rtc.command.command) { + switch (RTCCommandDataGetCommand(hw->rtc.command)) { case RTC_CONTROL: - hw->rtc.control.packed = hw->rtc.bits; + hw->rtc.control = hw->rtc.bits; break; case RTC_FORCE_IRQ: - GBALog(hw->p, GBA_LOG_STUB, "Unimplemented RTC command %u", hw->rtc.command.command); + GBALog(hw->p, GBA_LOG_STUB, "Unimplemented RTC command %u", RTCCommandDataGetCommand(hw->rtc.command)); break; case RTC_RESET: case RTC_DATETIME: @@ -221,15 +221,15 @@ void _rtcProcessByte(struct GBACartridgeHardware* hw) { hw->rtc.bitsRead = 0; if (!hw->rtc.bytesRemaining) { hw->rtc.commandActive = 0; - hw->rtc.command.reading = 0; + hw->rtc.command = RTCCommandDataClearReading(hw->rtc.command); } } unsigned _rtcOutput(struct GBACartridgeHardware* hw) { uint8_t outputByte = 0; - switch (hw->rtc.command.command) { + switch (RTCCommandDataGetCommand(hw->rtc.command)) { case RTC_CONTROL: - outputByte = hw->rtc.control.packed; + outputByte = hw->rtc.control; break; case RTC_DATETIME: case RTC_TIME: @@ -262,7 +262,7 @@ void _rtcUpdateClock(struct GBACartridgeHardware* hw) { hw->rtc.time[1] = _rtcBCD(date.tm_mon + 1); hw->rtc.time[2] = _rtcBCD(date.tm_mday); hw->rtc.time[3] = _rtcBCD(date.tm_wday); - if (hw->rtc.control.hour24) { + if (RTCControlIsHour24(hw->rtc.control)) { hw->rtc.time[4] = _rtcBCD(date.tm_hour); } else { hw->rtc.time[4] = _rtcBCD(date.tm_hour % 12); diff --git a/src/gba/hardware.h b/src/gba/hardware.h index 55c62794c..f1ea50cdb 100644 --- a/src/gba/hardware.h +++ b/src/gba/hardware.h @@ -8,6 +8,8 @@ #include "util/common.h" +#include "macros.h" + #define IS_GPIO_REGISTER(reg) ((reg) == GPIO_REG_DATA || (reg) == GPIO_REG_DIRECTION || (reg) == GPIO_REG_CONTROL) struct GBARotationSource { @@ -52,16 +54,10 @@ enum GPIODirection { GPIO_READ_WRITE = 1 }; -union RTCControl { - struct { - unsigned : 3; - unsigned minIRQ : 1; - unsigned : 2; - unsigned hour24 : 1; - unsigned poweroff : 1; - }; - uint8_t packed; -}; +DECL_BITFIELD(RTCControl, uint8_t); +DECL_BIT(RTCControl, MinIRQ, 3); +DECL_BIT(RTCControl, Hour24, 6); +DECL_BIT(RTCControl, Poweroff, 7); enum RTCCommand { RTC_RESET = 0, @@ -71,14 +67,10 @@ enum RTCCommand { RTC_TIME = 6 }; -union RTCCommandData { - struct { - unsigned magic : 4; - enum RTCCommand command : 3; - unsigned reading : 1; - }; - uint8_t packed; -}; +DECL_BITFIELD(RTCCommandData, uint8_t); +DECL_BITS(RTCCommandData, Magic, 0, 4); +DECL_BITS(RTCCommandData, Command, 4, 3); +DECL_BIT(RTCCommandData, Reading, 7); struct GBARTC { int bytesRemaining; @@ -86,8 +78,8 @@ struct GBARTC { int bitsRead; int bits; int commandActive; - union RTCCommandData command; - union RTCControl control; + RTCCommandData command; + RTCControl control; uint8_t time[7]; } __attribute__((packed)); From dd17c6f8b0b48f6d2ebd2af2d05768bbc4cfcb07 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 14 Mar 2015 01:05:33 -0700 Subject: [PATCH 063/101] GBA: Eliminate bitpacked struct for GPIO devices --- src/gba/hardware.c | 24 ++++++++++++------------ src/gba/hardware.h | 23 ++++------------------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/gba/hardware.c b/src/gba/hardware.c index b7682ce19..3661df0b1 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -139,13 +139,13 @@ void _rtcReadPins(struct GBACartridgeHardware* hw) { } break; case 2: - if (!hw->p0) { + if (!(hw->pinState & 1)) { hw->rtc.bits &= ~(1 << hw->rtc.bitsRead); - hw->rtc.bits |= hw->p1 << hw->rtc.bitsRead; + hw->rtc.bits |= ((hw->pinState & 2) >> 1) << hw->rtc.bitsRead; } else { - if (hw->p2) { + if (hw->pinState & 4) { // GPIO direction should always != reading - if (hw->dir1) { + if (hw->direction & 2) { if (RTCCommandDataIsReading(hw->rtc.command)) { GBALog(hw->p, GBA_LOG_GAME_ERROR, "Attempting to write to RTC while in read mode"); } @@ -292,7 +292,7 @@ void _gyroReadPins(struct GBACartridgeHardware* hw) { return; } - if (hw->p0) { + if (hw->pinState & 1) { if (gyro->sample) { gyro->sample(gyro); } @@ -302,14 +302,14 @@ void _gyroReadPins(struct GBACartridgeHardware* hw) { hw->gyroSample = (sample >> 21) + 0x6C0; // Crop off an extra bit so that we can't go negative } - if (hw->gyroEdge && !hw->p1) { + if (hw->gyroEdge && !(hw->pinState & 2)) { // Write bit on falling edge unsigned bit = hw->gyroSample >> 15; hw->gyroSample <<= 1; _outputPins(hw, bit << 2); } - hw->gyroEdge = hw->p1; + hw->gyroEdge = !!(hw->pinState & 2); } // == Rumble @@ -324,7 +324,7 @@ void _rumbleReadPins(struct GBACartridgeHardware* hw) { return; } - rumble->setRumble(rumble, hw->p3); + rumble->setRumble(rumble, !!(hw->pinState & 8)); } // == Light sensor @@ -337,11 +337,11 @@ void GBAHardwareInitLight(struct GBACartridgeHardware* hw) { } void _lightReadPins(struct GBACartridgeHardware* hw) { - if (hw->p2) { + if (hw->pinState & 4) { // Boktai chip select return; } - if (hw->p1) { + if (hw->pinState & 2) { struct GBALuminanceSource* lux = hw->p->luminanceSource; GBALog(hw->p, GBA_LOG_DEBUG, "[SOLAR] Got reset"); hw->lightCounter = 0; @@ -352,10 +352,10 @@ void _lightReadPins(struct GBACartridgeHardware* hw) { hw->lightSample = 0xFF; } } - if (hw->p0 && hw->lightEdge) { + if ((hw->pinState & 1) && hw->lightEdge) { ++hw->lightCounter; } - hw->lightEdge = !hw->p0; + hw->lightEdge = !(hw->pinState & 1); bool sendBit = hw->lightCounter >= hw->lightSample; _outputPins(hw, sendBit << 3); diff --git a/src/gba/hardware.h b/src/gba/hardware.h index f1ea50cdb..03c5fa849 100644 --- a/src/gba/hardware.h +++ b/src/gba/hardware.h @@ -87,31 +87,16 @@ struct GBARumble { void (*setRumble)(struct GBARumble*, int enable); }; +DECL_BITFIELD(GPIOPin, uint16_t); + struct GBACartridgeHardware { struct GBA* p; int devices; enum GPIODirection readWrite; uint16_t* gpioBase; - union { - struct { - unsigned p0 : 1; - unsigned p1 : 1; - unsigned p2 : 1; - unsigned p3 : 1; - }; - uint16_t pinState; - }; - - union { - struct { - unsigned dir0 : 1; - unsigned dir1 : 1; - unsigned dir2 : 1; - unsigned dir3 : 1; - }; - uint16_t direction; - }; + uint16_t pinState; + uint16_t direction; struct GBARTC rtc; From 343924908afa3770606170e1e5001189fa85ae6e Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 14 Mar 2015 01:41:38 -0700 Subject: [PATCH 064/101] Libretro: Rename a variable to avoid #define namespace collision with Windows headers --- src/platform/libretro/libretro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/libretro/libretro.c b/src/platform/libretro/libretro.c index 2a23fcacc..844919765 100644 --- a/src/platform/libretro/libretro.c +++ b/src/platform/libretro/libretro.c @@ -39,8 +39,8 @@ unsigned retro_api_version(void) { return RETRO_API_VERSION; } -void retro_set_environment(retro_environment_t environ) { - environCallback = environ; +void retro_set_environment(retro_environment_t env) { + environCallback = env; } void retro_set_video_refresh(retro_video_refresh_t video) { From b2c2a9acf76d6006eba7ca17397273a3080c3fc1 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 15 Mar 2015 02:21:22 -0700 Subject: [PATCH 065/101] GBA BIOS: Fix regression with BgAffineSet --- src/gba/bios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gba/bios.c b/src/gba/bios.c index 5a42baeff..89d0d7cd1 100644 --- a/src/gba/bios.c +++ b/src/gba/bios.c @@ -88,8 +88,8 @@ static void _BgAffineSet(struct GBA* gba) { // [ sx 0 0 ] [ cos(theta) -sin(theta) 0 ] [ 1 0 cx - ox ] [ A B rx ] // [ 0 sy 0 ] * [ sin(theta) cos(theta) 0 ] * [ 0 1 cy - oy ] = [ C D ry ] // [ 0 0 1 ] [ 0 0 1 ] [ 0 0 1 ] [ 0 0 1 ] - ox = cpu->memory.load32(cpu, offset, 0) / 256.f; - oy = cpu->memory.load32(cpu, offset + 4, 0) / 256.f; + ox = (int32_t) cpu->memory.load32(cpu, offset, 0) / 256.f; + oy = (int32_t) cpu->memory.load32(cpu, offset + 4, 0) / 256.f; cx = (int16_t) cpu->memory.load16(cpu, offset + 8, 0); cy = (int16_t) cpu->memory.load16(cpu, offset + 10, 0); sx = (int16_t) cpu->memory.load16(cpu, offset + 12, 0) / 256.f; From 0b38dd1289427bd77f0cadaa52aeeaf6d2c2fd94 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 15 Mar 2015 19:33:38 -0700 Subject: [PATCH 066/101] GBA: Controller profiles --- CHANGES | 1 + src/gba/input.c | 166 +++++++++++++++------------- src/gba/input.h | 3 + src/platform/qt/GBAKeyEditor.cpp | 7 +- src/platform/qt/GBAKeyEditor.h | 3 +- src/platform/qt/InputController.cpp | 24 ++++ src/platform/qt/InputController.h | 3 + src/platform/qt/Window.cpp | 3 +- src/platform/sdl/sdl-events.c | 9 +- 9 files changed, 138 insertions(+), 81 deletions(-) diff --git a/CHANGES b/CHANGES index 119309e02..f307a4c82 100644 --- a/CHANGES +++ b/CHANGES @@ -27,6 +27,7 @@ Features: - Runtime configurable audio driver - Debugger: Add CLI function for writing a register - Libretro core for use with RetroArch and other front-ends + - Controller profiles for setting different bindings for different controllers Bugfixes: - ARM7: Extend prefetch by one stage - GBA Audio: Support 16-bit writes to FIFO audio diff --git a/src/gba/input.c b/src/gba/input.c index 5df882b0e..75451d16b 100644 --- a/src/gba/input.c +++ b/src/gba/input.c @@ -24,7 +24,7 @@ struct GBAInputMapImpl { struct GBAAxisSave { struct Configuration* config; - uint32_t type; + const char* sectionName; }; struct GBAAxisEnumerate { @@ -45,6 +45,11 @@ const char* GBAKeyNames[] = { "L" }; +static void _makeSectionName(char* sectionName, size_t len, uint32_t type) { + snprintf(sectionName, len, "input.%c%c%c%c", type >> 24, type >> 16, type >> 8, type); + sectionName[len - 1] = '\0'; +} + static bool _getIntValue(const struct Configuration* config, const char* section, const char* key, int* value) { const char* strValue = ConfigurationGetValue(config, section, key); if (!strValue) { @@ -122,11 +127,7 @@ static struct GBAInputMapImpl* _guaranteeMap(struct GBAInputMap* map, uint32_t t return impl; } -static void _loadKey(struct GBAInputMap* map, uint32_t type, const struct Configuration* config, enum GBAKey key, const char* keyName) { - char sectionName[SECTION_NAME_MAX]; - snprintf(sectionName, SECTION_NAME_MAX, "input.%c%c%c%c", type >> 24, type >> 16, type >> 8, type); - sectionName[SECTION_NAME_MAX - 1] = '\0'; - +static void _loadKey(struct GBAInputMap* map, uint32_t type, const char* sectionName, const struct Configuration* config, enum GBAKey key, const char* keyName) { char keyKey[KEY_NAME_MAX]; snprintf(keyKey, KEY_NAME_MAX, "key%s", keyName); keyKey[KEY_NAME_MAX - 1] = '\0'; @@ -138,11 +139,7 @@ static void _loadKey(struct GBAInputMap* map, uint32_t type, const struct Config GBAInputBindKey(map, type, value, key); } -static void _loadAxis(struct GBAInputMap* map, uint32_t type, const struct Configuration* config, enum GBAKey direction, const char* axisName) { - char sectionName[SECTION_NAME_MAX]; - snprintf(sectionName, SECTION_NAME_MAX, "input.%c%c%c%c", type >> 24, type >> 16, type >> 8, type); - sectionName[SECTION_NAME_MAX - 1] = '\0'; - +static void _loadAxis(struct GBAInputMap* map, uint32_t type, const char* sectionName, const struct Configuration* config, enum GBAKey direction, const char* axisName) { char axisKey[KEY_NAME_MAX]; snprintf(axisKey, KEY_NAME_MAX, "axis%sValue", axisName); axisKey[KEY_NAME_MAX - 1] = '\0'; @@ -179,11 +176,7 @@ static void _loadAxis(struct GBAInputMap* map, uint32_t type, const struct Confi GBAInputBindAxis(map, type, axis, &realDescription); } -static void _saveKey(const struct GBAInputMap* map, uint32_t type, struct Configuration* config, enum GBAKey key, const char* keyName) { - char sectionName[SECTION_NAME_MAX]; - snprintf(sectionName, SECTION_NAME_MAX, "input.%c%c%c%c", type >> 24, type >> 16, type >> 8, type); - sectionName[SECTION_NAME_MAX - 1] = '\0'; - +static void _saveKey(const struct GBAInputMap* map, uint32_t type, const char* sectionName, struct Configuration* config, enum GBAKey key, const char* keyName) { char keyKey[KEY_NAME_MAX]; snprintf(keyKey, KEY_NAME_MAX, "key%s", keyName); keyKey[KEY_NAME_MAX - 1] = '\0'; @@ -195,11 +188,7 @@ static void _saveKey(const struct GBAInputMap* map, uint32_t type, struct Config ConfigurationSetValue(config, sectionName, keyKey, keyValue); } -static void _clearAxis(uint32_t type, struct Configuration* config, const char* axisName) { - char sectionName[SECTION_NAME_MAX]; - snprintf(sectionName, SECTION_NAME_MAX, "input.%c%c%c%c", type >> 24, type >> 16, type >> 8, type); - sectionName[SECTION_NAME_MAX - 1] = '\0'; - +static void _clearAxis(const char* sectionName, struct Configuration* config, const char* axisName) { char axisKey[KEY_NAME_MAX]; snprintf(axisKey, KEY_NAME_MAX, "axis%sValue", axisName); axisKey[KEY_NAME_MAX - 1] = '\0'; @@ -214,10 +203,7 @@ static void _saveAxis(uint32_t axis, void* dp, void* up) { struct GBAAxisSave* user = up; const struct GBAAxis* description = dp; - uint32_t type = user->type; - char sectionName[SECTION_NAME_MAX]; - snprintf(sectionName, SECTION_NAME_MAX, "input.%c%c%c%c", type >> 24, type >> 16, type >> 8, type); - sectionName[SECTION_NAME_MAX - 1] = '\0'; + const char* sectionName = user->sectionName; if (description->lowDirection != GBA_KEY_NONE) { const char* keyName = GBAKeyNames[description->lowDirection]; @@ -271,6 +257,64 @@ void _unbindAxis(uint32_t axis, void* dp, void* user) { } } +static void _loadAll(struct GBAInputMap* map, uint32_t type, const char* sectionName, const struct Configuration* config) { + _loadKey(map, type, sectionName, config, GBA_KEY_A, "A"); + _loadKey(map, type, sectionName, config, GBA_KEY_B, "B"); + _loadKey(map, type, sectionName, config, GBA_KEY_L, "L"); + _loadKey(map, type, sectionName, config, GBA_KEY_R, "R"); + _loadKey(map, type, sectionName, config, GBA_KEY_START, "Start"); + _loadKey(map, type, sectionName, config, GBA_KEY_SELECT, "Select"); + _loadKey(map, type, sectionName, config, GBA_KEY_UP, "Up"); + _loadKey(map, type, sectionName, config, GBA_KEY_DOWN, "Down"); + _loadKey(map, type, sectionName, config, GBA_KEY_LEFT, "Left"); + _loadKey(map, type, sectionName, config, GBA_KEY_RIGHT, "Right"); + + _loadAxis(map, type, sectionName, config, GBA_KEY_A, "A"); + _loadAxis(map, type, sectionName, config, GBA_KEY_B, "B"); + _loadAxis(map, type, sectionName, config, GBA_KEY_L, "L"); + _loadAxis(map, type, sectionName, config, GBA_KEY_R, "R"); + _loadAxis(map, type, sectionName, config, GBA_KEY_START, "Start"); + _loadAxis(map, type, sectionName, config, GBA_KEY_SELECT, "Select"); + _loadAxis(map, type, sectionName, config, GBA_KEY_UP, "Up"); + _loadAxis(map, type, sectionName, config, GBA_KEY_DOWN, "Down"); + _loadAxis(map, type, sectionName, config, GBA_KEY_LEFT, "Left"); + _loadAxis(map, type, sectionName, config, GBA_KEY_RIGHT, "Right"); +} + +static void _saveAll(const struct GBAInputMap* map, uint32_t type, const char* sectionName, struct Configuration* config) { + _saveKey(map, type, sectionName, config, GBA_KEY_A, "A"); + _saveKey(map, type, sectionName, config, GBA_KEY_B, "B"); + _saveKey(map, type, sectionName, config, GBA_KEY_L, "L"); + _saveKey(map, type, sectionName, config, GBA_KEY_R, "R"); + _saveKey(map, type, sectionName, config, GBA_KEY_START, "Start"); + _saveKey(map, type, sectionName, config, GBA_KEY_SELECT, "Select"); + _saveKey(map, type, sectionName, config, GBA_KEY_UP, "Up"); + _saveKey(map, type, sectionName, config, GBA_KEY_DOWN, "Down"); + _saveKey(map, type, sectionName, config, GBA_KEY_LEFT, "Left"); + _saveKey(map, type, sectionName, config, GBA_KEY_RIGHT, "Right"); + + _clearAxis(sectionName, config, "A"); + _clearAxis(sectionName, config, "B"); + _clearAxis(sectionName, config, "L"); + _clearAxis(sectionName, config, "R"); + _clearAxis(sectionName, config, "Start"); + _clearAxis(sectionName, config, "Select"); + _clearAxis(sectionName, config, "Up"); + _clearAxis(sectionName, config, "Down"); + _clearAxis(sectionName, config, "Left"); + _clearAxis(sectionName, config, "Right"); + + const struct GBAInputMapImpl* impl = _lookupMapConst(map, type); + if (!impl) { + return; + } + struct GBAAxisSave save = { + config, + sectionName + }; + TableEnumerate(&impl->axes, _saveAxis, &save); +} + void GBAInputMapInit(struct GBAInputMap* map) { map->maps = 0; map->numMaps = 0; @@ -414,59 +458,27 @@ void GBAInputEnumerateAxes(const struct GBAInputMap* map, uint32_t type, void (h } void GBAInputMapLoad(struct GBAInputMap* map, uint32_t type, const struct Configuration* config) { - _loadKey(map, type, config, GBA_KEY_A, "A"); - _loadKey(map, type, config, GBA_KEY_B, "B"); - _loadKey(map, type, config, GBA_KEY_L, "L"); - _loadKey(map, type, config, GBA_KEY_R, "R"); - _loadKey(map, type, config, GBA_KEY_START, "Start"); - _loadKey(map, type, config, GBA_KEY_SELECT, "Select"); - _loadKey(map, type, config, GBA_KEY_UP, "Up"); - _loadKey(map, type, config, GBA_KEY_DOWN, "Down"); - _loadKey(map, type, config, GBA_KEY_LEFT, "Left"); - _loadKey(map, type, config, GBA_KEY_RIGHT, "Right"); - - _loadAxis(map, type, config, GBA_KEY_A, "A"); - _loadAxis(map, type, config, GBA_KEY_B, "B"); - _loadAxis(map, type, config, GBA_KEY_L, "L"); - _loadAxis(map, type, config, GBA_KEY_R, "R"); - _loadAxis(map, type, config, GBA_KEY_START, "Start"); - _loadAxis(map, type, config, GBA_KEY_SELECT, "Select"); - _loadAxis(map, type, config, GBA_KEY_UP, "Up"); - _loadAxis(map, type, config, GBA_KEY_DOWN, "Down"); - _loadAxis(map, type, config, GBA_KEY_LEFT, "Left"); - _loadAxis(map, type, config, GBA_KEY_RIGHT, "Right"); + char sectionName[SECTION_NAME_MAX]; + _makeSectionName(sectionName, SECTION_NAME_MAX, type); + _loadAll(map, type, sectionName, config); } void GBAInputMapSave(const struct GBAInputMap* map, uint32_t type, struct Configuration* config) { - _saveKey(map, type, config, GBA_KEY_A, "A"); - _saveKey(map, type, config, GBA_KEY_B, "B"); - _saveKey(map, type, config, GBA_KEY_L, "L"); - _saveKey(map, type, config, GBA_KEY_R, "R"); - _saveKey(map, type, config, GBA_KEY_START, "Start"); - _saveKey(map, type, config, GBA_KEY_SELECT, "Select"); - _saveKey(map, type, config, GBA_KEY_UP, "Up"); - _saveKey(map, type, config, GBA_KEY_DOWN, "Down"); - _saveKey(map, type, config, GBA_KEY_LEFT, "Left"); - _saveKey(map, type, config, GBA_KEY_RIGHT, "Right"); - - _clearAxis(type, config, "A"); - _clearAxis(type, config, "B"); - _clearAxis(type, config, "L"); - _clearAxis(type, config, "R"); - _clearAxis(type, config, "Start"); - _clearAxis(type, config, "Select"); - _clearAxis(type, config, "Up"); - _clearAxis(type, config, "Down"); - _clearAxis(type, config, "Left"); - _clearAxis(type, config, "Right"); - - const struct GBAInputMapImpl* impl = _lookupMapConst(map, type); - if (!impl) { - return; - } - struct GBAAxisSave save = { - config, - type - }; - TableEnumerate(&impl->axes, _saveAxis, &save); + char sectionName[SECTION_NAME_MAX]; + _makeSectionName(sectionName, SECTION_NAME_MAX, type); + _saveAll(map, type, sectionName, config); +} + +void GBAInputProfileLoad(struct GBAInputMap* map, uint32_t type, const struct Configuration* config, const char* profile) { + char sectionName[SECTION_NAME_MAX]; + snprintf(sectionName, SECTION_NAME_MAX, "input-profile.%s", profile); + sectionName[SECTION_NAME_MAX - 1] = '\0'; + _loadAll(map, type, sectionName, config); +} + +void GBAInputProfileSave(const struct GBAInputMap* map, uint32_t type, struct Configuration* config, const char* profile) { + char sectionName[SECTION_NAME_MAX]; + snprintf(sectionName, SECTION_NAME_MAX, "input-profile.%s", profile); + sectionName[SECTION_NAME_MAX - 1] = '\0'; + _saveAll(map, type, sectionName, config); } diff --git a/src/gba/input.h b/src/gba/input.h index 24956659a..0cd2bb1bc 100644 --- a/src/gba/input.h +++ b/src/gba/input.h @@ -45,4 +45,7 @@ void GBAInputEnumerateAxes(const struct GBAInputMap*, uint32_t type, void (handl void GBAInputMapLoad(struct GBAInputMap*, uint32_t type, const struct Configuration*); void GBAInputMapSave(const struct GBAInputMap*, uint32_t type, struct Configuration*); +void GBAInputProfileLoad(struct GBAInputMap*, uint32_t type, const struct Configuration*, const char* profile); +void GBAInputProfileSave(const struct GBAInputMap*, uint32_t type, struct Configuration*, const char* profile); + #endif diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp index d551a4e60..beb499f44 100644 --- a/src/platform/qt/GBAKeyEditor.cpp +++ b/src/platform/qt/GBAKeyEditor.cpp @@ -20,9 +20,10 @@ const qreal GBAKeyEditor::DPAD_CENTER_Y = 0.431; const qreal GBAKeyEditor::DPAD_WIDTH = 0.1; const qreal GBAKeyEditor::DPAD_HEIGHT = 0.1; -GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, QWidget* parent) +GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const char* profile, QWidget* parent) : QWidget(parent) , m_type(type) + , m_profile(profile) , m_controller(controller) { setWindowFlags(windowFlags() & ~Qt::WindowFullscreenButtonHint); @@ -163,6 +164,10 @@ void GBAKeyEditor::save() { bindKey(m_keyL, GBA_KEY_L); bindKey(m_keyR, GBA_KEY_R); m_controller->saveConfiguration(m_type); + + if (m_profile) { + m_controller->saveProfile(m_type, m_profile); + } } void GBAKeyEditor::lookupBinding(const GBAInputMap* map, KeyEditor* keyEditor, GBAKey key) { diff --git a/src/platform/qt/GBAKeyEditor.h b/src/platform/qt/GBAKeyEditor.h index ba749e3d6..cb7cc4c01 100644 --- a/src/platform/qt/GBAKeyEditor.h +++ b/src/platform/qt/GBAKeyEditor.h @@ -26,7 +26,7 @@ class GBAKeyEditor : public QWidget { Q_OBJECT public: - GBAKeyEditor(InputController* controller, int type, QWidget* parent = nullptr); + GBAKeyEditor(InputController* controller, int type, const char* profile = nullptr, QWidget* parent = nullptr); public slots: void setAll(); @@ -76,6 +76,7 @@ private: QList::iterator m_currentKey; uint32_t m_type; + const char* m_profile; InputController* m_controller; QPicture m_background; diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index eee5176c8..21986e48c 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -63,6 +63,7 @@ void InputController::setConfiguration(ConfigController* config) { loadConfiguration(KEYBOARD); #ifdef BUILD_SDL loadConfiguration(SDL_BINDING_BUTTON); + loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON)); #endif } @@ -70,11 +71,34 @@ void InputController::loadConfiguration(uint32_t type) { GBAInputMapLoad(&m_inputMap, type, m_config->configuration()); } +void InputController::loadProfile(uint32_t type, const char* profile) { + GBAInputProfileLoad(&m_inputMap, type, m_config->configuration(), profile); +} + void InputController::saveConfiguration(uint32_t type) { GBAInputMapSave(&m_inputMap, type, m_config->configuration()); m_config->write(); } +void InputController::saveProfile(uint32_t type, const char* profile) { + GBAInputProfileSave(&m_inputMap, type, m_config->configuration(), profile); + m_config->write(); +} + +const char* InputController::profileForType(uint32_t type) { + UNUSED(type); +#ifdef BUILD_SDL + if (type == SDL_BINDING_BUTTON) { +#if SDL_VERSION_ATLEAST(2, 0, 0) + return SDL_JoystickName(m_sdlEvents.joystick); +#else + return SDL_JoystickName(SDL_JoystickIndex(m_sdlEvents.joystick)); +#endif + } +#endif + return 0; +} + GBAKey InputController::mapKeyboard(int key) const { return GBAInputMapKey(&m_inputMap, KEYBOARD, key); } diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h index c50307306..14877e3f2 100644 --- a/src/platform/qt/InputController.h +++ b/src/platform/qt/InputController.h @@ -36,7 +36,10 @@ public: void setConfiguration(ConfigController* config); void loadConfiguration(uint32_t type); + void loadProfile(uint32_t type, const char* profile); void saveConfiguration(uint32_t type = KEYBOARD); + void saveProfile(uint32_t type, const char* profile); + const char* profileForType(uint32_t type); GBAKey mapKeyboard(int key) const; diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index ce85b6b2f..dc6f5c2a2 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -255,7 +255,8 @@ void Window::openCheatsWindow() { #ifdef BUILD_SDL void Window::openGamepadWindow() { - GBAKeyEditor* keyEditor = new GBAKeyEditor(&m_inputController, SDL_BINDING_BUTTON); + const char* profile = m_inputController.profileForType(SDL_BINDING_BUTTON); + GBAKeyEditor* keyEditor = new GBAKeyEditor(&m_inputController, SDL_BINDING_BUTTON, profile); connect(this, SIGNAL(shutdown()), keyEditor, SLOT(close())); keyEditor->setAttribute(Qt::WA_DeleteOnClose); keyEditor->show(); diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 0a8bcbbb7..49903f09c 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -78,7 +78,14 @@ void GBASDLInitBindings(struct GBAInputMap* inputMap) { void GBASDLEventsLoadConfig(struct GBASDLEvents* context, const struct Configuration* config) { GBAInputMapLoad(context->bindings, SDL_BINDING_KEY, config); - GBAInputMapLoad(context->bindings, SDL_BINDING_BUTTON, config); + if (context->joystick) { + GBAInputMapLoad(context->bindings, SDL_BINDING_BUTTON, config); +#if SDL_VERSION_ATLEAST(2, 0, 0) + GBAInputProfileLoad(context->bindings, SDL_BINDING_BUTTON, config, SDL_JoystickName(context->joystick)); +#else + GBAInputProfileLoad(context->bindings, SDL_BINDING_BUTTON, config, SDL_JoystickName(SDL_JoystickIndex(context->joystick))); +#endif + } } void GBASDLDeinitEvents(struct GBASDLEvents* context) { From e6377f2e6a8902a780f8caa4d40e1768963eb12d Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 15 Mar 2015 23:48:35 -0700 Subject: [PATCH 067/101] GBA: Add player IDs to allow multiple controller profiles to be used at once --- src/platform/qt/InputController.cpp | 6 +++--- src/platform/qt/InputController.h | 3 ++- src/platform/qt/MultiplayerController.cpp | 8 ++++++++ src/platform/qt/MultiplayerController.h | 2 ++ src/platform/qt/Window.cpp | 6 ++++-- src/platform/qt/Window.h | 3 ++- src/platform/sdl/main.c | 2 +- src/platform/sdl/sdl-events.c | 4 ++-- src/platform/sdl/sdl-events.h | 2 +- 9 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 21986e48c..592761c08 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -19,8 +19,9 @@ extern "C" { using namespace QGBA; -InputController::InputController(QObject* parent) +InputController::InputController(int playerId, QObject* parent) : QObject(parent) + , m_playerId(playerId) , m_config(nullptr) , m_gamepadTimer(nullptr) { @@ -28,9 +29,8 @@ InputController::InputController(QObject* parent) #ifdef BUILD_SDL m_sdlEvents.bindings = &m_inputMap; - GBASDLInitEvents(&m_sdlEvents); + GBASDLInitEvents(&m_sdlEvents, playerId); GBASDLInitBindings(&m_inputMap); - SDL_JoystickEventState(SDL_QUERY); m_gamepadTimer = new QTimer(this); connect(m_gamepadTimer, SIGNAL(timeout()), this, SLOT(testGamepad())); diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h index 14877e3f2..1ed729064 100644 --- a/src/platform/qt/InputController.h +++ b/src/platform/qt/InputController.h @@ -31,7 +31,7 @@ Q_OBJECT public: static const uint32_t KEYBOARD = 0x51545F4B; - InputController(QObject* parent = nullptr); + InputController(int playerId = 0, QObject* parent = nullptr); ~InputController(); void setConfiguration(ConfigController* config); @@ -67,6 +67,7 @@ private: GBAInputMap m_inputMap; ConfigController* m_config; + int m_playerId; #ifdef BUILD_SDL GBASDLEvents m_sdlEvents; diff --git a/src/platform/qt/MultiplayerController.cpp b/src/platform/qt/MultiplayerController.cpp index fae301a49..827900c70 100644 --- a/src/platform/qt/MultiplayerController.cpp +++ b/src/platform/qt/MultiplayerController.cpp @@ -61,3 +61,11 @@ void MultiplayerController::detachGame(GameController* controller) { MutexUnlock(&m_lockstep.mutex); controller->threadContinue(); } + +int MultiplayerController::attached() { + int num; + MutexLock(&m_lockstep.mutex); + num = m_lockstep.attached; + MutexUnlock(&m_lockstep.mutex); + return num; +} diff --git a/src/platform/qt/MultiplayerController.h b/src/platform/qt/MultiplayerController.h index 7c5279823..ac3514c1b 100644 --- a/src/platform/qt/MultiplayerController.h +++ b/src/platform/qt/MultiplayerController.h @@ -22,6 +22,8 @@ public: bool attachGame(GameController*); void detachGame(GameController*); + int attached(); + private: GBASIOLockstep m_lockstep; }; diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 5b603fb31..550c21f71 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -37,13 +37,14 @@ extern "C" { using namespace QGBA; -Window::Window(ConfigController* config, QWidget* parent) +Window::Window(ConfigController* config, int playerId, QWidget* parent) : QMainWindow(parent) , m_logView(new LogView()) , m_stateWindow(nullptr) , m_screenWidget(new WindowBackground()) , m_logo(":/res/mgba-1024.png") , m_config(config) + , m_inputController(playerId) #ifdef USE_FFMPEG , m_videoView(nullptr) #endif @@ -55,6 +56,7 @@ Window::Window(ConfigController* config, QWidget* parent) #endif , m_mruMenu(nullptr) , m_shortcutController(new ShortcutController(this)) + , m_playerId(playerId) { setWindowTitle(PROJECT_NAME); setFocusPolicy(Qt::StrongFocus); @@ -532,7 +534,7 @@ void Window::setupMenu(QMenuBar* menubar) { multiplayer = std::make_shared(); m_controller->setMultiplayerController(multiplayer); } - Window* w2 = new Window(m_config); + Window* w2 = new Window(m_config, multiplayer->attached()); w2->setAttribute(Qt::WA_DeleteOnClose); w2->loadConfig(); w2->controller()->setMultiplayerController(multiplayer); diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index 68aac1697..9dce80b42 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -39,7 +39,7 @@ class Window : public QMainWindow { Q_OBJECT public: - Window(ConfigController* config, QWidget* parent = nullptr); + Window(ConfigController* config, int playerId = 0, QWidget* parent = nullptr); virtual ~Window(); GameController* controller() { return m_controller; } @@ -134,6 +134,7 @@ private: QList m_mruFiles; QMenu* m_mruMenu; ShortcutController* m_shortcutController; + int m_playerId; #ifdef USE_FFMPEG VideoView* m_videoView; diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c index 441cc23b8..c1d471d4c 100644 --- a/src/platform/sdl/main.c +++ b/src/platform/sdl/main.c @@ -101,7 +101,7 @@ int main(int argc, char** argv) { renderer.events.bindings = &inputMap; GBASDLInitBindings(&inputMap); - GBASDLInitEvents(&renderer.events); + GBASDLInitEvents(&renderer.events, 0); GBASDLEventsLoadConfig(&renderer.events, GBAConfigGetInput(&config)); context.overrides = GBAConfigGetOverrides(&config); diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 49903f09c..c3273ffa0 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -21,13 +21,13 @@ static int _openContexts = 0; -bool GBASDLInitEvents(struct GBASDLEvents* context) { +bool GBASDLInitEvents(struct GBASDLEvents* context, int playerId) { if (!_openContexts && SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) { return false; } ++_openContexts; SDL_JoystickEventState(SDL_ENABLE); - context->joystick = SDL_JoystickOpen(0); + context->joystick = SDL_JoystickOpen(playerId); #if !SDL_VERSION_ATLEAST(2, 0, 0) SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); #endif diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h index 997345e73..1e8e3a2a2 100644 --- a/src/platform/sdl/sdl-events.h +++ b/src/platform/sdl/sdl-events.h @@ -28,7 +28,7 @@ struct GBASDLEvents { #endif }; -bool GBASDLInitEvents(struct GBASDLEvents*); +bool GBASDLInitEvents(struct GBASDLEvents*, int playerId); void GBASDLDeinitEvents(struct GBASDLEvents*); void GBASDLInitBindings(struct GBAInputMap* inputMap); From c04ca093e17a6b2bbb66833b811a7473fa388aa8 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 16 Mar 2015 00:10:59 -0700 Subject: [PATCH 068/101] SDL: Ability to lock aspect ratio --- CHANGES | 1 + src/platform/sdl/gl-sdl.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f307a4c82..2fa2dae34 100644 --- a/CHANGES +++ b/CHANGES @@ -28,6 +28,7 @@ Features: - Debugger: Add CLI function for writing a register - Libretro core for use with RetroArch and other front-ends - Controller profiles for setting different bindings for different controllers + - Ability to lock aspect ratio Bugfixes: - ARM7: Extend prefetch by one stage - GBA Audio: Support 16-bit writes to FIFO audio diff --git a/src/platform/sdl/gl-sdl.c b/src/platform/sdl/gl-sdl.c index 0a0d73e21..489483026 100644 --- a/src/platform/sdl/gl-sdl.c +++ b/src/platform/sdl/gl-sdl.c @@ -29,6 +29,26 @@ static const GLint _glTexCoords[] = { }; #endif +static void _doViewport(int w, int h, struct SDLSoftwareRenderer* renderer) { + int drawW = w; + int drawH = h; + if (renderer->lockAspectRatio) { + if (w * 2 > h * 3) { + drawW = h * 3 / 2; + } else if (w * 2 < h * 3) { + drawH = w * 2 / 3; + } + } + glViewport((w - drawW) / 2, (h - drawH) / 2, drawW, drawH); + glClear(GL_COLOR_BUFFER_BIT); +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_GL_SwapWindow(renderer->window); +#else + SDL_GL_SwapBuffers(); +#endif + glClear(GL_COLOR_BUFFER_BIT); +} + bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { #ifndef COLOR_16_BIT SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); @@ -86,9 +106,7 @@ bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0); #endif - - glViewport(0, 0, renderer->viewportWidth, renderer->viewportHeight); - + _doViewport(renderer->viewportWidth, renderer->viewportHeight, renderer); return true; } @@ -110,7 +128,7 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render // Event handling can change the size of the screen if (renderer->events.windowUpdated) { SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight); - glViewport(0, 0, renderer->viewportWidth, renderer->viewportHeight); + _doViewport(renderer->viewportWidth, renderer->viewportHeight, renderer); renderer->events.windowUpdated = 0; } #endif From 29c198c8522d55b678ebd7782f8c265195a16bed Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 16 Mar 2015 00:16:35 -0700 Subject: [PATCH 069/101] Qt: Add version information to Windows Qt build --- res/mgba.rc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/res/mgba.rc b/res/mgba.rc index d6a546ea4..a7447d9d9 100644 --- a/res/mgba.rc +++ b/res/mgba.rc @@ -1 +1,28 @@ IDI_ICON1 ICON DISCARDABLE "mgba.ico" + +#include + +VS_VERSION_INFO VERSIONINFO +FILEVERSION 0,2,0,0 +PRODUCTVERSION 0,2,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "endrift" + VALUE "FileDescription", "mGBA Game Boy Advance emulator" + VALUE "FileVersion", "0.2.0.0" + VALUE "InternalName", BINARY_NAME + VALUE "LegalCopyright", "(c) 2013 - 2015 Jeffrey Pfau" + VALUE "OriginalFilename", BINARY_NAME + VALUE "ProductName", PROJECT_NAME + VALUE "ProductVersion", PROJECT_VERSION + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END From 20aae1202a22ecda2313f77c141f3a288c23500f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 16 Mar 2015 00:35:09 -0700 Subject: [PATCH 070/101] Qt: Properly preprocess Windows RC file --- CMakeLists.txt | 1 + res/{mgba.rc => mgba.rc.in} | 16 ++++++++-------- src/platform/qt/CMakeLists.txt | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) rename res/{mgba.rc => mgba.rc.in} (50%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 716e4b09e..30c9d18c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,7 @@ find_feature(USE_MAGICK "MagickWand") # Platform support if(WIN32) + set(WIN32_VERSION "${LIB_VERSION_MAJOR},${LIB_VERSION_MINOR},${LIB_VERSION_PATCH}") add_definitions(-D_WIN32_WINNT=0x0600) list(APPEND OS_LIB ws2_32) file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c) diff --git a/res/mgba.rc b/res/mgba.rc.in similarity index 50% rename from res/mgba.rc rename to res/mgba.rc.in index a7447d9d9..0eee1355c 100644 --- a/res/mgba.rc +++ b/res/mgba.rc.in @@ -1,10 +1,10 @@ -IDI_ICON1 ICON DISCARDABLE "mgba.ico" +IDI_ICON1 ICON DISCARDABLE "${CMAKE_SOURCE_DIR}/res/mgba.ico" #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,2,0,0 -PRODUCTVERSION 0,2,0,0 +FILEVERSION ${WIN32_VERSION},0 +PRODUCTVERSION ${WIN32_VERSION},0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "endrift" VALUE "FileDescription", "mGBA Game Boy Advance emulator" - VALUE "FileVersion", "0.2.0.0" - VALUE "InternalName", BINARY_NAME + VALUE "FileVersion", "${LIB_VERSION_STRING}.0" + VALUE "InternalName", "${BINARY_NAME}" VALUE "LegalCopyright", "(c) 2013 - 2015 Jeffrey Pfau" - VALUE "OriginalFilename", BINARY_NAME - VALUE "ProductName", PROJECT_NAME - VALUE "ProductVersion", PROJECT_VERSION + VALUE "OriginalFilename", "${BINARY_NAME}" + VALUE "ProductName", "${PROJECT_NAME}" + VALUE "ProductVersion", "${BINARY_NAME}" END END diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 85cd6631a..4b0900be6 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -106,7 +106,8 @@ set_source_files_properties(${CMAKE_SOURCE_DIR}/res/mgba.icns PROPERTIES MACOSX_ qt5_add_resources(RESOURCES resources.qrc) if(WIN32) - list(APPEND RESOURCES ${CMAKE_SOURCE_DIR}/res/mgba.rc) + configure_file(${CMAKE_SOURCE_DIR}/res/mgba.rc.in ${CMAKE_BINARY_DIR}/res/mgba.rc) + list(APPEND RESOURCES ${CMAKE_BINARY_DIR}/res/mgba.rc) endif() add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/mgba.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_FILES} ${AUDIO_SRC} ${RESOURCES}) set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES}") From a8dae9b9d5546a2fdfdea3674e813a7883d913df Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 16 Mar 2015 20:32:02 -0700 Subject: [PATCH 071/101] GBA Video: Fix modes 3 and 5 with RGB565 pixel format --- src/gba/renderers/video-software.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c index ac9059143..eb8a1d193 100644 --- a/src/gba/renderers/video-software.c +++ b/src/gba/renderers/video-software.c @@ -1526,6 +1526,12 @@ static void _drawBackgroundMode3(struct GBAVideoSoftwareRenderer* renderer, stru color32 |= (color << 6) & 0xF800; color32 |= (color << 9) & 0xF80000; color = color32; +#elif COLOR_5_6_5 + uint16_t color16 = 0; + color16 |= (color & 0x001F) << 11; + color16 |= (color & 0x03E0) << 1; + color16 |= (color & 0x7C00) >> 10; + color = color16; #endif mosaicWait = mosaicH; } else { @@ -1609,6 +1615,12 @@ static void _drawBackgroundMode5(struct GBAVideoSoftwareRenderer* renderer, stru color32 |= (color << 3) & 0xF8; color32 |= (color << 6) & 0xF800; color = color32; +#elif COLOR_5_6_5 + uint16_t color16 = 0; + color16 |= (color & 0x001F) << 11; + color16 |= (color & 0x03E0) << 1; + color16 |= (color & 0x7C00) >> 10; + color = color16; #endif mosaicWait = mosaicH; } else { From fe0af2c563421d9a1750686683cc760bce572ef8 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 16 Mar 2015 23:14:52 -0700 Subject: [PATCH 072/101] GBA: Add option to disable loading BIOS even if BIOS path is stored (fixes #203) --- src/gba/supervisor/config.c | 4 ++++ src/gba/supervisor/config.h | 1 + src/gba/supervisor/thread.c | 6 +++++- src/platform/qt/ConfigController.cpp | 1 + src/platform/qt/GameController.cpp | 11 ++++++++++- src/platform/qt/GameController.h | 2 ++ src/platform/qt/SettingsView.cpp | 2 ++ src/platform/qt/SettingsView.ui | 3 --- src/platform/qt/Window.cpp | 5 +++++ src/platform/sdl/main.c | 1 + 10 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/gba/supervisor/config.c b/src/gba/supervisor/config.c index c101b20f8..9f3427af0 100644 --- a/src/gba/supervisor/config.c +++ b/src/gba/supervisor/config.c @@ -190,6 +190,9 @@ void GBAConfigMap(const struct GBAConfig* config, struct GBAOptions* opts) { } int fakeBool; + if (_lookupIntValue(config, "useSync", &fakeBool)) { + opts->useBios = fakeBool; + } if (_lookupIntValue(config, "audioSync", &fakeBool)) { opts->audioSync = fakeBool; } @@ -229,6 +232,7 @@ void GBAConfigMap(const struct GBAConfig* config, struct GBAOptions* opts) { void GBAConfigLoadDefaults(struct GBAConfig* config, const struct GBAOptions* opts) { ConfigurationSetValue(&config->defaultsTable, 0, "bios", opts->bios); ConfigurationSetIntValue(&config->defaultsTable, 0, "skipBios", opts->skipBios); + ConfigurationSetIntValue(&config->defaultsTable, 0, "useBios", opts->useBios); ConfigurationSetIntValue(&config->defaultsTable, 0, "logLevel", opts->logLevel); ConfigurationSetIntValue(&config->defaultsTable, 0, "frameskip", opts->frameskip); ConfigurationSetIntValue(&config->defaultsTable, 0, "rewindEnable", opts->rewindEnable); diff --git a/src/gba/supervisor/config.h b/src/gba/supervisor/config.h index 92e8a285d..369bdbd29 100644 --- a/src/gba/supervisor/config.h +++ b/src/gba/supervisor/config.h @@ -21,6 +21,7 @@ struct GBAConfig { struct GBAOptions { char* bios; bool skipBios; + bool useBios; int logLevel; int frameskip; bool rewindEnable; diff --git a/src/gba/supervisor/thread.c b/src/gba/supervisor/thread.c index 0a7d6515f..c595d21d1 100644 --- a/src/gba/supervisor/thread.c +++ b/src/gba/supervisor/thread.c @@ -310,7 +310,11 @@ static THREAD_ENTRY _GBAThreadRun(void* context) { } void GBAMapOptionsToContext(const struct GBAOptions* opts, struct GBAThread* threadContext) { - threadContext->bios = VFileOpen(opts->bios, O_RDONLY); + if (opts->useBios) { + threadContext->bios = VFileOpen(opts->bios, O_RDONLY); + } else { + threadContext->bios = 0; + } threadContext->frameskip = opts->frameskip; threadContext->logLevel = opts->logLevel; if (opts->rewindEnable) { diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp index e46595673..c33190a65 100644 --- a/src/platform/qt/ConfigController.cpp +++ b/src/platform/qt/ConfigController.cpp @@ -100,6 +100,7 @@ ConfigController::ConfigController(QObject* parent) m_opts.rewindEnable = false; m_opts.rewindBufferInterval = 0; m_opts.rewindBufferCapacity = 0; + m_opts.useBios = true; GBAConfigLoadDefaults(&m_config, &m_opts); GBAConfigLoad(&m_config); GBAConfigMap(&m_config, &m_opts); diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index 2fa530ee6..35b55085d 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -156,6 +156,7 @@ void GameController::setOptions(const GBAOptions* opts) { setAudioSync(opts->audioSync); setVideoSync(opts->videoSync); setSkipBIOS(opts->skipBios); + setUseBIOS(opts->useBios); setRewind(opts->rewindEnable, opts->rewindBufferCapacity, opts->rewindBufferInterval); threadInterrupt(); @@ -228,8 +229,10 @@ void GameController::openGame() { #endif } - if (!m_bios.isNull()) { + if (!m_bios.isNull() &&m_useBios) { m_threadContext.bios = VFileOpen(m_bios.toLocal8Bit().constData(), O_RDONLY); + } else { + m_threadContext.bios = nullptr; } if (!m_patch.isNull()) { @@ -402,6 +405,12 @@ void GameController::setSkipBIOS(bool set) { threadContinue(); } +void GameController::setUseBIOS(bool use) { + threadInterrupt(); + m_useBios = use; + threadContinue(); +} + void GameController::loadState(int slot) { threadInterrupt(); GBALoadState(&m_threadContext, m_threadContext.stateDir, slot); diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index d13d0c579..f05337057 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -87,6 +87,7 @@ public slots: void loadGame(const QString& path, bool dirmode = false); void loadBIOS(const QString& path); void setSkipBIOS(bool); + void setUseBIOS(bool); void loadPatch(const QString& path); void openGame(); void closeGame(); @@ -151,6 +152,7 @@ private: QString m_fname; QString m_bios; + bool m_useBios; QString m_patch; QThread* m_audioThread; diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp index 95c6e34e0..610b65456 100644 --- a/src/platform/qt/SettingsView.cpp +++ b/src/platform/qt/SettingsView.cpp @@ -19,6 +19,7 @@ SettingsView::SettingsView(ConfigController* controller, QWidget* parent) m_ui.setupUi(this); loadSetting("bios", m_ui.bios); + loadSetting("useBios", m_ui.useBios); loadSetting("skipBios", m_ui.skipBios); loadSetting("audioBuffers", m_ui.audioBufferSize); loadSetting("videoSync", m_ui.videoSync); @@ -68,6 +69,7 @@ void SettingsView::selectBios() { void SettingsView::updateConfig() { saveSetting("bios", m_ui.bios); + saveSetting("useBios", m_ui.useBios); saveSetting("skipBios", m_ui.skipBios); saveSetting("audioBuffers", m_ui.audioBufferSize); saveSetting("videoSync", m_ui.videoSync); diff --git a/src/platform/qt/SettingsView.ui b/src/platform/qt/SettingsView.ui index b3852c4ec..311b509fa 100644 --- a/src/platform/qt/SettingsView.ui +++ b/src/platform/qt/SettingsView.ui @@ -62,9 +62,6 @@ - - false - Use BIOS file diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index dc6f5c2a2..89cd0cdec 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -196,6 +196,8 @@ void Window::selectBIOS() { m_config->setQtOption("lastDirectory", QFileInfo(filename).dir().path()); m_config->setOption("bios", filename); m_config->updateOption("bios"); + m_config->setOption("useBios", true); + m_config->updateOption("useBios"); m_controller->loadBIOS(filename); } } @@ -733,6 +735,9 @@ void Window::setupMenu(QMenuBar* menubar) { ConfigOption* skipBios = m_config->addOption("skipBios"); skipBios->connect([this](const QVariant& value) { m_controller->setSkipBIOS(value.toBool()); }); + ConfigOption* useBios = m_config->addOption("useBios"); + useBios->connect([this](const QVariant& value) { m_controller->setUseBIOS(value.toBool()); }); + ConfigOption* rewindEnable = m_config->addOption("rewindEnable"); rewindEnable->connect([this](const QVariant& value) { m_controller->setRewind(value.toBool(), m_config->getOption("rewindBufferCapacity").toInt(), m_config->getOption("rewindBufferInterval").toInt()); }); diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c index 441cc23b8..bc40873b3 100644 --- a/src/platform/sdl/main.c +++ b/src/platform/sdl/main.c @@ -45,6 +45,7 @@ int main(int argc, char** argv) { struct GBAOptions opts = { .width = VIDEO_HORIZONTAL_PIXELS, .height = VIDEO_VERTICAL_PIXELS, + .useBios = true, .rewindEnable = true, .audioBuffers = 512, .videoSync = false, From 22021df3873d29021cda6d2de61ac56ca442b829 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 17 Mar 2015 22:16:57 -0700 Subject: [PATCH 073/101] All: Fix OpenBSD build with CLI debugger --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30c9d18c7..2a286b79e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,6 +100,9 @@ add_definitions(-DBINARY_NAME="${BINARY_NAME}" -DPROJECT_NAME="${PROJECT_NAME}" set(FEATURES) if(CMAKE_SYSTEM_NAME MATCHES .*BSD) set(LIBEDIT_LIBRARIES -ledit) + if (CMAKE_SYSTEM_NAME STREQUAL OpenBSD) + list(APPEND LIBEDIT_LIBRARIES -ltermcap) + endif() else() find_feature(USE_CLI_DEBUGGER "libedit") endif() From c75224ce8cb68de4f10b8695eaa7372fb10a5f26 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 17 Mar 2015 22:30:58 -0700 Subject: [PATCH 074/101] SDL: Add Pandora bindings --- CMakeLists.txt | 6 +++++- src/platform/sdl/sdl-events.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a286b79e..02c930abc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,12 +136,16 @@ if(APPLE OR CMAKE_C_COMPILER_ID STREQUAL "GNU" AND BUILD_LTO) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") endif() -if(BUILD_BBB OR BUILD_RASPI) +if(BUILD_BBB OR BUILD_RASPI OR BUILD_PANDORA) if(NOT BUILD_EGL) add_definitions(-DCOLOR_16_BIT -DCOLOR_5_6_5) endif() endif() +if(BUILD_PANDORA) + add_definitions(-DBUILD_PANDORA) +endif() + if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") enable_language(ASM) endif() diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 49903f09c..030988d74 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -35,7 +35,18 @@ bool GBASDLInitEvents(struct GBASDLEvents* context) { } void GBASDLInitBindings(struct GBAInputMap* inputMap) { -#if SDL_VERSION_ATLEAST(2, 0, 0) +#ifdef BUILD_PANDORA + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_PAGEDOWN, GBA_KEY_A); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_END, GBA_KEY_B); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_RSHIFT, GBA_KEY_L); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_RCTRL, GBA_KEY_R); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_LALT, GBA_KEY_START); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_LCTRL, GBA_KEY_SELECT); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_UP, GBA_KEY_UP); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_DOWN, GBA_KEY_DOWN); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_LEFT, GBA_KEY_LEFT); + GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_RIGHT, GBA_KEY_RIGHT); +#elif SDL_VERSION_ATLEAST(2, 0, 0) GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDL_SCANCODE_X, GBA_KEY_A); GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDL_SCANCODE_Z, GBA_KEY_B); GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDL_SCANCODE_A, GBA_KEY_L); @@ -105,7 +116,7 @@ static void _pauseAfterFrame(struct GBAThread* context) { static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents* sdlContext, const struct SDL_KeyboardEvent* event) { enum GBAKey key = GBA_KEY_NONE; if (!event->keysym.mod) { -#if SDL_VERSION_ATLEAST(2, 0, 0) +#if !defined(BUILD_PANORA) && SDL_VERSION_ATLEAST(2, 0, 0) key = GBAInputMapKey(sdlContext->bindings, SDL_BINDING_KEY, event->keysym.scancode); #else key = GBAInputMapKey(sdlContext->bindings, SDL_BINDING_KEY, event->keysym.sym); From b677d41469cb4fc0cced47c69729ecf3681e927b Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 01:36:48 -0700 Subject: [PATCH 075/101] SDL: Do not cache SDL variables --- src/platform/sdl/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index d964eff1a..7d4d58125 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -5,9 +5,9 @@ if (SDL_VERSION EQUAL "2") include(FindPkgConfig) pkg_search_module(SDL2 sdl2) if (SDL2_FOUND) - set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS} CACHE INTERNAL "") - set(SDL_LIBRARY ${SDL2_LIBRARIES} CACHE INTERNAL "") - set(SDLMAIN_LIBRARY "" CACHE INTERNAL "") + set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS}) + set(SDL_LIBRARY ${SDL2_LIBRARIES}) + set(SDLMAIN_LIBRARY) link_directories(${SDL2_LIBDIR}) set(SDL_VERSION_DEBIAN "2-2.0-0") endif() From 1af7b56349e593b77fd915d6674e6dc63110e741 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 01:39:20 -0700 Subject: [PATCH 076/101] SDL: Use pixman for software scaling --- src/platform/sdl/CMakeLists.txt | 9 ++++++- src/platform/sdl/main.h | 9 +++++++ src/platform/sdl/sw-sdl.c | 48 ++++++++++++++++++++++++++++----- 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index 7d4d58125..63266688d 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -17,6 +17,7 @@ if(SDL_VERSION EQUAL "1.2" OR NOT SDL2_FOUND) find_package(SDL 1.2) set(SDL_VERSION "1.2" PARENT_SCOPE) set(SDL_VERSION_DEBIAN "1.2debian") + set(USE_PIXMAN ON) endif() if (NOT SDL2_FOUND AND NOT SDL_FOUND) @@ -24,10 +25,16 @@ if (NOT SDL2_FOUND AND NOT SDL_FOUND) return() endif() +find_feature(USE_PIXMAN "pixman-1") +if(USE_PIXMAN) + add_definitions(-DUSE_PIXMAN) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libpixman-1.0" PARENT_SCOPE) +endif() + set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libsdl${SDL_VERSION_DEBIAN}" PARENT_SCOPE) file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c) -set(PLATFORM_LIBRARY ${SDL_LIBRARY} ${SDLMAIN_LIBRARY}) +set(PLATFORM_LIBRARY ${SDL_LIBRARY} ${SDLMAIN_LIBRARY} ${PIXMAN-1_LIBRARIES}) include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${SDL_INCLUDE_DIR}) set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/main.c) diff --git a/src/platform/sdl/main.h b/src/platform/sdl/main.h index c62f3bb28..45bea052b 100644 --- a/src/platform/sdl/main.h +++ b/src/platform/sdl/main.h @@ -31,6 +31,10 @@ #pragma GCC diagnostic pop #endif +#ifdef USE_PIXMAN +#include +#endif + struct SDLSoftwareRenderer { struct GBAVideoSoftwareRenderer d; struct GBASDLAudio audio; @@ -55,6 +59,11 @@ struct SDLSoftwareRenderer { GLuint tex; #endif +#ifdef USE_PIXMAN + pixman_image_t* pix; + pixman_image_t* screenpix; +#endif + #ifdef BUILD_RASPI EGLDisplay display; EGLSurface surface; diff --git a/src/platform/sdl/sw-sdl.c b/src/platform/sdl/sw-sdl.c index e863a53f0..e147c1651 100644 --- a/src/platform/sdl/sw-sdl.c +++ b/src/platform/sdl/sw-sdl.c @@ -40,14 +40,32 @@ bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { if (renderer->ratio == 1) { renderer->d.outputBuffer = surface->pixels; -#ifdef COLOR_16_BIT - renderer->d.outputBufferStride = surface->pitch / 2; -#else - renderer->d.outputBufferStride = surface->pitch / 4; -#endif + renderer->d.outputBufferStride = surface->pitch / BYTES_PER_PIXEL; } else { - renderer->d.outputBuffer = malloc(240 * 160 * BYTES_PER_PIXEL); - renderer->d.outputBufferStride = 240; +#ifdef USE_PIXMAN + renderer->d.outputBuffer = malloc(VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * BYTES_PER_PIXEL); + renderer->d.outputBufferStride = VIDEO_HORIZONTAL_PIXELS; +#ifdef COLOR_16_BIT +#ifdef COLOR_5_6_5 + pixman_format_code_t format = PIXMAN_r5g6b5; +#else + pixman_format_code_t format = PIXMAN_x1b5g5r5; +#endif +#else + pixman_format_code_t format = PIXMAN_x8b8g8r8; +#endif + renderer->pix = pixman_image_create_bits(format, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, + renderer->d.outputBuffer, renderer->d.outputBufferStride * BYTES_PER_PIXEL); + renderer->screenpix = pixman_image_create_bits(format, renderer->viewportWidth, renderer->viewportHeight, surface->pixels, surface->pitch); + + pixman_transform_t transform; + pixman_transform_init_identity(&transform); + pixman_transform_scale(0, &transform, pixman_int_to_fixed(renderer->ratio), pixman_int_to_fixed(renderer->ratio)); + pixman_image_set_transform(renderer->pix, &transform); + pixman_image_set_filter(renderer->pix, PIXMAN_FILTER_NEAREST, 0, 0); +#else + return false; +#endif } #endif @@ -72,6 +90,13 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render SDL_RenderPresent(renderer->sdlRenderer); SDL_LockTexture(renderer->tex, 0, (void**) &renderer->d.outputBuffer, &renderer->d.outputBufferStride); renderer->d.outputBufferStride /= BYTES_PER_PIXEL; +#else +#ifdef USE_PIXMAN + if (renderer->ratio > 1) { + pixman_image_composite32(PIXMAN_OP_SRC, renderer->pix, 0, renderer->screenpix, + 0, 0, 0, 0, 0, 0, + renderer->viewportWidth, renderer->viewportHeight); + } #else switch (renderer->ratio) { #if defined(__ARM_NEON) && COLOR_16_BIT @@ -87,6 +112,7 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render default: abort(); } +#endif SDL_UnlockSurface(surface); SDL_Flip(surface); SDL_LockSurface(surface); @@ -98,4 +124,12 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render void GBASDLDeinit(struct SDLSoftwareRenderer* renderer) { UNUSED(renderer); +#if !SDL_VERSION_ATLEAST(2, 0, 0) + SDL_Surface* surface = SDL_GetVideoSurface(); + SDL_UnlockSurface(surface); +#ifdef USE_PIXMAN + pixman_image_unref(renderer->pix); + pixman_image_unref(renderer->screenpix); +#endif +#endif } From ae3acd658bdfdde22fa322bf8a4bc8944069f58f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 01:39:36 -0700 Subject: [PATCH 077/101] SDL: Make sure scaling ratio is at least 1 --- src/platform/sdl/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c index bc40873b3..4f4dc581b 100644 --- a/src/platform/sdl/main.c +++ b/src/platform/sdl/main.c @@ -76,6 +76,9 @@ int main(int argc, char** argv) { renderer.events.windowUpdated = 0; #endif renderer.ratio = graphicsOpts.multiplier; + if (renderer.ratio == 0) { + renderer.ratio = 1; + } renderer.lockAspectRatio = opts.lockAspectRatio; renderer.filter = opts.resampleVideo; From 2dd391046a3d2ac3f4a80978c3356ecec2b19295 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 23:38:09 -0700 Subject: [PATCH 078/101] SDL: Fix exporting SDL compile flags --- src/platform/sdl/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index 63266688d..3c21dafd5 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -37,6 +37,9 @@ file(GLOB PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-*.c) set(PLATFORM_LIBRARY ${SDL_LIBRARY} ${SDLMAIN_LIBRARY} ${PIXMAN-1_LIBRARIES}) include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${SDL_INCLUDE_DIR}) +set(SDL_INCLUDE_DIR "${SDL_INCLUDE_DIR}" PARENT_SCOPE) +set(SDL_LIBRARY "${SDL_LIBRARY}" PARENT_SCOPE) + set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/main.c) if(BUILD_RASPI) From e21b4e3ee552bd2d2c8a3ebd95a5d9142fd478c6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 23:38:42 -0700 Subject: [PATCH 079/101] SDL: Move render context freeing to the right files --- src/platform/sdl/gl-sdl.c | 2 +- src/platform/sdl/main.c | 2 -- src/platform/sdl/sw-sdl.c | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platform/sdl/gl-sdl.c b/src/platform/sdl/gl-sdl.c index 489483026..f43156def 100644 --- a/src/platform/sdl/gl-sdl.c +++ b/src/platform/sdl/gl-sdl.c @@ -160,5 +160,5 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render } void GBASDLDeinit(struct SDLSoftwareRenderer* renderer) { - UNUSED(renderer); + free(renderer->d.outputBuffer); } diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c index 4f4dc581b..71911c29b 100644 --- a/src/platform/sdl/main.c +++ b/src/platform/sdl/main.c @@ -143,8 +143,6 @@ static bool _GBASDLInit(struct SDLSoftwareRenderer* renderer) { } static void _GBASDLDeinit(struct SDLSoftwareRenderer* renderer) { - free(renderer->d.outputBuffer); - GBASDLDeinitEvents(&renderer->events); GBASDLDeinitAudio(&renderer->audio); #if SDL_VERSION_ATLEAST(2, 0, 0) diff --git a/src/platform/sdl/sw-sdl.c b/src/platform/sdl/sw-sdl.c index e147c1651..f35252e0b 100644 --- a/src/platform/sdl/sw-sdl.c +++ b/src/platform/sdl/sw-sdl.c @@ -123,7 +123,9 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render } void GBASDLDeinit(struct SDLSoftwareRenderer* renderer) { - UNUSED(renderer); + if (renderer->ratio > 1) { + free(renderer->d.outputBuffer); + } #if !SDL_VERSION_ATLEAST(2, 0, 0) SDL_Surface* surface = SDL_GetVideoSurface(); SDL_UnlockSurface(surface); From e0ff8e43712d59fe53f7cfa53e8e9cd3c3e06072 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 23:40:18 -0700 Subject: [PATCH 080/101] SDL: Add Pandora-specific main file --- src/platform/sdl/CMakeLists.txt | 4 +- src/platform/sdl/main.h | 6 ++ src/platform/sdl/pandora-sdl.c | 109 ++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 src/platform/sdl/pandora-sdl.c diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index 3c21dafd5..3134ffc63 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -53,7 +53,9 @@ if(BUILD_RASPI) install(TARGETS ${BINARY_NAME}-rpi DESTINATION bin COMPONENT ${BINARY_NAME}-rpi) endif() -if(BUILD_BBB OR BUILD_RASPI OR NOT BUILD_GL) +if(BUILD_PANDORA) + list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/pandora-sdl.c) +elseif(BUILD_BBB OR BUILD_RASPI OR NOT BUILD_GL) list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sw-sdl.c) else() list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-sdl.c) diff --git a/src/platform/sdl/main.h b/src/platform/sdl/main.h index 45bea052b..f77fd9530 100644 --- a/src/platform/sdl/main.h +++ b/src/platform/sdl/main.h @@ -77,6 +77,12 @@ struct SDLSoftwareRenderer { GLuint texLocation; GLuint positionLocation; #endif + +#ifdef BUILD_PANDORA + int fb; + int odd; + void* base[2]; +#endif }; bool GBASDLInit(struct SDLSoftwareRenderer* renderer); diff --git a/src/platform/sdl/pandora-sdl.c b/src/platform/sdl/pandora-sdl.c new file mode 100644 index 000000000..2fc12dd4e --- /dev/null +++ b/src/platform/sdl/pandora-sdl.c @@ -0,0 +1,109 @@ +/* Copyright (c) 2013-2015 Jeffrey Pfau + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "main.h" + +#include "gba/supervisor/thread.h" + +#include +#include +#include +#include + +bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { + SDL_SetVideoMode(800, 480, 16, SDL_FULLSCREEN); + + renderer->odd = 0; + renderer->fb = open("/dev/fb1", O_RDWR); + if (renderer->fb < 0) { + return false; + } + + struct omapfb_plane_info plane; + struct omapfb_mem_info mem; + if (ioctl(renderer->fb, OMAPFB_QUERY_PLANE, &plane) < 0) { + return false; + } + if (ioctl(renderer->fb, OMAPFB_QUERY_MEM, &mem) < 0) { + return false; + } + + if (plane.enabled) { + plane.enabled = 0; + ioctl(renderer->fb, OMAPFB_SETUP_PLANE, &plane); + } + + mem.size = VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * 4; + ioctl(renderer->fb, OMAPFB_SETUP_MEM, &mem); + + plane.enabled = 1; + plane.pos_x = 40; + plane.pos_y = 0; + plane.out_width = 720; + plane.out_height = 480; + ioctl(renderer->fb, OMAPFB_SETUP_PLANE, &plane); + + struct fb_var_screeninfo info; + ioctl(renderer->fb, FBIOGET_VSCREENINFO, &info); + info.xres = VIDEO_HORIZONTAL_PIXELS; + info.yres = VIDEO_VERTICAL_PIXELS; + info.xres_virtual = VIDEO_HORIZONTAL_PIXELS; + info.yres_virtual = VIDEO_VERTICAL_PIXELS * 2; + info.bits_per_pixel = 16; + ioctl(renderer->fb, FBIOPUT_VSCREENINFO, &info); + + renderer->odd = 0; + renderer->base[0] = mmap(0, VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * 4, PROT_READ | PROT_WRITE, MAP_SHARED, renderer->fb, 0); + renderer->base[1] = (uint16_t*) renderer->base[0] + VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS; + + renderer->d.outputBuffer = renderer->base[0]; + renderer->d.outputBufferStride = VIDEO_HORIZONTAL_PIXELS; + return true; +} + +void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* renderer) { + SDL_Event event; + + while (context->state < THREAD_EXITING) { + while (SDL_PollEvent(&event)) { + GBASDLHandleEvent(context, &renderer->events, &event); + } + + if (GBASyncWaitFrameStart(&context->sync, context->frameskip)) { + int arg = 0; + ioctl(renderer->fb, FBIO_WAITFORVSYNC, &arg); + + struct fb_var_screeninfo info; + ioctl(renderer->fb, FBIOGET_VSCREENINFO, &info); + info.yoffset = VIDEO_VERTICAL_PIXELS * renderer->odd; + ioctl(renderer->fb, FBIOPAN_DISPLAY, &info); + + renderer->odd = !renderer->odd; + renderer->d.outputBuffer = renderer->base[renderer->odd]; + } + GBASyncWaitFrameEnd(&context->sync); + } +} + +void GBASDLDeinit(struct SDLSoftwareRenderer* renderer) { + munmap(renderer->base[0], VIDEO_HORIZONTAL_PIXELS * VIDEO_VERTICAL_PIXELS * 4); + + struct omapfb_plane_info plane; + struct omapfb_mem_info mem; + ioctl(renderer->fb, OMAPFB_QUERY_PLANE, &plane); + ioctl(renderer->fb, OMAPFB_QUERY_MEM, &mem); + + mem.size = 0; + ioctl(renderer->fb, OMAPFB_SETUP_MEM, &mem); + + plane.enabled = 0; + plane.pos_x = 0; + plane.pos_y = 0; + plane.out_width = 0; + plane.out_height = 0; + ioctl(renderer->fb, OMAPFB_SETUP_PLANE, &plane); + + close(renderer->fb); +} From 4fa1ad7ce0cb410a677bccdb5ea63c3edc353bf8 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 23:41:54 -0700 Subject: [PATCH 081/101] SDL: Fix typo --- src/platform/sdl/sdl-events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 030988d74..24f54560c 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -116,7 +116,7 @@ static void _pauseAfterFrame(struct GBAThread* context) { static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents* sdlContext, const struct SDL_KeyboardEvent* event) { enum GBAKey key = GBA_KEY_NONE; if (!event->keysym.mod) { -#if !defined(BUILD_PANORA) && SDL_VERSION_ATLEAST(2, 0, 0) +#if !defined(BUILD_PANDORA) && SDL_VERSION_ATLEAST(2, 0, 0) key = GBAInputMapKey(sdlContext->bindings, SDL_BINDING_KEY, event->keysym.scancode); #else key = GBAInputMapKey(sdlContext->bindings, SDL_BINDING_KEY, event->keysym.sym); From b8fe87324f8987db99ede4b3332a9ea781726e85 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 18 Mar 2015 23:46:13 -0700 Subject: [PATCH 082/101] SDL: Esc to quit, only on Pandora for now --- src/platform/sdl/sdl-events.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 24f54560c..e8d381b63 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -158,6 +158,11 @@ static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents GBARewind(context, 10); GBAThreadContinue(context); return; +#ifdef BUILD_PANDORA + case SDLK_ESCAPE: + GBAThreadEnd(context); + return; +#endif default: if ((event->keysym.mod & GUI_MOD) && (event->keysym.mod & GUI_MOD) == event->keysym.mod) { switch (event->keysym.sym) { From ae2b20e47648380a5e9e502fa4614785c1556659 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 19 Mar 2015 22:11:23 -0700 Subject: [PATCH 083/101] Qt: Make ConfigOption able to handle multiple consumers --- src/platform/qt/ConfigController.cpp | 18 ++++++++++-- src/platform/qt/ConfigController.h | 10 +++---- src/platform/qt/Window.cpp | 44 +++++++++++++++++++++------- 3 files changed, 53 insertions(+), 19 deletions(-) diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp index e46595673..2df9dded4 100644 --- a/src/platform/qt/ConfigController.cpp +++ b/src/platform/qt/ConfigController.cpp @@ -23,8 +23,11 @@ ConfigOption::ConfigOption(QObject* parent) { } -void ConfigOption::connect(std::function slot) { - m_slot = slot; +void ConfigOption::connect(std::function slot, QObject* parent) { + m_slots[parent] = slot; + QObject::connect(parent, &QAction::destroyed, [this, slot, parent]() { + m_slots.remove(parent); + }); } QAction* ConfigOption::addValue(const QString& text, const QVariant& value, QMenu* parent) { @@ -33,6 +36,9 @@ QAction* ConfigOption::addValue(const QString& text, const QVariant& value, QMen QObject::connect(action, &QAction::triggered, [this, value]() { emit valueChanged(value); }); + QObject::connect(parent, &QAction::destroyed, [this, action, value]() { + m_actions.removeAll(qMakePair(action, value)); + }); parent->addAction(action); m_actions.append(qMakePair(action, value)); return action; @@ -48,6 +54,9 @@ QAction* ConfigOption::addBoolean(const QString& text, QMenu* parent) { QObject::connect(action, &QAction::triggered, [this, action]() { emit valueChanged(action->isChecked()); }); + QObject::connect(parent, &QAction::destroyed, [this, action]() { + m_actions.removeAll(qMakePair(action, 1)); + }); parent->addAction(action); m_actions.append(qMakePair(action, 1)); return action; @@ -76,7 +85,10 @@ void ConfigOption::setValue(const QVariant& value) { action.first->setChecked(value == action.second); action.first->blockSignals(signalsEnabled); } - m_slot(value); + std::function slot; + foreach(slot, m_slots.values()) { + slot(value); + } } ConfigController::ConfigController(QObject* parent) diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h index 1a0997057..14c83471f 100644 --- a/src/platform/qt/ConfigController.h +++ b/src/platform/qt/ConfigController.h @@ -32,11 +32,11 @@ Q_OBJECT public: ConfigOption(QObject* parent = nullptr); - void connect(std::function); + void connect(std::function, QObject* parent = nullptr); - QAction* addValue(const QString& text, const QVariant& value, QMenu* parent = 0); - QAction* addValue(const QString& text, const char* value, QMenu* parent = 0); - QAction* addBoolean(const QString& text, QMenu* parent = 0); + QAction* addValue(const QString& text, const QVariant& value, QMenu* parent = nullptr); + QAction* addValue(const QString& text, const char* value, QMenu* parent = nullptr); + QAction* addBoolean(const QString& text, QMenu* parent = nullptr); public slots: void setValue(bool value); @@ -49,7 +49,7 @@ signals: void valueChanged(const QVariant& value); private: - std::function m_slot; + QMap> m_slots; QList> m_actions; }; diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 550c21f71..481a74ca3 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -601,12 +601,16 @@ void Window::setupMenu(QMenuBar* menubar) { ConfigOption* videoSync = m_config->addOption("videoSync"); videoSync->addBoolean(tr("Sync to &video"), emulationMenu); - videoSync->connect([this](const QVariant& value) { m_controller->setVideoSync(value.toBool()); }); + videoSync->connect([this](const QVariant& value) { + m_controller->setVideoSync(value.toBool()); + }, this); m_config->updateOption("videoSync"); ConfigOption* audioSync = m_config->addOption("audioSync"); audioSync->addBoolean(tr("Sync to &audio"), emulationMenu); - audioSync->connect([this](const QVariant& value) { m_controller->setAudioSync(value.toBool()); }); + audioSync->connect([this](const QVariant& value) { + m_controller->setAudioSync(value.toBool()); + }, this); m_config->updateOption("audioSync"); QMenu* avMenu = menubar->addMenu(tr("Audio/&Video")); @@ -625,17 +629,23 @@ void Window::setupMenu(QMenuBar* menubar) { ConfigOption* lockAspectRatio = m_config->addOption("lockAspectRatio"); lockAspectRatio->addBoolean(tr("Lock aspect ratio"), avMenu); - lockAspectRatio->connect([this](const QVariant& value) { m_display->lockAspectRatio(value.toBool()); }); + lockAspectRatio->connect([this](const QVariant& value) { + m_display->lockAspectRatio(value.toBool()); + }, this); m_config->updateOption("lockAspectRatio"); ConfigOption* resampleVideo = m_config->addOption("resampleVideo"); resampleVideo->addBoolean(tr("Resample video"), avMenu); - resampleVideo->connect([this](const QVariant& value) { m_display->filter(value.toBool()); }); + resampleVideo->connect([this](const QVariant& value) { + m_display->filter(value.toBool()); + }, this); m_config->updateOption("resampleVideo"); QMenu* skipMenu = avMenu->addMenu(tr("Frame&skip")); ConfigOption* skip = m_config->addOption("frameskip"); - skip->connect([this](const QVariant& value) { m_controller->setFrameskip(value.toInt()); }); + skip->connect([this](const QVariant& value) { + m_controller->setFrameskip(value.toInt()); + }, this); for (int i = 0; i <= 10; ++i) { skip->addValue(QString::number(i), i, skipMenu); } @@ -645,7 +655,9 @@ void Window::setupMenu(QMenuBar* menubar) { QMenu* buffersMenu = avMenu->addMenu(tr("Audio buffer &size")); ConfigOption* buffers = m_config->addOption("audioBuffers"); - buffers->connect([this](const QVariant& value) { emit audioBufferSamplesChanged(value.toInt()); }); + buffers->connect([this](const QVariant& value) { + emit audioBufferSamplesChanged(value.toInt()); + }, this); buffers->addValue(tr("512"), 512, buffersMenu); buffers->addValue(tr("768"), 768, buffersMenu); buffers->addValue(tr("1024"), 1024, buffersMenu); @@ -657,7 +669,9 @@ void Window::setupMenu(QMenuBar* menubar) { QMenu* target = avMenu->addMenu("FPS target"); ConfigOption* fpsTargetOption = m_config->addOption("fpsTarget"); - fpsTargetOption->connect([this](const QVariant& value) { emit fpsTargetChanged(value.toInt()); }); + fpsTargetOption->connect([this](const QVariant& value) { + emit fpsTargetChanged(value.toInt()); + }, this); fpsTargetOption->addValue(tr("15"), 15, target); fpsTargetOption->addValue(tr("30"), 30, target); fpsTargetOption->addValue(tr("45"), 45, target); @@ -749,16 +763,24 @@ void Window::setupMenu(QMenuBar* menubar) { #endif ConfigOption* skipBios = m_config->addOption("skipBios"); - skipBios->connect([this](const QVariant& value) { m_controller->setSkipBIOS(value.toBool()); }); + skipBios->connect([this](const QVariant& value) { + m_controller->setSkipBIOS(value.toBool()); + }, this); ConfigOption* rewindEnable = m_config->addOption("rewindEnable"); - rewindEnable->connect([this](const QVariant& value) { m_controller->setRewind(value.toBool(), m_config->getOption("rewindBufferCapacity").toInt(), m_config->getOption("rewindBufferInterval").toInt()); }); + rewindEnable->connect([this](const QVariant& value) { + m_controller->setRewind(value.toBool(), m_config->getOption("rewindBufferCapacity").toInt(), m_config->getOption("rewindBufferInterval").toInt()); + }, this); ConfigOption* rewindBufferCapacity = m_config->addOption("rewindBufferCapacity"); - rewindBufferCapacity->connect([this](const QVariant& value) { m_controller->setRewind(m_config->getOption("rewindEnable").toInt(), value.toInt(), m_config->getOption("rewindBufferInterval").toInt()); }); + rewindBufferCapacity->connect([this](const QVariant& value) { + m_controller->setRewind(m_config->getOption("rewindEnable").toInt(), value.toInt(), m_config->getOption("rewindBufferInterval").toInt()); + }, this); ConfigOption* rewindBufferInterval = m_config->addOption("rewindBufferInterval"); - rewindBufferInterval->connect([this](const QVariant& value) { m_controller->setRewind(m_config->getOption("rewindEnable").toInt(), m_config->getOption("rewindBufferCapacity").toInt(), value.toInt()); }); + rewindBufferInterval->connect([this](const QVariant& value) { + m_controller->setRewind(m_config->getOption("rewindEnable").toInt(), m_config->getOption("rewindBufferCapacity").toInt(), value.toInt()); + }, this); QMenu* other = new QMenu(tr("Other"), this); m_shortcutController->addMenu(other); From 073dbd6b8df389ea050b31e2398f1e2f82337602 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 00:23:19 -0700 Subject: [PATCH 084/101] GBA: Remove unused portions of EEPROM state machine --- src/gba/savedata.c | 3 --- src/gba/savedata.h | 2 -- 2 files changed, 5 deletions(-) diff --git a/src/gba/savedata.c b/src/gba/savedata.c index fb8e83868..00acf2648 100644 --- a/src/gba/savedata.c +++ b/src/gba/savedata.c @@ -323,10 +323,8 @@ void GBASavedataWriteEEPROM(struct GBASavedata* savedata, uint16_t value, uint32 savedata->command <<= 1; savedata->command |= value & 0x1; if (savedata->command == EEPROM_COMMAND_WRITE) { - savedata->addressBits = writeSize - 64 - 2; savedata->writeAddress = 0; } else { - savedata->addressBits = writeSize - 2; savedata->readAddress = 0; } break; @@ -338,7 +336,6 @@ void GBASavedataWriteEEPROM(struct GBASavedata* savedata, uint16_t value, uint32 savedata->writeAddress |= (value & 0x1) << 6; } else if (writeSize == 1) { savedata->command = EEPROM_COMMAND_NULL; - savedata->writePending = 1; } else { uint8_t current = savedata->data[savedata->writeAddress >> 3]; current &= ~(1 << (0x7 - (savedata->writeAddress & 0x7))); diff --git a/src/gba/savedata.h b/src/gba/savedata.h index cef539202..42aad655a 100644 --- a/src/gba/savedata.h +++ b/src/gba/savedata.h @@ -70,8 +70,6 @@ struct GBASavedata { int readBitsRemaining; int readAddress; int writeAddress; - int writePending; - int addressBits; uint8_t* currentBank; From d36c0ec7df619a26c9229a3c99c836ca6c9783f2 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 01:05:07 -0700 Subject: [PATCH 085/101] GBA: Fix RTC bincompat with 0.1 --- src/gba/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gba/hardware.h b/src/gba/hardware.h index 03c5fa849..4c56bbb60 100644 --- a/src/gba/hardware.h +++ b/src/gba/hardware.h @@ -54,7 +54,7 @@ enum GPIODirection { GPIO_READ_WRITE = 1 }; -DECL_BITFIELD(RTCControl, uint8_t); +DECL_BITFIELD(RTCControl, uint32_t); DECL_BIT(RTCControl, MinIRQ, 3); DECL_BIT(RTCControl, Hour24, 6); DECL_BIT(RTCControl, Poweroff, 7); @@ -67,7 +67,7 @@ enum RTCCommand { RTC_TIME = 6 }; -DECL_BITFIELD(RTCCommandData, uint8_t); +DECL_BITFIELD(RTCCommandData, uint32_t); DECL_BITS(RTCCommandData, Magic, 0, 4); DECL_BITS(RTCCommandData, Command, 4, 3); DECL_BIT(RTCCommandData, Reading, 7); From c1d02a1369df031fc877b1800ae5f9f08df5df7b Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 01:12:39 -0700 Subject: [PATCH 086/101] GBA: Savestates now take into account savedata state machines (fixes #109) --- CHANGES | 1 + src/gba/savedata.c | 32 ++++++++++++++++++++++++++++++++ src/gba/savedata.h | 22 +++++++++++++--------- src/gba/serialize.c | 2 ++ src/gba/serialize.h | 34 +++++++++++++++++++++++++++++++--- 5 files changed, 79 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 2fa2dae34..c6fd570bd 100644 --- a/CHANGES +++ b/CHANGES @@ -75,6 +75,7 @@ Misc: - All: Enable link-time optimization - GBA Thread: Make GBASyncWaitFrameStart time out - GBA: Move A/V stream interface into core + - GBA: Savestates now take into account savedata state machines (fixes #109) 0.1.1: (2015-01-24) Bugfixes: diff --git a/src/gba/savedata.c b/src/gba/savedata.c index 00acf2648..bc9a34851 100644 --- a/src/gba/savedata.c +++ b/src/gba/savedata.c @@ -6,6 +6,7 @@ #include "savedata.h" #include "gba/gba.h" +#include "gba/serialize.h" #include "util/memory.h" #include "util/vfs.h" @@ -375,6 +376,37 @@ uint16_t GBASavedataReadEEPROM(struct GBASavedata* savedata) { return 0; } +void GBASavedataSerialize(const struct GBASavedata* savedata, struct GBASerializedState* state, bool includeData) { + state->savedata.type = savedata->type; + state->savedata.command = savedata->command; + state->savedata.flashState = savedata->flashState; + state->savedata.flashBank = savedata->currentBank == &savedata->data[0x10000]; + state->savedata.readBitsRemaining = savedata->readBitsRemaining; + state->savedata.readAddress = savedata->readAddress; + state->savedata.writeAddress = savedata->writeAddress; + + UNUSED(includeData); // TODO +} + +void GBASavedataDeserialize(struct GBASavedata* savedata, const struct GBASerializedState* state, bool includeData) { + if (state->savedata.type == SAVEDATA_FORCE_NONE) { + return; + } + if (savedata->type != state->savedata.type) { + GBASavedataForceType(savedata, state->savedata.type); + } + savedata->command = state->savedata.command; + savedata->flashState = state->savedata.flashState; + savedata->readBitsRemaining = state->savedata.readBitsRemaining; + savedata->readAddress = state->savedata.readAddress; + savedata->writeAddress = state->savedata.writeAddress; + if (savedata->type == SAVEDATA_FLASH1M) { + _flashSwitchBank(savedata, state->savedata.flashBank); + } + + UNUSED(includeData); // TODO +} + void _flashSwitchBank(struct GBASavedata* savedata, int bank) { GBALog(0, GBA_LOG_DEBUG, "Performing flash bank switch to bank %i", bank); savedata->currentBank = &savedata->data[bank << 16]; diff --git a/src/gba/savedata.h b/src/gba/savedata.h index 42aad655a..d1614283a 100644 --- a/src/gba/savedata.h +++ b/src/gba/savedata.h @@ -13,10 +13,10 @@ struct VFile; enum SavedataType { SAVEDATA_AUTODETECT = -1, SAVEDATA_FORCE_NONE = 0, - SAVEDATA_SRAM, - SAVEDATA_FLASH512, - SAVEDATA_FLASH1M, - SAVEDATA_EEPROM + SAVEDATA_SRAM = 1, + SAVEDATA_FLASH512 = 2, + SAVEDATA_FLASH1M = 3, + SAVEDATA_EEPROM = 4 }; enum SavedataCommand { @@ -42,8 +42,8 @@ enum SavedataCommand { enum FlashStateMachine { FLASH_STATE_RAW = 0, - FLASH_STATE_START, - FLASH_STATE_CONTINUE + FLASH_STATE_START = 1, + FLASH_STATE_CONTINUE = 2, }; enum FlashManufacturer { @@ -67,9 +67,9 @@ struct GBASavedata { int mapMode; struct VFile* realVf; - int readBitsRemaining; - int readAddress; - int writeAddress; + int32_t readBitsRemaining; + uint32_t readAddress; + uint32_t writeAddress; uint8_t* currentBank; @@ -94,4 +94,8 @@ void GBASavedataWriteFlash(struct GBASavedata* savedata, uint16_t address, uint8 uint16_t GBASavedataReadEEPROM(struct GBASavedata* savedata); void GBASavedataWriteEEPROM(struct GBASavedata* savedata, uint16_t value, uint32_t writeSize); +struct GBASerializedState; +void GBASavedataSerialize(const struct GBASavedata* savedata, struct GBASerializedState* state, bool includeData); +void GBASavedataDeserialize(struct GBASavedata* savedata, const struct GBASerializedState* state, bool includeData); + #endif diff --git a/src/gba/serialize.c b/src/gba/serialize.c index 5b0d8e868..2395ee635 100644 --- a/src/gba/serialize.c +++ b/src/gba/serialize.c @@ -48,6 +48,7 @@ void GBASerialize(struct GBA* gba, struct GBASerializedState* state) { GBAIOSerialize(gba, state); GBAVideoSerialize(&gba->video, state); GBAAudioSerialize(&gba->audio, state); + GBASavedataSerialize(&gba->memory.savedata, state, false); state->associatedStreamId = 0; if (gba->rr) { @@ -111,6 +112,7 @@ void GBADeserialize(struct GBA* gba, const struct GBASerializedState* state) { GBAIODeserialize(gba, state); GBAVideoDeserialize(&gba->video, state); GBAAudioDeserialize(&gba->audio, state); + GBASavedataDeserialize(&gba->memory.savedata, state, false); if (gba->rr) { gba->rr->stateLoaded(gba->rr, state); diff --git a/src/gba/serialize.h b/src/gba/serialize.h index 50c0f717c..5a2d9a34b 100644 --- a/src/gba/serialize.h +++ b/src/gba/serialize.h @@ -129,7 +129,7 @@ extern const uint32_t GBA_SAVESTATE_MAGIC; * 0x00290 - 0x002C3: GPIO state * | 0x00290 - 0x00291: Pin state * | 0x00292 - 0x00293: Direction state - * | 0x00294 - 0x002B6: RTC state (see gba-hardware.h for format) + * | 0x00294 - 0x002B6: RTC state (see hardware.h for format) * | 0x002B7 - 0x002B7: GPIO devices * | bit 0: Has RTC values * | bit 1: Has rumble value (reserved) @@ -150,7 +150,20 @@ extern const uint32_t GBA_SAVESTATE_MAGIC; * | 0x002C1 - 0x002C3: Flags * | bits 0 - 1: Tilt state machine * | bits 2 - 31: Reserved - * 0x002C4 - 0x002F3: Reserved (leave zero) + * 0x002C4 - 0x002DF: Reserved (leave zero) + * 0x002E0 - 0x002EF: Savedata state + * | 0x002E0 - 0x002E0: Savedata type + * | 0x002E1 - 0x002E1: Savedata command (see savedata.h) + * | 0x002E2 - 0x002E2: Flags + * | bits 0 - 1: Flash state machine + * | bits 2 - 3: Reserved + * | bit 4: Flash bank + * | bits 5 - 7: Reserved + * | 0x002E3 - 0x002E3: Reserved + * | 0x002E4 - 0x002E7: EEPROM read bits remaining + * | 0x002E8 - 0x002EB: EEPROM read address + * | 0x002EC - 0x002EBF EEPROM write address + * 0x002F0 - 0x002F3: Reserved (leave zero) * 0x002F4 - 0x002FF: Prefetch * | 0x002F4 - 0x002F7: GBA BIOS bus prefetch * | 0x002F8 - 0x002FB: CPU prefecth (decode slot) @@ -271,7 +284,22 @@ struct GBASerializedState { unsigned : 22; } hw; - uint32_t reservedHardware[12]; + uint32_t reservedHardware[7]; + + struct { + unsigned type : 8; + unsigned command : 8; + unsigned flashState : 2; + unsigned : 2; + unsigned flashBank : 1; + unsigned : 3; + unsigned : 8; + int32_t readBitsRemaining; + uint32_t readAddress; + uint32_t writeAddress; + } savedata; + + uint32_t reservedPadding; uint32_t biosPrefetch; uint32_t cpuPrefetch[2]; From d4ef56cd16bf35a47dfcd26d52fbd0b1909c163c Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 16:27:00 -0700 Subject: [PATCH 087/101] SDL: Gamepads can now be preferentially loaded --- src/platform/qt/ConfigController.h | 5 +- src/platform/qt/InputController.cpp | 38 ++++++--- src/platform/qt/InputController.h | 5 +- src/platform/sdl/egl-sdl.c | 2 +- src/platform/sdl/gl-sdl.c | 10 +-- src/platform/sdl/main.c | 10 ++- src/platform/sdl/main.h | 1 + src/platform/sdl/pandora-sdl.c | 2 +- src/platform/sdl/sdl-events.c | 125 +++++++++++++++++++++++----- src/platform/sdl/sdl-events.h | 25 ++++-- src/platform/sdl/sw-sdl.c | 6 +- 11 files changed, 173 insertions(+), 56 deletions(-) diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h index 14c83471f..eb26fa896 100644 --- a/src/platform/qt/ConfigController.h +++ b/src/platform/qt/ConfigController.h @@ -79,6 +79,8 @@ public: Configuration* overrides() { return GBAConfigGetOverrides(&m_config); } void saveOverride(const GBACartridgeOverride&); + Configuration* input() { return GBAConfigGetInput(&m_config); } + public slots: void setOption(const char* key, bool value); void setOption(const char* key, int value); @@ -90,11 +92,8 @@ public slots: void write(); private: - Configuration* configuration() { return &m_config.configTable; } Configuration* defaults() { return &m_config.defaultsTable; } - friend class InputController; // TODO: Do this without friends - GBAConfig m_config; GBAOptions m_opts; diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 592761c08..7228f5952 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -19,6 +19,9 @@ extern "C" { using namespace QGBA; +int InputController::s_sdlInited = 0; +GBASDLEvents InputController::s_sdlEvents; + InputController::InputController(int playerId, QObject* parent) : QObject(parent) , m_playerId(playerId) @@ -28,8 +31,11 @@ InputController::InputController(int playerId, QObject* parent) GBAInputMapInit(&m_inputMap); #ifdef BUILD_SDL - m_sdlEvents.bindings = &m_inputMap; - GBASDLInitEvents(&m_sdlEvents, playerId); + if (s_sdlInited == 0) { + GBASDLInitEvents(&s_sdlEvents); + } + ++s_sdlInited; + m_sdlPlayer.bindings = &m_inputMap; GBASDLInitBindings(&m_inputMap); m_gamepadTimer = new QTimer(this); @@ -54,7 +60,10 @@ InputController::~InputController() { GBAInputMapDeinit(&m_inputMap); #ifdef BUILD_SDL - GBASDLDeinitEvents(&m_sdlEvents); + --s_sdlInited; + if (s_sdlInited == 0) { + GBASDLDeinitEvents(&s_sdlEvents); + } #endif } @@ -62,26 +71,31 @@ void InputController::setConfiguration(ConfigController* config) { m_config = config; loadConfiguration(KEYBOARD); #ifdef BUILD_SDL + GBASDLEventsLoadConfig(&s_sdlEvents, config->input()); + if (!m_playerAttached) { + GBASDLAttachPlayer(&s_sdlEvents, &m_sdlPlayer); + m_playerAttached = true; + } loadConfiguration(SDL_BINDING_BUTTON); loadProfile(SDL_BINDING_BUTTON, profileForType(SDL_BINDING_BUTTON)); #endif } void InputController::loadConfiguration(uint32_t type) { - GBAInputMapLoad(&m_inputMap, type, m_config->configuration()); + GBAInputMapLoad(&m_inputMap, type, m_config->input()); } void InputController::loadProfile(uint32_t type, const char* profile) { - GBAInputProfileLoad(&m_inputMap, type, m_config->configuration(), profile); + GBAInputProfileLoad(&m_inputMap, type, m_config->input(), profile); } void InputController::saveConfiguration(uint32_t type) { - GBAInputMapSave(&m_inputMap, type, m_config->configuration()); + GBAInputMapSave(&m_inputMap, type, m_config->input()); m_config->write(); } void InputController::saveProfile(uint32_t type, const char* profile) { - GBAInputProfileSave(&m_inputMap, type, m_config->configuration(), profile); + GBAInputProfileSave(&m_inputMap, type, m_config->input(), profile); m_config->write(); } @@ -90,9 +104,9 @@ const char* InputController::profileForType(uint32_t type) { #ifdef BUILD_SDL if (type == SDL_BINDING_BUTTON) { #if SDL_VERSION_ATLEAST(2, 0, 0) - return SDL_JoystickName(m_sdlEvents.joystick); + return SDL_JoystickName(m_sdlPlayer.joystick); #else - return SDL_JoystickName(SDL_JoystickIndex(m_sdlEvents.joystick)); + return SDL_JoystickName(SDL_JoystickIndex(m_sdlPlayer.joystick)); #endif } #endif @@ -109,7 +123,7 @@ void InputController::bindKey(uint32_t type, int key, GBAKey gbaKey) { #ifdef BUILD_SDL int InputController::testSDLEvents() { - SDL_Joystick* joystick = m_sdlEvents.joystick; + SDL_Joystick* joystick = m_sdlPlayer.joystick; SDL_JoystickUpdate(); int numButtons = SDL_JoystickNumButtons(joystick); int activeButtons = 0; @@ -156,7 +170,7 @@ int InputController::testSDLEvents() { } QSet InputController::activeGamepadButtons() { - SDL_Joystick* joystick = m_sdlEvents.joystick; + SDL_Joystick* joystick = m_sdlPlayer.joystick; SDL_JoystickUpdate(); int numButtons = SDL_JoystickNumButtons(joystick); QSet activeButtons; @@ -170,7 +184,7 @@ QSet InputController::activeGamepadButtons() { } QSet> InputController::activeGamepadAxes() { - SDL_Joystick* joystick = m_sdlEvents.joystick; + SDL_Joystick* joystick = m_sdlPlayer.joystick; SDL_JoystickUpdate(); int numButtons = SDL_JoystickNumAxes(joystick); QSet> activeAxes; diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h index 1ed729064..be86d305b 100644 --- a/src/platform/qt/InputController.h +++ b/src/platform/qt/InputController.h @@ -70,7 +70,10 @@ private: int m_playerId; #ifdef BUILD_SDL - GBASDLEvents m_sdlEvents; + static int s_sdlInited; + static GBASDLEvents s_sdlEvents; + GBASDLPlayer m_sdlPlayer; + bool m_playerAttached; #endif QSet m_activeButtons; diff --git a/src/platform/sdl/egl-sdl.c b/src/platform/sdl/egl-sdl.c index a872c9541..e14b753a2 100644 --- a/src/platform/sdl/egl-sdl.c +++ b/src/platform/sdl/egl-sdl.c @@ -136,7 +136,7 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render while (context->state < THREAD_EXITING) { while (SDL_PollEvent(&event)) { - GBASDLHandleEvent(context, &renderer->events, &event); + GBASDLHandleEvent(context, &renderer->player, &event); } if (GBASyncWaitFrameStart(&context->sync, context->frameskip)) { diff --git a/src/platform/sdl/gl-sdl.c b/src/platform/sdl/gl-sdl.c index f43156def..fd73a43c3 100644 --- a/src/platform/sdl/gl-sdl.c +++ b/src/platform/sdl/gl-sdl.c @@ -65,11 +65,11 @@ bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { #endif #if SDL_VERSION_ATLEAST(2, 0, 0) - renderer->window = SDL_CreateWindow(PROJECT_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | (SDL_WINDOW_FULLSCREEN_DESKTOP * renderer->events.fullscreen)); + renderer->window = SDL_CreateWindow(PROJECT_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | (SDL_WINDOW_FULLSCREEN_DESKTOP * renderer->player.fullscreen)); SDL_GL_CreateContext(renderer->window); SDL_GL_SetSwapInterval(1); SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight); - renderer->events.window = renderer->window; + renderer->player.window = renderer->window; #else SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); #ifdef COLOR_16_BIT @@ -123,13 +123,13 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render glOrtho(0, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, 0, 0, 1); while (context->state < THREAD_EXITING) { while (SDL_PollEvent(&event)) { - GBASDLHandleEvent(context, &renderer->events, &event); + GBASDLHandleEvent(context, &renderer->player, &event); #if SDL_VERSION_ATLEAST(2, 0, 0) // Event handling can change the size of the screen - if (renderer->events.windowUpdated) { + if (renderer->player.windowUpdated) { SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight); _doViewport(renderer->viewportWidth, renderer->viewportHeight, renderer); - renderer->events.windowUpdated = 0; + renderer->player.windowUpdated = 0; } #endif } diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c index eb7a758c6..c52d8d342 100644 --- a/src/platform/sdl/main.c +++ b/src/platform/sdl/main.c @@ -72,8 +72,8 @@ int main(int argc, char** argv) { renderer.viewportWidth = opts.width; renderer.viewportHeight = opts.height; #if SDL_VERSION_ATLEAST(2, 0, 0) - renderer.events.fullscreen = opts.fullscreen; - renderer.events.windowUpdated = 0; + renderer.player.fullscreen = opts.fullscreen; + renderer.player.windowUpdated = 0; #endif renderer.ratio = graphicsOpts.multiplier; if (renderer.ratio == 0) { @@ -103,10 +103,12 @@ int main(int argc, char** argv) { renderer.audio.samples = context.audioBuffers; GBASDLInitAudio(&renderer.audio, &context); - renderer.events.bindings = &inputMap; + renderer.player.bindings = &inputMap; GBASDLInitBindings(&inputMap); - GBASDLInitEvents(&renderer.events, 0); + GBASDLInitEvents(&renderer.events); GBASDLEventsLoadConfig(&renderer.events, GBAConfigGetInput(&config)); + GBASDLAttachPlayer(&renderer.events, &renderer.player); + GBASDLPlayerLoadConfig(&renderer.player, GBAConfigGetInput(&config)); context.overrides = GBAConfigGetOverrides(&config); int didFail = 0; diff --git a/src/platform/sdl/main.h b/src/platform/sdl/main.h index f77fd9530..07587c281 100644 --- a/src/platform/sdl/main.h +++ b/src/platform/sdl/main.h @@ -39,6 +39,7 @@ struct SDLSoftwareRenderer { struct GBAVideoSoftwareRenderer d; struct GBASDLAudio audio; struct GBASDLEvents events; + struct GBASDLPlayer player; #if SDL_VERSION_ATLEAST(2, 0, 0) SDL_Window* window; diff --git a/src/platform/sdl/pandora-sdl.c b/src/platform/sdl/pandora-sdl.c index 2fc12dd4e..0c95838e5 100644 --- a/src/platform/sdl/pandora-sdl.c +++ b/src/platform/sdl/pandora-sdl.c @@ -68,7 +68,7 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render while (context->state < THREAD_EXITING) { while (SDL_PollEvent(&event)) { - GBASDLHandleEvent(context, &renderer->events, &event); + GBASDLHandleEvent(context, &renderer->player, &event); } if (GBASyncWaitFrameStart(&context->sync, context->frameskip)) { diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index fb9a83e92..21408a1c5 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -11,6 +11,7 @@ #include "gba/serialize.h" #include "gba/video.h" #include "gba/renderers/video-software.h" +#include "util/configuration.h" #include "util/vfs.h" #if SDL_VERSION_ATLEAST(2, 0, 0) && defined(__APPLE__) @@ -19,21 +20,57 @@ #define GUI_MOD KMOD_CTRL #endif -static int _openContexts = 0; - -bool GBASDLInitEvents(struct GBASDLEvents* context, int playerId) { - if (!_openContexts && SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) { +bool GBASDLInitEvents(struct GBASDLEvents* context) { + if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) { return false; } - ++_openContexts; + SDL_JoystickEventState(SDL_ENABLE); - context->joystick = SDL_JoystickOpen(playerId); + int nJoysticks = SDL_NumJoysticks(); + if (nJoysticks > 0) { + context->nJoysticks = nJoysticks; + context->joysticks = calloc(context->nJoysticks, sizeof(SDL_Joystick*)); + size_t i; + for (i = 0; i < context->nJoysticks; ++i) { + context->joysticks[i] = SDL_JoystickOpen(i); + } + } else { + context->nJoysticks = 0; + context->joysticks = 0; + } + + context->playersAttached = 0; + + size_t i; + for (i = 0; i < MAX_PLAYERS; ++i) { + context->preferredJoysticks[i] = 0; + context->joysticksClaimed[i] = SIZE_MAX; + } + #if !SDL_VERSION_ATLEAST(2, 0, 0) SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); #endif return true; } +void GBASDLDeinitEvents(struct GBASDLEvents* context) { + size_t i; + for (i = 0; i < context->nJoysticks; ++i) { + SDL_JoystickClose(context->joysticks[i]); + } + + SDL_QuitSubSystem(SDL_INIT_JOYSTICK); +} + +void GBASDLEventsLoadConfig(struct GBASDLEvents* context, const struct Configuration* config) { + char sectionName[16]; + snprintf(sectionName, sizeof(sectionName), "input.%c%c%c%c", SDL_BINDING_BUTTON >> 24, SDL_BINDING_BUTTON >> 16, SDL_BINDING_BUTTON >> 8, SDL_BINDING_BUTTON); + context->preferredJoysticks[0] = ConfigurationGetValue(config, sectionName, "device0"); + context->preferredJoysticks[1] = ConfigurationGetValue(config, sectionName, "device1"); + context->preferredJoysticks[2] = ConfigurationGetValue(config, sectionName, "device2"); + context->preferredJoysticks[3] = ConfigurationGetValue(config, sectionName, "device3"); +} + void GBASDLInitBindings(struct GBAInputMap* inputMap) { #ifdef BUILD_PANDORA GBAInputBindKey(inputMap, SDL_BINDING_KEY, SDLK_PAGEDOWN, GBA_KEY_A); @@ -87,7 +124,62 @@ void GBASDLInitBindings(struct GBAInputMap* inputMap) { GBAInputBindAxis(inputMap, SDL_BINDING_BUTTON, 1, &description); } -void GBASDLEventsLoadConfig(struct GBASDLEvents* context, const struct Configuration* config) { +bool GBASDLAttachPlayer(struct GBASDLEvents* events, struct GBASDLPlayer* player) { + player->joystick = 0; + player->joystickIndex = SIZE_MAX; + + if (events->playersAttached >= MAX_PLAYERS) { + return false; + } + + int playerId = events->playersAttached; + size_t firstUnclaimed = SIZE_MAX; + + size_t i; + for (i = 0; i < events->nJoysticks; ++i) { + bool claimed = false; + + int p; + for (p = 0; p < events->playersAttached; ++p) { + if (events->joysticksClaimed[p] == i) { + claimed = true; + break; + } + } + if (claimed) { + continue; + } + + if (firstUnclaimed == SIZE_MAX) { + firstUnclaimed = i; + } + + const char* joystickName; +#if SDL_VERSION_ATLEAST(2, 0, 0) + joystickName = SDL_JoystickName(events->joysticks[i]); +#else + joystickName = SDL_JoystickName(SDL_JoystickIndex(events->joysticks[i])); +#endif + if (events->preferredJoysticks[playerId] && strcmp(events->preferredJoysticks[playerId], joystickName) == 0) { + player->joystickIndex = i; + break; + } + } + + if (player->joystickIndex == SIZE_MAX && firstUnclaimed != SIZE_MAX) { + player->joystickIndex = firstUnclaimed; + } + + if (player->joystickIndex != SIZE_MAX) { + player->joystick = events->joysticks[player->joystickIndex]; + events->joysticksClaimed[playerId] = player->joystickIndex; + } + + ++events->playersAttached; + return true; +} + +void GBASDLPlayerLoadConfig(struct GBASDLPlayer* context, const struct Configuration* config) { GBAInputMapLoad(context->bindings, SDL_BINDING_KEY, config); if (context->joystick) { GBAInputMapLoad(context->bindings, SDL_BINDING_BUTTON, config); @@ -99,21 +191,12 @@ void GBASDLEventsLoadConfig(struct GBASDLEvents* context, const struct Configura } } -void GBASDLDeinitEvents(struct GBASDLEvents* context) { - SDL_JoystickClose(context->joystick); - - --_openContexts; - if (!_openContexts) { - SDL_QuitSubSystem(SDL_INIT_JOYSTICK); - } -} - static void _pauseAfterFrame(struct GBAThread* context) { context->frameCallback = 0; GBAThreadPauseFromThread(context); } -static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents* sdlContext, const struct SDL_KeyboardEvent* event) { +static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const struct SDL_KeyboardEvent* event) { enum GBAKey key = GBA_KEY_NONE; if (!event->keysym.mod) { #if !defined(BUILD_PANDORA) && SDL_VERSION_ATLEAST(2, 0, 0) @@ -230,7 +313,7 @@ static void _GBASDLHandleKeypress(struct GBAThread* context, struct GBASDLEvents } } -static void _GBASDLHandleJoyButton(struct GBAThread* context, struct GBASDLEvents* sdlContext, const struct SDL_JoyButtonEvent* event) { +static void _GBASDLHandleJoyButton(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const struct SDL_JoyButtonEvent* event) { enum GBAKey key = 0; key = GBAInputMapKey(sdlContext->bindings, SDL_BINDING_BUTTON, event->button); if (key == GBA_KEY_NONE) { @@ -264,7 +347,7 @@ static void _GBASDLHandleJoyHat(struct GBAThread* context, const struct SDL_JoyH context->activeKeys |= key; } -static void _GBASDLHandleJoyAxis(struct GBAThread* context, struct GBASDLEvents* sdlContext, const struct SDL_JoyAxisEvent* event) { +static void _GBASDLHandleJoyAxis(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const struct SDL_JoyAxisEvent* event) { int keys = context->activeKeys; keys = GBAInputClearAxis(sdlContext->bindings, SDL_BINDING_BUTTON, event->axis, keys); @@ -277,7 +360,7 @@ static void _GBASDLHandleJoyAxis(struct GBAThread* context, struct GBASDLEvents* } #if SDL_VERSION_ATLEAST(2, 0, 0) -static void _GBASDLHandleWindowEvent(struct GBAThread* context, struct GBASDLEvents* sdlContext, const struct SDL_WindowEvent* event) { +static void _GBASDLHandleWindowEvent(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const struct SDL_WindowEvent* event) { UNUSED(context); switch (event->event) { case SDL_WINDOWEVENT_SIZE_CHANGED: @@ -287,7 +370,7 @@ static void _GBASDLHandleWindowEvent(struct GBAThread* context, struct GBASDLEve } #endif -void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLEvents* sdlContext, const union SDL_Event* event) { +void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const union SDL_Event* event) { switch (event->type) { case SDL_QUIT: GBAThreadEnd(context); diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h index 1e8e3a2a2..b72964399 100644 --- a/src/platform/sdl/sdl-events.h +++ b/src/platform/sdl/sdl-events.h @@ -12,15 +12,26 @@ #include -#define SDL_BINDING_KEY 0x53444C4B -#define SDL_BINDING_BUTTON 0x53444C42 +#define SDL_BINDING_KEY 0x53444C4BU +#define SDL_BINDING_BUTTON 0x53444C42U + +#define MAX_PLAYERS 4 struct GBAVideoSoftwareRenderer; struct Configuration; struct GBASDLEvents { + SDL_Joystick** joysticks; + size_t nJoysticks; + const char* preferredJoysticks[MAX_PLAYERS]; + int playersAttached; + size_t joysticksClaimed[MAX_PLAYERS]; +}; + +struct GBASDLPlayer { struct GBAInputMap* bindings; SDL_Joystick* joystick; + size_t joystickIndex; #if SDL_VERSION_ATLEAST(2, 0, 0) SDL_Window* window; int fullscreen; @@ -28,12 +39,16 @@ struct GBASDLEvents { #endif }; -bool GBASDLInitEvents(struct GBASDLEvents*, int playerId); +bool GBASDLInitEvents(struct GBASDLEvents*); void GBASDLDeinitEvents(struct GBASDLEvents*); -void GBASDLInitBindings(struct GBAInputMap* inputMap); +bool GBASDLAttachPlayer(struct GBASDLEvents*, struct GBASDLPlayer*); void GBASDLEventsLoadConfig(struct GBASDLEvents*, const struct Configuration*); +void GBASDLPlayerChangeJoystick(struct GBASDLEvents*, struct GBASDLPlayer*, size_t index); -void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLEvents* sdlContext, const union SDL_Event* event); +void GBASDLInitBindings(struct GBAInputMap* inputMap); +void GBASDLPlayerLoadConfig(struct GBASDLPlayer*, const struct Configuration*); + +void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLPlayer* sdlContext, const union SDL_Event* event); #endif diff --git a/src/platform/sdl/sw-sdl.c b/src/platform/sdl/sw-sdl.c index f35252e0b..971710554 100644 --- a/src/platform/sdl/sw-sdl.c +++ b/src/platform/sdl/sw-sdl.c @@ -18,9 +18,9 @@ bool GBASDLInit(struct SDLSoftwareRenderer* renderer) { #endif #if SDL_VERSION_ATLEAST(2, 0, 0) - renderer->window = SDL_CreateWindow(PROJECT_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_OPENGL | (SDL_WINDOW_FULLSCREEN_DESKTOP * renderer->events.fullscreen)); + renderer->window = SDL_CreateWindow(PROJECT_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_OPENGL | (SDL_WINDOW_FULLSCREEN_DESKTOP * renderer->player.fullscreen)); SDL_GetWindowSize(renderer->window, &renderer->viewportWidth, &renderer->viewportHeight); - renderer->events.window = renderer->window; + renderer->player.window = renderer->window; renderer->sdlRenderer = SDL_CreateRenderer(renderer->window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); #ifdef COLOR_16_BIT #ifdef COLOR_5_6_5 @@ -80,7 +80,7 @@ void GBASDLRunloop(struct GBAThread* context, struct SDLSoftwareRenderer* render while (context->state < THREAD_EXITING) { while (SDL_PollEvent(&event)) { - GBASDLHandleEvent(context, &renderer->events, &event); + GBASDLHandleEvent(context, &renderer->player, &event); } if (GBASyncWaitFrameStart(&context->sync, context->frameskip)) { From afae3c8b807577123c93f32f1145422fc55500af Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 17:09:15 -0700 Subject: [PATCH 088/101] Qt: Allow configuring arbitrary attached gamepads (fixes #204) --- src/gba/input.c | 18 +++++++++ src/gba/input.h | 3 ++ src/platform/qt/GBAKeyEditor.cpp | 57 +++++++++++++++++++++++------ src/platform/qt/GBAKeyEditor.h | 7 +++- src/platform/qt/InputController.cpp | 40 ++++++++++++++++++-- src/platform/qt/InputController.h | 9 ++++- src/platform/sdl/sdl-events.c | 25 ++++++++----- src/platform/sdl/sdl-events.h | 1 + 8 files changed, 131 insertions(+), 29 deletions(-) diff --git a/src/gba/input.c b/src/gba/input.c index 75451d16b..fbaf8c3e0 100644 --- a/src/gba/input.c +++ b/src/gba/input.c @@ -482,3 +482,21 @@ void GBAInputProfileSave(const struct GBAInputMap* map, uint32_t type, struct Co sectionName[SECTION_NAME_MAX - 1] = '\0'; _saveAll(map, type, sectionName, config); } + +const char* GBAInputGetPreferredDevice(const struct Configuration* config, uint32_t type, int playerId) { + char sectionName[SECTION_NAME_MAX]; + _makeSectionName(sectionName, SECTION_NAME_MAX, type); + + char deviceId[KEY_NAME_MAX]; + snprintf(deviceId, sizeof(deviceId), "device%i", playerId); + return ConfigurationGetValue(config, sectionName, deviceId); +} + +void GBAInputSetPreferredDevice(struct Configuration* config, uint32_t type, int playerId, const char* deviceName) { + char sectionName[SECTION_NAME_MAX]; + _makeSectionName(sectionName, SECTION_NAME_MAX, type); + + char deviceId[KEY_NAME_MAX]; + snprintf(deviceId, sizeof(deviceId), "device%i", playerId); + return ConfigurationSetValue(config, sectionName, deviceId, deviceName); +} diff --git a/src/gba/input.h b/src/gba/input.h index 0cd2bb1bc..c14c0652a 100644 --- a/src/gba/input.h +++ b/src/gba/input.h @@ -48,4 +48,7 @@ void GBAInputMapSave(const struct GBAInputMap*, uint32_t type, struct Configurat void GBAInputProfileLoad(struct GBAInputMap*, uint32_t type, const struct Configuration*, const char* profile); void GBAInputProfileSave(const struct GBAInputMap*, uint32_t type, struct Configuration*, const char* profile); +const char* GBAInputGetPreferredDevice(const struct Configuration*, uint32_t type, int playerId); +void GBAInputSetPreferredDevice(struct Configuration*, uint32_t type, int playerId, const char* deviceName); + #endif diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp index beb499f44..3a0c31257 100644 --- a/src/platform/qt/GBAKeyEditor.cpp +++ b/src/platform/qt/GBAKeyEditor.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GBAKeyEditor.h" +#include #include #include #include @@ -20,8 +21,9 @@ const qreal GBAKeyEditor::DPAD_CENTER_Y = 0.431; const qreal GBAKeyEditor::DPAD_WIDTH = 0.1; const qreal GBAKeyEditor::DPAD_HEIGHT = 0.1; -GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const char* profile, QWidget* parent) +GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const QString& profile, QWidget* parent) : QWidget(parent) + , m_profileSelect(nullptr) , m_type(type) , m_profile(profile) , m_controller(controller) @@ -42,19 +44,26 @@ GBAKeyEditor::GBAKeyEditor(InputController* controller, int type, const char* pr m_keyL = new KeyEditor(this); m_keyR = new KeyEditor(this); - lookupBinding(map, m_keyDU, GBA_KEY_UP); - lookupBinding(map, m_keyDD, GBA_KEY_DOWN); - lookupBinding(map, m_keyDL, GBA_KEY_LEFT); - lookupBinding(map, m_keyDR, GBA_KEY_RIGHT); - lookupBinding(map, m_keySelect, GBA_KEY_SELECT); - lookupBinding(map, m_keyStart, GBA_KEY_START); - lookupBinding(map, m_keyA, GBA_KEY_A); - lookupBinding(map, m_keyB, GBA_KEY_B); - lookupBinding(map, m_keyL, GBA_KEY_L); - lookupBinding(map, m_keyR, GBA_KEY_R); + refresh(); #ifdef BUILD_SDL lookupAxes(map); + + if (type == SDL_BINDING_BUTTON) { + m_profileSelect = new QComboBox(this); + m_profileSelect->addItems(controller->connectedGamepads(type)); + int activeGamepad = controller->gamepad(type); + if (activeGamepad > 0) { + m_profileSelect->setCurrentIndex(activeGamepad); + } + + connect(m_profileSelect, static_cast(&QComboBox::currentIndexChanged), [this] (int i) { + m_controller->setGamepad(m_type, i); + m_profile = m_profileSelect->currentText(); + m_controller->loadProfile(m_type, m_profile); + refresh(); + }); + } #endif connect(m_keyDU, SIGNAL(valueChanged(int)), this, SLOT(setNext())); @@ -129,6 +138,10 @@ void GBAKeyEditor::resizeEvent(QResizeEvent* event) { setLocation(m_keyB, 0.667, 0.490); setLocation(m_keyL, 0.1, 0.1); setLocation(m_keyR, 0.9, 0.1); + + if (m_profileSelect) { + setLocation(m_profileSelect, 0.5, 0.7); + } } void GBAKeyEditor::paintEvent(QPaintEvent* event) { @@ -165,11 +178,31 @@ void GBAKeyEditor::save() { bindKey(m_keyR, GBA_KEY_R); m_controller->saveConfiguration(m_type); - if (m_profile) { +#ifdef BUILD_SDL + if (m_profileSelect) { + m_controller->setPreferredGamepad(m_type, m_profileSelect->currentText()); + } +#endif + + if (!m_profile.isNull()) { m_controller->saveProfile(m_type, m_profile); } } +void GBAKeyEditor::refresh() { + const GBAInputMap* map = m_controller->map(); + lookupBinding(map, m_keyDU, GBA_KEY_UP); + lookupBinding(map, m_keyDD, GBA_KEY_DOWN); + lookupBinding(map, m_keyDL, GBA_KEY_LEFT); + lookupBinding(map, m_keyDR, GBA_KEY_RIGHT); + lookupBinding(map, m_keySelect, GBA_KEY_SELECT); + lookupBinding(map, m_keyStart, GBA_KEY_START); + lookupBinding(map, m_keyA, GBA_KEY_A); + lookupBinding(map, m_keyB, GBA_KEY_B); + lookupBinding(map, m_keyL, GBA_KEY_L); + lookupBinding(map, m_keyR, GBA_KEY_R); +} + void GBAKeyEditor::lookupBinding(const GBAInputMap* map, KeyEditor* keyEditor, GBAKey key) { #ifdef BUILD_SDL if (m_type == SDL_BINDING_BUTTON) { diff --git a/src/platform/qt/GBAKeyEditor.h b/src/platform/qt/GBAKeyEditor.h index cb7cc4c01..9496ffffe 100644 --- a/src/platform/qt/GBAKeyEditor.h +++ b/src/platform/qt/GBAKeyEditor.h @@ -15,6 +15,7 @@ extern "C" { #include "gba/input.h" } +class QComboBox; class QTimer; namespace QGBA { @@ -26,7 +27,7 @@ class GBAKeyEditor : public QWidget { Q_OBJECT public: - GBAKeyEditor(InputController* controller, int type, const char* profile = nullptr, QWidget* parent = nullptr); + GBAKeyEditor(InputController* controller, int type, const QString& profile = QString(), QWidget* parent = nullptr); public slots: void setAll(); @@ -38,6 +39,7 @@ protected: private slots: void setNext(); void save(); + void refresh(); #ifdef BUILD_SDL void setAxisValue(int axis, int32_t value); #endif @@ -61,6 +63,7 @@ private: KeyEditor* keyById(GBAKey); + QComboBox* m_profileSelect; QWidget* m_buttons; KeyEditor* m_keyDU; KeyEditor* m_keyDD; @@ -76,7 +79,7 @@ private: QList::iterator m_currentKey; uint32_t m_type; - const char* m_profile; + QString m_profile; InputController* m_controller; QPicture m_background; diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 7228f5952..9c9920929 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -85,8 +85,8 @@ void InputController::loadConfiguration(uint32_t type) { GBAInputMapLoad(&m_inputMap, type, m_config->input()); } -void InputController::loadProfile(uint32_t type, const char* profile) { - GBAInputProfileLoad(&m_inputMap, type, m_config->input(), profile); +void InputController::loadProfile(uint32_t type, const QString& profile) { + GBAInputProfileLoad(&m_inputMap, type, m_config->input(), profile.toLocal8Bit().constData()); } void InputController::saveConfiguration(uint32_t type) { @@ -94,8 +94,8 @@ void InputController::saveConfiguration(uint32_t type) { m_config->write(); } -void InputController::saveProfile(uint32_t type, const char* profile) { - GBAInputProfileSave(&m_inputMap, type, m_config->input(), profile); +void InputController::saveProfile(uint32_t type, const QString& profile) { + GBAInputProfileSave(&m_inputMap, type, m_config->input(), profile.toLocal8Bit().constData()); m_config->write(); } @@ -113,6 +113,38 @@ const char* InputController::profileForType(uint32_t type) { return 0; } +#ifdef BUILD_SDL +QStringList InputController::connectedGamepads(uint32_t type) const { + UNUSED(type); + if (type != SDL_BINDING_BUTTON) { + return QStringList(); + } + + QStringList pads; + for (size_t i = 0; i < s_sdlEvents.nJoysticks; ++i) { + const char* name; +#if SDL_VERSION_ATLEAST(2, 0, 0) + name = SDL_JoystickName(s_sdlEvents.joysticks[i]); +#else + name = SDL_JoystickName(SDL_JoystickIndex(s_sdlEvents.joysticks[i])); +#endif + if (name) { + pads.append(QString(name)); + } else { + pads.append(QString()); + } + } + return pads; +} + +void InputController::setPreferredGamepad(uint32_t type, const QString& device) { + if (!m_config) { + return; + } + GBAInputSetPreferredDevice(m_config->input(), type, m_sdlPlayer.playerId, device.toLocal8Bit().constData()); +} +#endif + GBAKey InputController::mapKeyboard(int key) const { return GBAInputMapKey(&m_inputMap, KEYBOARD, key); } diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h index be86d305b..497db331c 100644 --- a/src/platform/qt/InputController.h +++ b/src/platform/qt/InputController.h @@ -36,9 +36,9 @@ public: void setConfiguration(ConfigController* config); void loadConfiguration(uint32_t type); - void loadProfile(uint32_t type, const char* profile); + void loadProfile(uint32_t type, const QString& profile); void saveConfiguration(uint32_t type = KEYBOARD); - void saveProfile(uint32_t type, const char* profile); + void saveProfile(uint32_t type, const QString& profile); const char* profileForType(uint32_t type); GBAKey mapKeyboard(int key) const; @@ -55,6 +55,11 @@ public: QSet> activeGamepadAxes(); void bindAxis(uint32_t type, int axis, GamepadAxisEvent::Direction, GBAKey); + + QStringList connectedGamepads(uint32_t type) const; + int gamepad(uint32_t type) const { return m_sdlPlayer.joystickIndex; } + void setGamepad(uint32_t type, int index) { GBASDLPlayerChangeJoystick(&s_sdlEvents, &m_sdlPlayer, index); } + void setPreferredGamepad(uint32_t type, const QString& device); #endif public slots: diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c index 21408a1c5..6e9ac8d49 100644 --- a/src/platform/sdl/sdl-events.c +++ b/src/platform/sdl/sdl-events.c @@ -63,12 +63,10 @@ void GBASDLDeinitEvents(struct GBASDLEvents* context) { } void GBASDLEventsLoadConfig(struct GBASDLEvents* context, const struct Configuration* config) { - char sectionName[16]; - snprintf(sectionName, sizeof(sectionName), "input.%c%c%c%c", SDL_BINDING_BUTTON >> 24, SDL_BINDING_BUTTON >> 16, SDL_BINDING_BUTTON >> 8, SDL_BINDING_BUTTON); - context->preferredJoysticks[0] = ConfigurationGetValue(config, sectionName, "device0"); - context->preferredJoysticks[1] = ConfigurationGetValue(config, sectionName, "device1"); - context->preferredJoysticks[2] = ConfigurationGetValue(config, sectionName, "device2"); - context->preferredJoysticks[3] = ConfigurationGetValue(config, sectionName, "device3"); + context->preferredJoysticks[0] = GBAInputGetPreferredDevice(config, SDL_BINDING_BUTTON, 0); + context->preferredJoysticks[1] = GBAInputGetPreferredDevice(config, SDL_BINDING_BUTTON, 1); + context->preferredJoysticks[2] = GBAInputGetPreferredDevice(config, SDL_BINDING_BUTTON, 2); + context->preferredJoysticks[3] = GBAInputGetPreferredDevice(config, SDL_BINDING_BUTTON, 3); } void GBASDLInitBindings(struct GBAInputMap* inputMap) { @@ -132,7 +130,7 @@ bool GBASDLAttachPlayer(struct GBASDLEvents* events, struct GBASDLPlayer* player return false; } - int playerId = events->playersAttached; + player->playerId = events->playersAttached; size_t firstUnclaimed = SIZE_MAX; size_t i; @@ -160,7 +158,7 @@ bool GBASDLAttachPlayer(struct GBASDLEvents* events, struct GBASDLPlayer* player #else joystickName = SDL_JoystickName(SDL_JoystickIndex(events->joysticks[i])); #endif - if (events->preferredJoysticks[playerId] && strcmp(events->preferredJoysticks[playerId], joystickName) == 0) { + if (events->preferredJoysticks[player->playerId] && strcmp(events->preferredJoysticks[player->playerId], joystickName) == 0) { player->joystickIndex = i; break; } @@ -172,7 +170,7 @@ bool GBASDLAttachPlayer(struct GBASDLEvents* events, struct GBASDLPlayer* player if (player->joystickIndex != SIZE_MAX) { player->joystick = events->joysticks[player->joystickIndex]; - events->joysticksClaimed[playerId] = player->joystickIndex; + events->joysticksClaimed[player->playerId] = player->joystickIndex; } ++events->playersAttached; @@ -191,6 +189,15 @@ void GBASDLPlayerLoadConfig(struct GBASDLPlayer* context, const struct Configura } } +void GBASDLPlayerChangeJoystick(struct GBASDLEvents* events, struct GBASDLPlayer* player, size_t index) { + if (player->playerId > MAX_PLAYERS || index >= events->nJoysticks) { + return; + } + events->joysticksClaimed[player->playerId] = index; + player->joystickIndex = index; + player->joystick = events->joysticks[index]; +} + static void _pauseAfterFrame(struct GBAThread* context) { context->frameCallback = 0; GBAThreadPauseFromThread(context); diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h index b72964399..69e095e9d 100644 --- a/src/platform/sdl/sdl-events.h +++ b/src/platform/sdl/sdl-events.h @@ -29,6 +29,7 @@ struct GBASDLEvents { }; struct GBASDLPlayer { + size_t playerId; struct GBAInputMap* bindings; SDL_Joystick* joystick; size_t joystickIndex; From 2650ae89c7caf6f6f016c564865a2fde977df770 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 17:10:30 -0700 Subject: [PATCH 089/101] All: Update CHANGES --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index c6fd570bd..62d56dbf2 100644 --- a/CHANGES +++ b/CHANGES @@ -29,6 +29,8 @@ Features: - Libretro core for use with RetroArch and other front-ends - Controller profiles for setting different bindings for different controllers - Ability to lock aspect ratio + - Local link cable support + - Ability to switch which game controller is in use per instance Bugfixes: - ARM7: Extend prefetch by one stage - GBA Audio: Support 16-bit writes to FIFO audio From 291d5c500b9f6e6fc3a4e1b936b6cdb3457406a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 21 Mar 2015 17:12:37 -0700 Subject: [PATCH 090/101] Qt: Fix useBios config option not being bound properly --- src/platform/qt/Window.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 0fea4b3a2..616194a01 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -770,7 +770,9 @@ void Window::setupMenu(QMenuBar* menubar) { }, this); ConfigOption* useBios = m_config->addOption("useBios"); - useBios->connect([this](const QVariant& value) { m_controller->setUseBIOS(value.toBool()); }); + useBios->connect([this](const QVariant& value) { + m_controller->setUseBIOS(value.toBool()); + }, this); ConfigOption* rewindEnable = m_config->addOption("rewindEnable"); rewindEnable->connect([this](const QVariant& value) { From 302b041507c46d5df72bbc01d074b9a1ef5bdea1 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 22 Mar 2015 13:03:14 -0700 Subject: [PATCH 091/101] Qt: Fix crash when initializing gamepads --- src/platform/qt/InputController.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 9c9920929..915635044 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -27,6 +27,7 @@ InputController::InputController(int playerId, QObject* parent) , m_playerId(playerId) , m_config(nullptr) , m_gamepadTimer(nullptr) + , m_playerAttached(false) { GBAInputMapInit(&m_inputMap); @@ -102,7 +103,7 @@ void InputController::saveProfile(uint32_t type, const QString& profile) { const char* InputController::profileForType(uint32_t type) { UNUSED(type); #ifdef BUILD_SDL - if (type == SDL_BINDING_BUTTON) { + if (type == SDL_BINDING_BUTTON && m_sdlPlayer.joystick) { #if SDL_VERSION_ATLEAST(2, 0, 0) return SDL_JoystickName(m_sdlPlayer.joystick); #else From 8fad1d136c878e263fcf21772f74d66235d17a23 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 00:11:19 -0700 Subject: [PATCH 092/101] Qt: Ability to prevent opposing directional input --- CHANGES | 1 + src/platform/qt/GameController.cpp | 23 ++++++++ src/platform/qt/GameController.h | 1 + src/platform/qt/InputController.cpp | 2 + src/platform/qt/InputController.h | 4 ++ src/platform/qt/SettingsView.cpp | 4 +- src/platform/qt/SettingsView.ui | 81 ++++++++++++++++------------- src/platform/qt/Window.cpp | 5 ++ 8 files changed, 83 insertions(+), 38 deletions(-) diff --git a/CHANGES b/CHANGES index 62d56dbf2..2c8d4aa9b 100644 --- a/CHANGES +++ b/CHANGES @@ -31,6 +31,7 @@ Features: - Ability to lock aspect ratio - Local link cable support - Ability to switch which game controller is in use per instance + - Ability to prevent opposing directional input Bugfixes: - ARM7: Extend prefetch by one stage - GBA Audio: Support 16-bit writes to FIFO audio diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index 2c9ea7158..f66d168a5 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -33,6 +33,7 @@ GameController::GameController(QObject* parent) , m_drawContext(new uint32_t[256 * 256]) , m_threadContext() , m_activeKeys(0) + , m_inactiveKeys(0) , m_logLevels(0) , m_gameOpen(false) , m_audioThread(new QThread(this)) @@ -390,17 +391,38 @@ void GameController::rewind(int states) { void GameController::keyPressed(int key) { int mappedKey = 1 << key; m_activeKeys |= mappedKey; + if (!m_inputController->allowOpposing()) { + if ((m_activeKeys & 0x30) == 0x30) { + m_inactiveKeys |= mappedKey ^ 0x30; + m_activeKeys ^= mappedKey ^ 0x30; + } + if ((m_activeKeys & 0xC0) == 0xC0) { + m_inactiveKeys |= mappedKey ^ 0xC0; + m_activeKeys ^= mappedKey ^ 0xC0; + } + } updateKeys(); } void GameController::keyReleased(int key) { int mappedKey = 1 << key; m_activeKeys &= ~mappedKey; + if (!m_inputController->allowOpposing()) { + if (mappedKey & 0x30) { + m_activeKeys |= m_inactiveKeys & (0x30 ^ mappedKey); + m_inactiveKeys &= ~0x30; + } + if (mappedKey & 0xC0) { + m_activeKeys |= m_inactiveKeys & (0xC0 ^ mappedKey); + m_inactiveKeys &= ~0xC0; + } + } updateKeys(); } void GameController::clearKeys() { m_activeKeys = 0; + m_inactiveKeys = 0; updateKeys(); } @@ -549,6 +571,7 @@ void GameController::updateKeys() { #ifdef BUILD_SDL activeKeys |= m_activeButtons; #endif + activeKeys &= ~m_inactiveKeys; m_threadContext.activeKeys = activeKeys; } diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index eb3a1580c..7acfd88af 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -152,6 +152,7 @@ private: GBAVideoSoftwareRenderer* m_renderer; GBACheatDevice m_cheatDevice; int m_activeKeys; + int m_inactiveKeys; int m_logLevels; bool m_gameOpen; diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 915635044..1e5128035 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -28,6 +28,7 @@ InputController::InputController(int playerId, QObject* parent) , m_config(nullptr) , m_gamepadTimer(nullptr) , m_playerAttached(false) + , m_allowOpposing(false) { GBAInputMapInit(&m_inputMap); @@ -70,6 +71,7 @@ InputController::~InputController() { void InputController::setConfiguration(ConfigController* config) { m_config = config; + setAllowOpposing(config->getOption("allowOpposingDirections").toInt()); loadConfiguration(KEYBOARD); #ifdef BUILD_SDL GBASDLEventsLoadConfig(&s_sdlEvents, config->input()); diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h index 497db331c..2dd7fe826 100644 --- a/src/platform/qt/InputController.h +++ b/src/platform/qt/InputController.h @@ -41,6 +41,9 @@ public: void saveProfile(uint32_t type, const QString& profile); const char* profileForType(uint32_t type); + bool allowOpposing() const { return m_allowOpposing; } + void setAllowOpposing(bool allowOpposing) { m_allowOpposing = allowOpposing; } + GBAKey mapKeyboard(int key) const; void bindKey(uint32_t type, int key, GBAKey); @@ -73,6 +76,7 @@ private: GBAInputMap m_inputMap; ConfigController* m_config; int m_playerId; + bool m_allowOpposing; #ifdef BUILD_SDL static int s_sdlInited; diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp index 610b65456..7c1d28771 100644 --- a/src/platform/qt/SettingsView.cpp +++ b/src/platform/qt/SettingsView.cpp @@ -31,6 +31,7 @@ SettingsView::SettingsView(ConfigController* controller, QWidget* parent) loadSetting("rewindBufferInterval", m_ui.rewindInterval); loadSetting("rewindBufferCapacity", m_ui.rewindCapacity); loadSetting("resampleVideo", m_ui.resampleVideo); + loadSetting("allowOpposingDirections", m_ui.allowOpposingDirections); QString idleOptimization = loadSetting("idleOptimization"); if (idleOptimization == "ignore") { @@ -81,6 +82,7 @@ void SettingsView::updateConfig() { saveSetting("rewindBufferInterval", m_ui.rewindInterval); saveSetting("rewindBufferCapacity", m_ui.rewindCapacity); saveSetting("resampleVideo", m_ui.resampleVideo); + saveSetting("allowOpposingDirections", m_ui.allowOpposingDirections); switch (m_ui.idleOptimization->currentIndex() + IDLE_LOOP_IGNORE) { case IDLE_LOOP_IGNORE: @@ -130,7 +132,7 @@ void SettingsView::saveSetting(const char* key, const QString& field) { void SettingsView::loadSetting(const char* key, QAbstractButton* field) { QString option = loadSetting(key); - field->setChecked(option != "0"); + field->setChecked(!option.isNull() && option != "0"); } void SettingsView::loadSetting(const char* key, QComboBox* field) { diff --git a/src/platform/qt/SettingsView.ui b/src/platform/qt/SettingsView.ui index 311b509fa..c9fc145f8 100644 --- a/src/platform/qt/SettingsView.ui +++ b/src/platform/qt/SettingsView.ui @@ -6,8 +6,8 @@ 0 0 - 355 - 501 + 360 + 569 @@ -198,6 +198,34 @@ + + + + FPS target: + + + + + + + + + 240 + + + 60 + + + + + + + frames per second + + + + + @@ -282,35 +310,21 @@ - - - - FPS target: + + + + Qt::Horizontal - - - - - - 240 - - - 60 - - - - - - - frames per second - - - - + + + + Idle loops + + - + @@ -329,17 +343,10 @@ - - - - Qt::Horizontal - - - - - + + - Idle loops + Allow opposing input directions diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 616194a01..afc0746cd 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -789,6 +789,11 @@ void Window::setupMenu(QMenuBar* menubar) { m_controller->setRewind(m_config->getOption("rewindEnable").toInt(), m_config->getOption("rewindBufferCapacity").toInt(), value.toInt()); }, this); + ConfigOption* allowOpposingDirections = m_config->addOption("allowOpposingDirections"); + allowOpposingDirections->connect([this](const QVariant& value) { + m_inputController.setAllowOpposing(value.toBool()); + }, this); + QMenu* other = new QMenu(tr("Other"), this); m_shortcutController->addMenu(other); m_shortcutController->addFunctions(other, [this]() { From f519976c7f3e3bc04236ffcb9e74a6901245caa2 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 02:03:01 -0700 Subject: [PATCH 093/101] All: Attempt to downgrade from GNU99 to C99 --- CMakeLists.txt | 5 +++-- src/gba/hardware.c | 2 -- src/gba/hardware.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c258f133d..0eaf1fef5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(mGBA C) set(BINARY_NAME mgba CACHE INTERNAL "Name of output binaries") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=gnu99") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99") set(USE_CLI_DEBUGGER ON CACHE BOOL "Whether or not to enable the CLI-mode ARM debugger") set(USE_GDB_STUB ON CACHE BOOL "Whether or not to enable the GDB stub ARM debugger") set(USE_FFMPEG ON CACHE BOOL "Whether or not to enable FFmpeg support") @@ -120,7 +120,8 @@ if(WIN32) file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c) source_group("Windows-specific code" FILES ${OS_SRC}) else() - add_definitions(-DUSE_PTHREADS) + add_definitions(-DUSE_PTHREADS -D_BSD_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L) + if(NOT APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") endif() diff --git a/src/gba/hardware.c b/src/gba/hardware.c index 3661df0b1..106be09ba 100644 --- a/src/gba/hardware.c +++ b/src/gba/hardware.c @@ -7,8 +7,6 @@ #include "gba/serialize.h" -#include - static void _readPins(struct GBACartridgeHardware* hw); static void _outputPins(struct GBACartridgeHardware* hw, unsigned pins); diff --git a/src/gba/hardware.h b/src/gba/hardware.h index 4c56bbb60..41520ad65 100644 --- a/src/gba/hardware.h +++ b/src/gba/hardware.h @@ -10,6 +10,8 @@ #include "macros.h" +#include + #define IS_GPIO_REGISTER(reg) ((reg) == GPIO_REG_DATA || (reg) == GPIO_REG_DIRECTION || (reg) == GPIO_REG_CONTROL) struct GBARotationSource { From b55c873e3401b255cba436e6e85eea59f3d5293c Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 02:16:17 -0700 Subject: [PATCH 094/101] GBA BIOS: Define M_PI if not defined --- src/gba/bios.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gba/bios.c b/src/gba/bios.c index 89d0d7cd1..c68119550 100644 --- a/src/gba/bios.c +++ b/src/gba/bios.c @@ -10,6 +10,10 @@ #include "gba/memory.h" #include "isa-inlines.h" +#ifndef M_PI +#define M_PI 3.141592654f +#endif + const uint32_t GBA_BIOS_CHECKSUM = 0xBAAE187F; const uint32_t GBA_DS_BIOS_CHECKSUM = 0xBAAE1880; From 9bb306f8319796d1e96079f93525c214e7687bf1 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 02:47:10 -0700 Subject: [PATCH 095/101] All: Buildfixes for OS X and FreeBSD --- CMakeLists.txt | 7 ++++++- src/util/common.h | 1 + src/util/socket.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eaf1fef5..519261192 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,16 +120,21 @@ if(WIN32) file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c) source_group("Windows-specific code" FILES ${OS_SRC}) else() - add_definitions(-DUSE_PTHREADS -D_BSD_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L) + add_definitions(-DUSE_PTHREADS) + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + add_definitions(-D_BSD_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L) + endif() if(NOT APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") endif() + file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/posix/*.c) source_group("POSIX-specific code" FILES ${OS_SRC}) endif() if(APPLE) + add_definitions(-D_DARWIN_C_SOURCE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6") endif() diff --git a/src/util/common.h b/src/util/common.h index 42f62c05f..0f9a90255 100644 --- a/src/util/common.h +++ b/src/util/common.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #define UNUSED(V) (void)(V) diff --git a/src/util/socket.h b/src/util/socket.h index c5c98a6a3..3a4712052 100644 --- a/src/util/socket.h +++ b/src/util/socket.h @@ -23,6 +23,7 @@ typedef SOCKET Socket; #include #include #include +#include #include #define INVALID_SOCKET (-1) From 1c422d405726f4c93ef11df4bd99fe398fa8d097 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 21:23:10 -0700 Subject: [PATCH 096/101] SDL: Use SDL2 audio APIs when compiled against SDL2 --- src/platform/sdl/sdl-audio.c | 24 ++++++++++++++++++++++++ src/platform/sdl/sdl-audio.h | 3 +++ 2 files changed, 27 insertions(+) diff --git a/src/platform/sdl/sdl-audio.c b/src/platform/sdl/sdl-audio.c index ccdd41d2d..7b4017d41 100644 --- a/src/platform/sdl/sdl-audio.c +++ b/src/platform/sdl/sdl-audio.c @@ -31,7 +31,13 @@ bool GBASDLInitAudio(struct GBASDLAudio* context, struct GBAThread* threadContex #if RESAMPLE_LIBRARY == RESAMPLE_NN context->drift = 0.f; #endif + +#if SDL_VERSION_ATLEAST(2, 0, 0) + context->deviceId = SDL_OpenAudioDevice(0, 0, &context->desiredSpec, &context->obtainedSpec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE); + if (context->deviceId == 0) { +#else if (SDL_OpenAudio(&context->desiredSpec, &context->obtainedSpec) < 0) { +#endif GBALog(0, GBA_LOG_ERROR, "Could not open SDL sound system"); return false; } @@ -43,25 +49,43 @@ bool GBASDLInitAudio(struct GBASDLAudio* context, struct GBAThread* threadContex threadContext->audioBuffers = context->samples * 2; } +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_PauseAudioDevice(context->deviceId, 0); +#else SDL_PauseAudio(0); +#endif return true; } void GBASDLDeinitAudio(struct GBASDLAudio* context) { UNUSED(context); +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_PauseAudioDevice(context->deviceId, 1); + SDL_CloseAudioDevice(context->deviceId); +#else SDL_PauseAudio(1); SDL_CloseAudio(); +#endif SDL_QuitSubSystem(SDL_INIT_AUDIO); } void GBASDLPauseAudio(struct GBASDLAudio* context) { +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_PauseAudioDevice(context->deviceId, 1); +#else UNUSED(context); SDL_PauseAudio(1); +#endif + } void GBASDLResumeAudio(struct GBASDLAudio* context) { +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_PauseAudioDevice(context->deviceId, 0); +#else UNUSED(context); SDL_PauseAudio(0); +#endif } static void _GBASDLAudioCallback(void* context, Uint8* data, int len) { diff --git a/src/platform/sdl/sdl-audio.h b/src/platform/sdl/sdl-audio.h index 316b07d95..6730333eb 100644 --- a/src/platform/sdl/sdl-audio.h +++ b/src/platform/sdl/sdl-audio.h @@ -25,6 +25,9 @@ struct GBASDLAudio { #if RESAMPLE_LIBRARY == RESAMPLE_NN float drift; #endif +#if SDL_VERSION_ATLEAST(2, 0, 0) + SDL_AudioDeviceID deviceId; +#endif struct GBAThread* thread; }; From 740f733563fec161f7ca7d3222ddb9100a95f869 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 21:34:20 -0700 Subject: [PATCH 097/101] Qt: Change audio driver back to SDL by default --- src/platform/qt/AudioProcessor.cpp | 2 +- src/platform/qt/SettingsView.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platform/qt/AudioProcessor.cpp b/src/platform/qt/AudioProcessor.cpp index 42f92a318..47c698eee 100644 --- a/src/platform/qt/AudioProcessor.cpp +++ b/src/platform/qt/AudioProcessor.cpp @@ -19,7 +19,7 @@ extern "C" { using namespace QGBA; -#ifdef BUILD_QT_MULTIMEDIA +#ifndef BUILD_SDL AudioProcessor::Driver AudioProcessor::s_driver = AudioProcessor::Driver::QT_MULTIMEDIA; #else AudioProcessor::Driver AudioProcessor::s_driver = AudioProcessor::Driver::SDL; diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp index 7c1d28771..b50ff95a4 100644 --- a/src/platform/qt/SettingsView.cpp +++ b/src/platform/qt/SettingsView.cpp @@ -42,17 +42,17 @@ SettingsView::SettingsView(ConfigController* controller, QWidget* parent) m_ui.idleOptimization->setCurrentIndex(2); } - int audioDriver = m_controller->getQtOption("audioDriver").toInt(); + QVariant audioDriver = m_controller->getQtOption("audioDriver"); #ifdef BUILD_QT_MULTIMEDIA m_ui.audioDriver->addItem(tr("Qt Multimedia"), static_cast(AudioProcessor::Driver::QT_MULTIMEDIA)); - if (audioDriver == static_cast(AudioProcessor::Driver::QT_MULTIMEDIA)) { + if (!audioDriver.isNull() && audioDriver.toInt() == static_cast(AudioProcessor::Driver::QT_MULTIMEDIA)) { m_ui.audioDriver->setCurrentIndex(m_ui.audioDriver->count() - 1); } #endif #ifdef BUILD_SDL m_ui.audioDriver->addItem(tr("SDL"), static_cast(AudioProcessor::Driver::SDL)); - if (audioDriver == static_cast(AudioProcessor::Driver::SDL)) { + if (audioDriver.isNull() || audioDriver.toInt() == static_cast(AudioProcessor::Driver::SDL)) { m_ui.audioDriver->setCurrentIndex(m_ui.audioDriver->count() - 1); } #endif From 3d8cfda57d900bc744571944533301f9ce83ae59 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 23 Mar 2015 22:12:57 -0700 Subject: [PATCH 098/101] Qt: Warning dialog if an unimplemented BIOS feature is called (fixes #177) --- CHANGES | 1 + src/platform/qt/GameController.cpp | 7 +++++++ src/platform/qt/GameController.h | 1 + src/platform/qt/Window.cpp | 15 +++++++++++++++ src/platform/qt/Window.h | 3 +++ 5 files changed, 27 insertions(+) diff --git a/CHANGES b/CHANGES index 2c8d4aa9b..95bd66cb1 100644 --- a/CHANGES +++ b/CHANGES @@ -32,6 +32,7 @@ Features: - Local link cable support - Ability to switch which game controller is in use per instance - Ability to prevent opposing directional input + - Warning dialog if an unimplemented BIOS feature is called Bugfixes: - ARM7: Extend prefetch by one stage - GBA Audio: Support 16-bit writes to FIFO audio diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp index f66d168a5..38bcc0ff8 100644 --- a/src/platform/qt/GameController.cpp +++ b/src/platform/qt/GameController.cpp @@ -118,7 +118,14 @@ GameController::GameController(QObject* parent) }; m_threadContext.logHandler = [] (GBAThread* context, enum GBALogLevel level, const char* format, va_list args) { + static const char* stubMessage = "Stub software interrupt"; GameController* controller = static_cast(context->userData); + if (level == GBA_LOG_STUB && strncmp(stubMessage, format, strlen(stubMessage)) == 0) { + va_list argc; + va_copy(argc, args); + int immediate = va_arg(argc, int); + controller->unimplementedBiosCall(immediate); + } if (level == GBA_LOG_FATAL) { QMetaObject::invokeMethod(controller, "crashGame", Q_ARG(const QString&, QString().vsprintf(format, args))); } else if (!(controller->m_logLevels & level)) { diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h index 7acfd88af..a7036f7f8 100644 --- a/src/platform/qt/GameController.h +++ b/src/platform/qt/GameController.h @@ -85,6 +85,7 @@ signals: void gameCrashed(const QString& errorMessage); void gameFailed(); void stateLoaded(GBAThread*); + void unimplementedBiosCall(int); void luminanceValueChanged(int); diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index afc0746cd..4013cf68d 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -97,6 +97,7 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent) connect(m_controller, SIGNAL(frameAvailable(const uint32_t*)), this, SLOT(recordFrame())); connect(m_controller, SIGNAL(gameCrashed(const QString&)), this, SLOT(gameCrashed(const QString&))); connect(m_controller, SIGNAL(gameFailed()), this, SLOT(gameFailed())); + connect(m_controller, SIGNAL(unimplementedBiosCall(int)), this, SLOT(unimplementedBiosCall(int))); connect(m_logView, SIGNAL(levelsSet(int)), m_controller, SLOT(setLogLevel(int))); connect(m_logView, SIGNAL(levelsEnabled(int)), m_controller, SLOT(enableLogLevel(int))); connect(m_logView, SIGNAL(levelsDisabled(int)), m_controller, SLOT(disableLogLevel(int))); @@ -411,6 +412,7 @@ void Window::gameStarted(GBAThread* context) { } #endif + m_hitUnimplementedBiosCall = false; m_fpsTimer.start(); } @@ -442,6 +444,19 @@ void Window::gameFailed() { fail->show(); } +void Window::unimplementedBiosCall(int call) { + if (m_hitUnimplementedBiosCall) { + return; + } + m_hitUnimplementedBiosCall = true; + + QMessageBox* fail = new QMessageBox(QMessageBox::Warning, tr("Unimplemented BIOS call"), + tr("This game uses a BIOS call that is not implemented. Please use the official BIOS for best experience."), + QMessageBox::Ok, this, Qt::Sheet); + fail->setAttribute(Qt::WA_DeleteOnClose); + fail->show(); +} + void Window::recordFrame() { m_frameList.append(QDateTime::currentDateTime()); while (m_frameList.count() > FRAME_LIST_SIZE) { diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index 9dce80b42..8906cdaf6 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -101,6 +101,7 @@ private slots: void gameStopped(); void gameCrashed(const QString&); void gameFailed(); + void unimplementedBiosCall(int); void recordFrame(); void showFPS(); @@ -136,6 +137,8 @@ private: ShortcutController* m_shortcutController; int m_playerId; + bool m_hitUnimplementedBiosCall; + #ifdef USE_FFMPEG VideoView* m_videoView; #endif From b6ddf8fd0081a9dc9b5b491f4ef573faf0779cad Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 24 Mar 2015 22:26:37 -0700 Subject: [PATCH 099/101] GBA RR: Fix VBM handling of lag frames --- src/gba/rr/vbm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gba/rr/vbm.c b/src/gba/rr/vbm.c index 717d5f195..5d452487b 100644 --- a/src/gba/rr/vbm.c +++ b/src/gba/rr/vbm.c @@ -94,7 +94,12 @@ bool GBAVBMIsRecording(const struct GBARRContext* rr) { } void GBAVBMNextFrame(struct GBARRContext* rr) { - UNUSED(rr); + if (!rr->isPlaying(rr)) { + return; + } + + struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; + vbm->vbmFile->seek(vbm->vbmFile, sizeof(uint16_t), SEEK_CUR); } uint16_t GBAVBMQueryInput(struct GBARRContext* rr) { @@ -105,6 +110,7 @@ uint16_t GBAVBMQueryInput(struct GBARRContext* rr) { struct GBAVBMContext* vbm = (struct GBAVBMContext*) rr; uint16_t input; vbm->vbmFile->read(vbm->vbmFile, &input, sizeof(input)); + vbm->vbmFile->seek(vbm->vbmFile, -sizeof(input), SEEK_CUR); return input & 0x3FF; } From 9d80089194c43a509ebc68270d131c6a0f2d2265 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 24 Mar 2015 22:54:13 -0700 Subject: [PATCH 100/101] Qt: Add keyboard shortcut to exit fullscreen (fixes #205) --- src/platform/qt/Window.cpp | 10 ++++++++++ src/platform/qt/Window.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 4013cf68d..eab756f56 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -374,6 +374,14 @@ void Window::dropEvent(QDropEvent* event) { m_controller->loadGame(url.path()); } +void Window::exitFullScreen() { + if (!isFullScreen()) { + return; + } + showNormal(); + menuBar()->show(); +} + void Window::toggleFullScreen() { if (isFullScreen()) { showNormal(); @@ -817,6 +825,8 @@ void Window::setupMenu(QMenuBar* menubar) { m_controller->setTurbo(false, false); }, QKeySequence(Qt::Key_Tab), tr("Fast Forward (held)"), "holdFastForward"); + addControlledAction(other, other->addAction(tr("Exit fullscreen"), this, SLOT(exitFullScreen()), QKeySequence("Esc")), "exitFullscreen"); + foreach (QAction* action, m_gameActions) { action->setDisabled(true); } diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h index 8906cdaf6..d2d569e00 100644 --- a/src/platform/qt/Window.h +++ b/src/platform/qt/Window.h @@ -59,6 +59,7 @@ public slots: void selectROM(); void selectBIOS(); void selectPatch(); + void exitFullScreen(); void toggleFullScreen(); void loadConfig(); void saveConfig(); From 4b957cb66d51cec6dd99d2c753a20d00529cfd5b Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 25 Mar 2015 21:56:23 -0700 Subject: [PATCH 101/101] Qt: Fix non-SDL build --- src/platform/qt/GBAKeyEditor.cpp | 4 ++++ src/platform/qt/InputController.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/platform/qt/GBAKeyEditor.cpp b/src/platform/qt/GBAKeyEditor.cpp index 3a0c31257..97158af94 100644 --- a/src/platform/qt/GBAKeyEditor.cpp +++ b/src/platform/qt/GBAKeyEditor.cpp @@ -237,11 +237,15 @@ void GBAKeyEditor::lookupAxes(const GBAInputMap* map) { #endif void GBAKeyEditor::bindKey(const KeyEditor* keyEditor, GBAKey key) { +#ifdef BUILD_SDL if (keyEditor->direction() != GamepadAxisEvent::NEUTRAL) { m_controller->bindAxis(m_type, keyEditor->value(), keyEditor->direction(), key); } else { +#endif m_controller->bindKey(m_type, keyEditor->value(), key); +#ifdef BUILD_SDL } +#endif } bool GBAKeyEditor::findFocus() { diff --git a/src/platform/qt/InputController.cpp b/src/platform/qt/InputController.cpp index 1e5128035..73a9a9e1a 100644 --- a/src/platform/qt/InputController.cpp +++ b/src/platform/qt/InputController.cpp @@ -19,15 +19,19 @@ extern "C" { using namespace QGBA; +#ifdef BUILD_SDL int InputController::s_sdlInited = 0; GBASDLEvents InputController::s_sdlEvents; +#endif InputController::InputController(int playerId, QObject* parent) : QObject(parent) , m_playerId(playerId) , m_config(nullptr) , m_gamepadTimer(nullptr) +#ifdef BUILD_SDL , m_playerAttached(false) +#endif , m_allowOpposing(false) { GBAInputMapInit(&m_inputMap);