From ba145364413f8e77224cf5f1c3f22285ee31c865 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Mon, 5 Oct 2020 08:26:03 +0200 Subject: [PATCH] DEV9: misc formatting --- pcsx2/CMakeLists.txt | 8 ++++---- pcsx2/System/SysCoreThread.cpp | 10 +++++----- pcsx2/gui/MainMenuClicks.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 87d6d6ea6c..3d20867a99 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -313,7 +313,7 @@ set(pcsx2DEV9Sources DEV9/Linux/Config.cpp DEV9/Linux/Linux.cpp DEV9/Linux/net.cpp - ${pcsx2DEV9UISources} + ${pcsx2DEV9UISources} ) # DEV9 headers @@ -323,7 +323,7 @@ set(pcsx2DEV9Headers DEV9/net.h DEV9/pcap_io.h DEV9/smap.h - ${pcsx2DEV9UIHeaders} + ${pcsx2DEV9UIHeaders} ) @@ -831,8 +831,8 @@ set(pcsx2FinalLibs ${ALSA_LIBRARIES} ${SOUNDTOUCH_LIBRARIES} ${SDL2_LIBRARIES} - ${PCAP_LIBRARY} - ${LIBXML2_LIBRARIES} + ${PCAP_LIBRARY} + ${LIBXML2_LIBRARIES} ${Platform_Libs} ) diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp index ad9d5d3448..3779002dc8 100644 --- a/pcsx2/System/SysCoreThread.cpp +++ b/pcsx2/System/SysCoreThread.cpp @@ -95,7 +95,7 @@ void SysCoreThread::Start() return; GetCorePlugins().Init(); SPU2init(); - DEV9init(); + DEV9init(); _parent::Start(); } @@ -303,7 +303,7 @@ void SysCoreThread::ExecuteTaskInThread() void SysCoreThread::OnSuspendInThread() { GetCorePlugins().Close(); - DEV9close(); + DEV9close(); DoCDVDclose(); FWclose(); SPU2close(); @@ -316,7 +316,7 @@ void SysCoreThread::OnResumeInThread(bool isSuspended) DoCDVDopen(); FWopen(); SPU2open((void*)pDsp); - DEV9open((void*)pDsp); + DEV9open((void*)pDsp); } @@ -332,13 +332,13 @@ void SysCoreThread::OnCleanupInThread() // FIXME: temporary workaround for deadlock on exit, which actually should be a crash vu1Thread.WaitVU(); SPU2close(); - DEV9close(); + DEV9close(); DoCDVDclose(); FWclose(); GetCorePlugins().Close(); GetCorePlugins().Shutdown(); SPU2shutdown(); - DEV9shutdown(); + DEV9shutdown(); _mm_setcsr(m_mxcsr_saved.bitmask); Threading::DisableHiresScheduler(); diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index 10e6c7fce8..7d2d490bd0 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -61,7 +61,7 @@ void MainEmuFrame::Menu_McdSettings_Click(wxCommandEvent& event) void MainEmuFrame::Menu_NetworkSettings_Click(wxCommandEvent &event) { - DEV9configure(); + DEV9configure(); } void MainEmuFrame::Menu_WindowSettings_Click(wxCommandEvent &event)