From 2fc5047d26f45d5309cdd704ba41c9e724f8966d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Sat, 29 Apr 2017 16:11:22 +0200
Subject: IOS: Convert the IOS kernel HLE code to a class

This changes the main IOS code (roughly the equivalent of the kernel)
to a class instead of being a set of free functions + tons of static
variables.

The reason for this change is that keeping tons of static variables
like that prevents us from making an IOS instance and reusing IOS
code easily.

Converting the IOS code to a class also allows us to mostly decouple
IOS from the PPC emulation.

The more interesting changes are in Core/IOS/IOS. Everything else is
mostly just boring stuff required by this change...

* Because the devices themselves call back to the main IOS code
  for various things (getting the current version, replying to a
  request, and other syscall-like functions), just like processes in
  IOS call kernel syscalls, we have to pass a reference to the kernel
  to anything that uses IOS syscalls.

* Change DoState to save device names instead of device IDs to simplify
  AddDevice() and get rid of an ugly static count.

* Change ES_Launch's ack to be sent at IOS boot, now that we can do
  this properly.
---
 Source/Core/DolphinNoGUI/MainNoGUI.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Source/Core/DolphinNoGUI/MainNoGUI.cpp')

diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
index d9293a0faa..5c24b65a40 100644
--- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp
+++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
@@ -23,7 +23,7 @@
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/Host.h"
-#include "Core/IOS/IPC.h"
+#include "Core/IOS/IOS.h"
 #include "Core/IOS/STM/STM.h"
 #include "Core/IOS/USB/Bluetooth/BTEmu.h"
 #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
@@ -139,19 +139,18 @@ bool Host_RendererIsFullscreen()
 
 void Host_ConnectWiimote(int wm_idx, bool connect)
 {
-  if (Core::IsRunning() && SConfig::GetInstance().bWii &&
-      !SConfig::GetInstance().m_bt_passthrough_enabled)
-  {
-    Core::QueueHostJob([=] {
-      bool was_unpaused = Core::PauseAndLock(true);
-      const auto bt = std::static_pointer_cast<IOS::HLE::Device::BluetoothEmu>(
-          IOS::HLE::GetDeviceByName("/dev/usb/oh1/57e/305"));
-      if (bt)
-        bt->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
-      Host_UpdateMainFrame();
-      Core::PauseAndLock(false, was_unpaused);
-    });
-  }
+  Core::QueueHostJob([=] {
+    const auto ios = IOS::HLE::GetIOS();
+    if (!ios || SConfig::GetInstance().m_bt_passthrough_enabled)
+      return;
+    bool was_unpaused = Core::PauseAndLock(true);
+    const auto bt = std::static_pointer_cast<IOS::HLE::Device::BluetoothEmu>(
+        ios->GetDeviceByName("/dev/usb/oh1/57e/305"));
+    if (bt)
+      bt->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
+    Host_UpdateMainFrame();
+    Core::PauseAndLock(false, was_unpaused);
+  });
 }
 
 void Host_SetWiiMoteConnectionState(int _State)
@@ -241,7 +240,8 @@ class PlatformX11 : public Platform
     {
       if (s_shutdown_requested.TestAndClear())
       {
-        const auto stm = IOS::HLE::GetDeviceByName("/dev/stm/eventhook");
+        const auto ios = IOS::HLE::GetIOS();
+        const auto stm = ios ? ios->GetDeviceByName("/dev/stm/eventhook") : nullptr;
         if (!s_tried_graceful_shutdown.IsSet() && stm &&
             std::static_pointer_cast<IOS::HLE::Device::STMEventHook>(stm)->HasHookInstalled())
         {
-- 
cgit v1.2.3