diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core.cpp | 11 | ||||
-rw-r--r-- | src/core/frontend/emu_window.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/hid.h | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 202cd332b..c9c9b7615 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -67,10 +67,6 @@ System::ResultStatus System::SingleStep() { } System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { - if (app_loader) { - app_loader.reset(); - } - app_loader = Loader::GetLoader(filepath); if (!app_loader) { @@ -123,10 +119,6 @@ void System::Reschedule() { } System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { - if (cpu_core) { - cpu_core.reset(); - } - Memory::Init(); if (Settings::values.use_cpu_jit) { @@ -159,7 +151,8 @@ void System::Shutdown() { Kernel::Shutdown(); HW::Shutdown(); CoreTiming::Shutdown(); - cpu_core.reset(); + cpu_core = nullptr; + app_loader = nullptr; LOG_DEBUG(Core, "Shutdown OK"); } diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 4f0f786ce..6b4637741 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -70,14 +70,12 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) { (framebuffer_layout.bottom_screen.bottom - framebuffer_layout.bottom_screen.top); touch_pressed = true; - pad_state.touch.Assign(1); } void EmuWindow::TouchReleased() { touch_pressed = false; touch_x = 0; touch_y = 0; - pad_state.touch.Assign(0); } void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 21e66dfe0..c7f4ee138 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -42,8 +42,6 @@ struct PadState { BitField<14, 1, u32> zl; BitField<15, 1, u32> zr; - BitField<20, 1, u32> touch; - BitField<24, 1, u32> c_right; BitField<25, 1, u32> c_left; BitField<26, 1, u32> c_up; @@ -203,8 +201,6 @@ const PadState PAD_Y = {{1u << 11}}; const PadState PAD_ZL = {{1u << 14}}; const PadState PAD_ZR = {{1u << 15}}; -const PadState PAD_TOUCH = {{1u << 20}}; - const PadState PAD_C_RIGHT = {{1u << 24}}; const PadState PAD_C_LEFT = {{1u << 25}}; const PadState PAD_C_UP = {{1u << 26}}; |