HW: Initial support for Game Boy Player

dolphin-emu · May 3, 2019 · 08bd121 · 08bd121
1 parent 34bba0d
commit 08bd121
Show file tree

Hide file tree

Showing 11 changed files with 373 additions and 31 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
 	branch = master
+[submodule "Externals/mgba"]
+	path = Externals/mgba
+	url = https://github.com/mgba-emu/mgba.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -517,6 +517,7 @@ endif()
 add_subdirectory(Externals/cpp-optparse)
 add_subdirectory(Externals/glslang)
 add_subdirectory(Externals/imgui)
+add_subdirectory(Externals/mgba EXCLUDE_FROM_ALL)
 
 find_package(pugixml)
 if(NOT pugixml_FOUND)

diff --git a/Externals/licenses.md b/Externals/licenses.md
@@ -34,6 +34,8 @@ Dolphin includes or links code of the following third-party software projects:
    [University of Illinois/NCSA Open Source license](http://llvm.org/docs/DeveloperPolicy.html#license)
 - [LZO](http://www.oberhumer.com/opensource/lzo/):
    [GPLv2+](http://www.oberhumer.com/opensource/gpl.html)
+- [mGBA](http://mgba.io)
+   [MPL 2.0](https://github.com/mgba-emu/mgba/blob/master/LICENSE)
 - [MiniUPnPc](http://miniupnp.free.fr/):
    [3-clause BSD](https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/LICENSE)
 - [Microsoft Visual C++ Runtime Library](http://www.microsoft.com/en-us/download/details.aspx?id=40784):

diff --git a/Externals/mgba b/Externals/mgba
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
@@ -297,6 +297,7 @@ PUBLIC
   discio
   enet
   inputcommon
+  mgba
   ${MBEDTLS_LIBRARIES}
   pugixml
   sfml-network

diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
@@ -220,6 +220,9 @@ void SConfig::SaveCoreSettings(IniFile& ini)
   core->Set("SerialPort1", m_EXIDevice[2]);
   core->Set("HSP", m_HSPDevice);
   core->Set("ARAMExpansion", m_ARAMExpansion);
+  core->Set("GBPGame", m_GBPGame);
+  core->Set("GBPBootrom", m_GBPBootrom);
+  core->Set("GBPBootromCgb", m_GBPBootromCgb);
   core->Set("BBA_MAC", m_bba_mac);
   for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; ++i)
   {
@@ -497,6 +500,9 @@ void SConfig::LoadCoreSettings(IniFile& ini)
   core->Get("SerialPort1", (int*)&m_EXIDevice[2], ExpansionInterface::EXIDEVICE_NONE);
   core->Get("HSP", (int*)&m_HSPDevice, HSP::HSPDEVICE_NONE);
   core->Get("ARAMExpansion", &m_ARAMExpansion);
+  core->Get("GBPGame", &m_GBPGame);
+  core->Get("GBPBootrom", &m_GBPBootrom);
+  core->Get("GBPBootromCgb", &m_GBPBootromCgb);
   core->Get("BBA_MAC", &m_bba_mac);
   for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; ++i)
   {

diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
@@ -219,6 +219,9 @@ struct SConfig
   SerialInterface::SIDevices m_SIDevice[4];
   HSP::HSPDevices m_HSPDevice;
   int m_ARAMExpansion;
+  std::string m_GBPGame;
+  std::string m_GBPBootrom;
+  std::string m_GBPBootromCgb;
   std::string m_bba_mac;
 
   // interface language

diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
@@ -154,6 +154,7 @@
     <ClCompile Include="HW\HSP\HSP.cpp" />
     <ClCompile Include="HW\HSP\HSP_Device.cpp" />
     <ClCompile Include="HW\HSP\HSP_DeviceARAMExpansion.cpp" />
+    <ClCompile Include="HW\HSP\HSP_DeviceGBPlayer.cpp" />
     <ClCompile Include="HW\HSP\HSP_DeviceNull.cpp" />
     <ClCompile Include="HW\HW.cpp" />
     <ClCompile Include="HW\Memmap.cpp" />

diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp
@@ -567,7 +567,7 @@ static void Do_ARAM_DMA()
         s_arDMA.Cnt.count -= 8;
       }
     }
-	else if (!s_ARAM.wii_mode)
+    else if (!s_ARAM.wii_mode)
     {
       while (s_arDMA.Cnt.count)
       {