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

IOS Network: Split wd/command code into its own source files

This commit is contained in:
Lioncash 2017-02-18 02:00:56 -05:00
parent ec298d9ea9
commit a8eb2e2a8f
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/CMakeLists.txt
View File

@ -148,7 +148,6 @@ set(SRCS ActionReplay.cpp
IOS/FS/FS.cpp
IOS/Network/ICMPLin.cpp
IOS/Network/MACUtils.cpp
IOS/Network/Net.cpp
IOS/Network/Socket.cpp
IOS/Network/SSL.cpp
IOS/Network/IP/Top.cpp
@ -157,6 +156,7 @@ set(SRCS ActionReplay.cpp
IOS/Network/KD/NWC24Config.cpp
IOS/Network/NCD/Config.cpp
IOS/Network/NCD/Manage.cpp
IOS/Network/WD/Command.cpp
IOS/SDIO/SDIOSlot0.cpp
IOS/STM/STM.cpp
IOS/USB/Common.cpp

4
Source/Core/Core/Core.vcxproj
View File

@ -180,7 +180,6 @@
<ClCompile Include="IOS\FS\FS.cpp" />
<ClCompile Include="IOS\Network\ICMPLin.cpp" />
<ClCompile Include="IOS\Network\MACUtils.cpp" />
<ClCompile Include="IOS\Network\Net.cpp" />
<ClCompile Include="IOS\Network\Socket.cpp" />
<ClCompile Include="IOS\Network\SSL.cpp" />
<ClCompile Include="IOS\Network\IP\Top.cpp" />
@ -189,6 +188,7 @@
<ClCompile Include="IOS\Network\KD\NWC24Config.cpp" />
<ClCompile Include="IOS\Network\NCD\Config.cpp" />
<ClCompile Include="IOS\Network\NCD\Manage.cpp" />
<ClCompile Include="IOS\Network\WD\Command.cpp" />
<ClCompile Include="IOS\SDIO\SDIOSlot0.cpp" />
<ClCompile Include="IOS\STM\STM.cpp" />
<ClCompile Include="IOS\USB\Common.cpp" />
@ -423,7 +423,6 @@
<ClInclude Include="IOS\Network\ICMPLin.h" />
<ClInclude Include="IOS\Network\ICMP.h" />
<ClInclude Include="IOS\Network\MACUtils.h" />
<ClInclude Include="IOS\Network\Net.h" />
<ClInclude Include="IOS\Network\Socket.h" />
<ClInclude Include="IOS\Network\SSL.h" />
<ClInclude Include="IOS\Network\IP\Top.h" />
@ -432,6 +431,7 @@
<ClInclude Include="IOS\Network\KD\NWC24Config.h" />
<ClInclude Include="IOS\Network\NCD\Config.h" />
<ClInclude Include="IOS\Network\NCD\Manage.h" />
<ClInclude Include="IOS\Network\WD\Command.h" />
<ClInclude Include="IOS\SDIO\SDIOSlot0.h" />
<ClInclude Include="IOS\STM\STM.h" />
<ClInclude Include="IOS\USB\Common.h" />

15
Source/Core/Core/Core.vcxproj.filters
View File

@ -136,6 +136,9 @@
<Filter Include="IOS\Network\NCD">
<UniqueIdentifier>{a749993a-d2cf-46b6-9f7f-f76294e9ad02}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\Network\WD">
<UniqueIdentifier>{fc3080d6-d99a-44c6-bdd4-140cec1c6bf0}</UniqueIdentifier>
</Filter>
<Filter Include="IOS\DI">
<UniqueIdentifier>{3db8c364-1d72-4660-9179-86d1c46904b9}</UniqueIdentifier>
</Filter>
@ -764,9 +767,6 @@
<ClCompile Include="IOS\Network\MACUtils.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\Net.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\Socket.cpp">
<Filter>IOS\Network</Filter>
</ClCompile>
@ -791,6 +791,9 @@
<ClCompile Include="IOS\Network\NCD\Manage.cpp">
<Filter>IOS\Network\NCD</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\WD\Command.cpp">
<Filter>IOS\Network\WD</Filter>
</ClCompile>
<ClCompile Include="IOS\SDIO\SDIOSlot0.cpp">
<Filter>IOS\SDIO</Filter>
</ClCompile>
@ -1368,9 +1371,6 @@
<ClInclude Include="IOS\Network\MACUtils.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\Net.h">
<Filter>IOS\Network</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\Socket.h">
<Filter>IOS\Network</Filter>
</ClInclude>
@ -1395,6 +1395,9 @@
<ClInclude Include="IOS\Network\NCD\Manage.h">
<Filter>IOS\Network\NCD</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\WD\Command.h">
<Filter>IOS\Network\WD</Filter>
</ClInclude>
<ClInclude Include="IOS\SDIO\SDIOSlot0.h">
<Filter>IOS\SDIO</Filter>
</ClInclude>

2
Source/Core/Core/IOS/IPC.cpp
View File

@ -48,9 +48,9 @@
#include "Core/IOS/Network/KD/NetKDRequest.h"
#include "Core/IOS/Network/KD/NetKDTime.h"
#include "Core/IOS/Network/NCD/Manage.h"
#include "Core/IOS/Network/Net.h"
#include "Core/IOS/Network/SSL.h"
#include "Core/IOS/Network/Socket.h"
#include "Core/IOS/Network/WD/Command.h"
#include "Core/IOS/SDIO/SDIOSlot0.h"
#include "Core/IOS/STM/STM.h"
#include "Core/IOS/USB/Bluetooth/BTEmu.h"

8
Source/Core/Core/IOS/Network/Net.cpp → Source/Core/Core/IOS/Network/WD/Command.cpp
View File

@ -2,21 +2,18 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Core/IOS/Network/Net.h"
#include "Core/IOS/Network/WD/Command.h"
#include <cstddef>
#include <cstring>
#include <string>
#include <vector>
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/Network.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h"
#include "Core/IOS/Network/MACUtils.h"
#include "Core/IOS/Network/Socket.h"
namespace IOS
{
@ -24,7 +21,6 @@ namespace HLE
{
namespace Device
{
// Handle /dev/net/wd/command requests
NetWDCommand::NetWDCommand(u32 device_id, const std::string& device_name)
: Device(device_id, device_name)
{

2
Source/Core/Core/IOS/Network/Net.h → Source/Core/Core/IOS/Network/WD/Command.h
View File

@ -8,13 +8,11 @@
#include "Common/CommonTypes.h"
#include "Core/IOS/Device.h"
#include "Core/IOS/IPC.h"
namespace IOS
{
namespace HLE
{
// TODO: split this up.
namespace Device
{
class NetWDCommand : public Device