ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: misc formatting

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-10-05 08:26:03 +02:00 committed by refractionpcsx2
parent 52b687dc55
commit ba14536441
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/CMakeLists.txt
View File

@ -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}
)

10
pcsx2/System/SysCoreThread.cpp
View File

@ -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();

2
pcsx2/gui/MainMenuClicks.cpp
View File

@ -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)