izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

IOS HLE: Deduplicate request code in ES

Browse Source
This commit is contained in:
Léo Lam
2017-01-16 23:55:56 +01:00
parent 6bf0b487d1
commit 4af67abb55
2 changed files with 195 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+191 -207
View File
File diff suppressed because it is too large Load Diff
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
+4 -7
View File
@@ -27,8 +27,6 @@ class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
public:
CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName);
virtual ~CWII_IPC_HLE_Device_es();
void LoadWAD(const std::string& _rContentFile);
// Internal implementation of the ES_DECRYPT ioctlv.
@@ -38,10 +36,9 @@ public:
void DoState(PointerWrap& p) override;
IPCCommandResult Open(u32 _CommandAddress, u32 _Mode) override;
IPCCommandResult Close(u32 _CommandAddress, bool _bForce) override;
IPCCommandResult IOCtlV(u32 _CommandAddress) override;
IOSReturnCode Open(const IOSOpenRequest& request) override;
void Close() override;
IPCCommandResult IOCtlV(const IOSIOCtlVRequest& request) override;
static u32 ES_DIVerify(const std::vector<u8>& tmd);
@@ -116,7 +113,7 @@ private:
ES_INVALID_TMD = -106, // or access denied
ES_READ_LESS_DATA_THAN_EXPECTED = -1009,
ES_WRITE_FAILURE = -1010,
ES_PARAMTER_SIZE_OR_ALIGNMENT = -1017,
ES_PARAMETER_SIZE_OR_ALIGNMENT = -1017,
ES_HASH_DOESNT_MATCH = -1022,
ES_MEM_ALLOC_FAILED = -1024,
ES_INCORRECT_ACCESS_RIGHT = -1026,