Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove NetResolver.cpp/h (almost empty)

Browse source
This commit is contained in:
Henrik Rydgård 2025-01-09 09:27:41 +01:00
parent 2a0e3b1084
commit 94bf5f7eeb
10 changed files with 32 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -2389,8 +2389,6 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/MIPS/MIPSAsm.h
Core/MIPS/MIPSTracer.cpp
Core/MIPS/MIPSTracer.h
Core/Net/NetResolver.cpp
Core/Net/NetResolver.h
Core/MemFault.cpp
Core/MemFault.h
Core/MemMap.cpp

2
Core/Core.vcxproj
View file

@ -630,7 +630,6 @@
<ClCompile Include="MIPS\x86\X64IRCompSystem.cpp" />
<ClCompile Include="MIPS\x86\X64IRCompVec.cpp" />
<ClCompile Include="MIPS\x86\X64IRJit.cpp" />
<ClCompile Include="Net\NetResolver.cpp" />
<ClCompile Include="Replay.cpp" />
<ClCompile Include="Compatibility.cpp" />
<ClCompile Include="Config.cpp" />
@ -1222,7 +1221,6 @@
<ClInclude Include="MIPS\RiscV\RiscVJit.h" />
<ClInclude Include="MIPS\RiscV\RiscVRegCache.h" />
<ClInclude Include="MIPS\x86\X64IRJit.h" />
<ClInclude Include="Net\NetResolver.h" />
<ClInclude Include="Replay.h" />
<ClInclude Include="Compatibility.h" />
<ClInclude Include="Config.h" />

9
Core/Core.vcxproj.filters
View file

@ -94,9 +94,6 @@
<Filter Include="MIPS\RiscV">
<UniqueIdentifier>{067e3128-3aaf-4ed1-b19e-bab11606abe7}</UniqueIdentifier>
</Filter>
<Filter Include="Net">
<UniqueIdentifier>{f1b3f688-26eb-4121-9914-e9e19ab04bcd}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ELF\ElfReader.cpp">
@ -1333,9 +1330,6 @@
<ClCompile Include="HLE\sceNetResolver.cpp">
<Filter>HLE\Libraries</Filter>
</ClCompile>
<ClCompile Include="Net\NetResolver.cpp">
<Filter>Net</Filter>
</ClCompile>
<ClCompile Include="HLE\NetInetConstants.cpp">
<Filter>HLE\Libraries</Filter>
</ClCompile>
@ -2151,9 +2145,6 @@
<ClInclude Include="HLE\sceNetResolver.h">
<Filter>HLE\Libraries</Filter>
</ClInclude>
<ClInclude Include="Net\NetResolver.h">
<Filter>Net</Filter>
</ClInclude>
<ClInclude Include="HLE\NetInetConstants.h">
<Filter>HLE\Libraries</Filter>
</ClInclude>

35
Core/HLE/sceNetResolver.h
View file

@ -19,10 +19,39 @@
#include <memory>
#include <shared_mutex>
#include "Core/Net/NetResolver.h"
class SceNetResolver;
class NetResolver {
public:
NetResolver(const NetResolver& other) = default;
NetResolver() :
mId(0),
mIsRunning(false),
mBufferAddr(0),
mBufferLen(0) {
}
NetResolver(const int id, const u32 bufferAddr, const int bufferLen) :
mId(id),
mIsRunning(false),
mBufferAddr(bufferAddr),
mBufferLen(bufferLen) {
}
int GetId() const { return mId; }
bool GetIsRunning() const { return mIsRunning; }
void SetIsRunning(const bool isRunning) { this->mIsRunning = isRunning; }
private:
int mId;
bool mIsRunning;
u32 mBufferAddr;
u32 mBufferLen;
};
enum {
// pspnet_resolver
ERROR_NET_RESOLVER_NOT_TERMINATED = 0x80410401,
@ -71,4 +100,4 @@ private:
std::shared_mutex mNetResolversLock;
};
void Register_sceNetResolver();
void Register_sceNetResolver();

3
Core/Net/NetResolver.cpp
View file

@ -1,3 +0,0 @@
#include "NetResolver.h"
// TODO: remove me if the functions remain inlined

32
Core/Net/NetResolver.h
View file

@ -1,32 +0,0 @@
#pragma once
#include "CommonTypes.h"
class NetResolver {
public:
NetResolver(const NetResolver& other) = default;
NetResolver() :
mId(0),
mIsRunning(false),
mBufferAddr(0),
mBufferLen(0) {}
NetResolver(const int id, const u32 bufferAddr, const int bufferLen) :
mId(id),
mIsRunning(false),
mBufferAddr(bufferAddr),
mBufferLen(bufferLen) {}
int GetId() const { return mId; }
bool GetIsRunning() const { return mIsRunning; }
void SetIsRunning(const bool isRunning) { this->mIsRunning = isRunning; }
private:
int mId;
bool mIsRunning;
u32 mBufferAddr;
u32 mBufferLen;
};

2
UWP/CoreUWP/CoreUWP.vcxproj
View file

@ -319,7 +319,6 @@
<ClInclude Include="..\..\Core\MIPS\x86\RegCacheFPU.h" />
<ClInclude Include="..\..\Core\MIPS\x86\X64IRJit.h" />
<ClInclude Include="..\..\Core\MIPS\x86\X64IRRegCache.h" />
<ClInclude Include="..\..\Core\Net\NetResolver.h" />
<ClInclude Include="..\..\Core\Opcode.h" />
<ClInclude Include="..\..\Core\PSPLoaders.h" />
<ClInclude Include="..\..\Core\Reporting.h" />
@ -619,7 +618,6 @@
<ClCompile Include="..\..\Core\MIPS\x86\X64IRCompVec.cpp" />
<ClCompile Include="..\..\Core\MIPS\x86\X64IRJit.cpp" />
<ClCompile Include="..\..\Core\MIPS\x86\X64IRRegCache.cpp" />
<ClCompile Include="..\..\Core\Net\NetResolver.cpp" />
<ClCompile Include="..\..\Core\PSPLoaders.cpp" />
<ClCompile Include="..\..\Core\Reporting.cpp" />
<ClCompile Include="..\..\Core\Replay.cpp" />

6
UWP/CoreUWP/CoreUWP.vcxproj.filters
View file

@ -1223,9 +1223,6 @@
<ClCompile Include="..\..\Core\HLE\sceNetResolver.cpp">
<Filter>HLE</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Net\NetResolver.cpp">
<Filter>Net</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\HLE\NetInetConstants.cpp">
<Filter>HLE</Filter>
</ClCompile>
@ -1939,9 +1936,6 @@
<ClInclude Include="..\..\Core\HLE\sceNetResolver.h">
<Filter>HLE</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Net\NetResolver.h">
<Filter>Net</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\HLE\NetInetConstants.h">
<Filter>HLE</Filter>
</ClInclude>

1
android/jni/Android.mk
View file

@ -510,7 +510,6 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/MIPS/IR/IRNativeCommon.cpp \
$(SRC)/Core/MIPS/IR/IRPassSimplify.cpp \
$(SRC)/Core/MIPS/IR/IRRegCache.cpp \
$(SRC)/Core/Net/NetResolver.cpp \
$(SRC)/GPU/Math3D.cpp \
$(SRC)/GPU/GPU.cpp \
$(SRC)/GPU/GPUCommon.cpp \

1
libretro/Makefile.common
View file

@ -816,7 +816,6 @@ SOURCES_CXX += \
$(COREDIR)/MemFault.cpp \
$(COREDIR)/MemMap.cpp \
$(COREDIR)/MemMapFunctions.cpp \
$(COREDIR)/Net/NetResolver.cpp \
$(COREDIR)/PSPLoaders.cpp \
$(COREDIR)/Replay.cpp \
$(COREDIR)/Reporting.cpp \