The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 20:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

ES: Split out GetTitleId to a separate method.

Browse Source
This commit is contained in:
Pierre Bourdon 2017-08-05 03:19:50 +02:00
parent 58624ef409
commit 385f063be1
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -165,15 +165,24 @@ IPCCommandResult ES::GetTitleDirectory(const IOCtlVRequest& request)
return GetDefaultReply(IPC_SUCCESS); return GetDefaultReply(IPC_SUCCESS);
} }
IPCCommandResult ES::GetTitleID(const IOCtlVRequest& request) ReturnCode ES::GetTitleId(u64* title_id) const
{
if (!s_title_context.active)
return ES_EINVAL;
*title_id = s_title_context.tmd.GetTitleId();
return IPC_SUCCESS;
}
IPCCommandResult ES::GetTitleId(const IOCtlVRequest& request)
{ {
if (!request.HasNumberOfValidVectors(0, 1)) if (!request.HasNumberOfValidVectors(0, 1))
return GetDefaultReply(ES_EINVAL); return GetDefaultReply(ES_EINVAL);
if (!s_title_context.active) u64 title_id;
return GetDefaultReply(ES_EINVAL); const ReturnCode ret = GetTitleId(&title_id);
if (ret != IPC_SUCCESS)
return GetDefaultReply(ret);
const u64 title_id = s_title_context.tmd.GetTitleId();
Memory::Write_U64(title_id, request.io_vectors[0].address); Memory::Write_U64(title_id, request.io_vectors[0].address);
INFO_LOG(IOS_ES, "IOCTL_ES_GETTITLEID: %08x/%08x", static_cast<u32>(title_id >> 32), INFO_LOG(IOS_ES, "IOCTL_ES_GETTITLEID: %08x/%08x", static_cast<u32>(title_id >> 32),
static_cast<u32>(title_id)); static_cast<u32>(title_id));
@ -421,7 +430,7 @@ IPCCommandResult ES::IOCtlV(const IOCtlVRequest& request)
case IOCTL_ES_GETTITLEDIR: case IOCTL_ES_GETTITLEDIR:
return GetTitleDirectory(request); return GetTitleDirectory(request);
case IOCTL_ES_GETTITLEID: case IOCTL_ES_GETTITLEID:
return GetTitleID(request); return GetTitleId(request);
case IOCTL_ES_SETUID: case IOCTL_ES_SETUID:
return SetUID(context->uid, request); return SetUID(context->uid, request);
case IOCTL_ES_DIVERIFY: case IOCTL_ES_DIVERIFY:

3
Source/Core/Core/IOS/ES/ES.h
View File

@ -127,6 +127,7 @@ public:
ReturnCode DeleteContent(u64 title_id, u32 content_id) const; ReturnCode DeleteContent(u64 title_id, u32 content_id) const;
ReturnCode GetDeviceId(u32* device_id) const; ReturnCode GetDeviceId(u32* device_id) const;
ReturnCode GetTitleId(u64* device_id) const;
// Views // Views
ReturnCode GetV0TicketFromView(const u8* ticket_view, u8* ticket) const; ReturnCode GetV0TicketFromView(const u8* ticket_view, u8* ticket) const;
@ -243,7 +244,7 @@ private:
// Misc // Misc
IPCCommandResult SetUID(u32 uid, const IOCtlVRequest& request); IPCCommandResult SetUID(u32 uid, const IOCtlVRequest& request);
IPCCommandResult GetTitleDirectory(const IOCtlVRequest& request); IPCCommandResult GetTitleDirectory(const IOCtlVRequest& request);
IPCCommandResult GetTitleID(const IOCtlVRequest& request); IPCCommandResult GetTitleId(const IOCtlVRequest& request);
IPCCommandResult GetConsumption(const IOCtlVRequest& request); IPCCommandResult GetConsumption(const IOCtlVRequest& request);
IPCCommandResult Launch(const IOCtlVRequest& request); IPCCommandResult Launch(const IOCtlVRequest& request);
IPCCommandResult LaunchBC(const IOCtlVRequest& request); IPCCommandResult LaunchBC(const IOCtlVRequest& request);