From dc338ccecf0e5a31242b48ca4f9941039bdf9ca6 Mon Sep 17 00:00:00 2001 From: mailwl Date: Sat, 28 May 2016 20:55:34 +0300 Subject: [PATCH 1/4] srv: Update according 3dbrew --- src/core/hle/service/srv.cpp | 156 +++++++++++++++++++++++++++++++---- 1 file changed, 139 insertions(+), 17 deletions(-) diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index aae955bf8..9aebb67b2 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Citra Emulator Project +// Copyright 2016 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -15,23 +15,86 @@ namespace SRV { static Kernel::SharedPtr event_handle; -static void Initialize(Service::Interface* self) { - u32* cmd_buff = Kernel::GetCommandBuffer(); - - cmd_buff[1] = 0; // No error +static const char* NotifDesc(u32 notif_id) { + switch (notif_id) { + case 0x100: return "This indicates that all processes must terminate : power - off, reboot, or FIRM - launch."; + case 0x104: return "This indicates that the system is entering sleep mode. (PTM : NotifySleepPreparationComplete needed for this and the following ? )"; + case 0x105: return "This indicates that the system has exited sleep mode."; + case 0x107: return "Unknown.Subscribed to by CECD module."; + case 0x108: return "error at boot ?"; + case 0x109: return "?(Subscribed to by GSP)"; + case 0x10C: return "Unknown."; + //case 0x110 - 0x11F Unknown.See PM launch flags. + case 0x179: return "Unknown"; + case 0x202: return "POWER button pressed"; + case 0x203: return "POWER button held long"; + case 0x204: return "HOME button pressed"; + case 0x205: return "HOME button released"; + case 0x206: return "This is signaled by NWMEXT : ControlWirelessEnabled and when the physical Wi - Fi slider is enabled"; + case 0x207: return "SD card inserted"; + case 0x208: return "Game cartridge inserted"; + case 0x209: return "SD card removed"; + case 0x20A: return "Game cartridge removed"; + case 0x20B: return "Game cartridge inserted or removed"; + case 0x20D: return "? (Subscribed to by GSP)"; + case 0x20E: return "? (Subscribed to by GSP)"; + case 0x213: return "? (Subscribed to by GSP)"; + case 0x214: return "? (Subscribed to by GSP)"; + case 0x302: return "Unknown.Signaled by nwm module."; + case 0x303: return "Unknown.Subscribed to by CECD module."; + case 0x304: return "Unknown.Subscribed to by CECD module"; + } + return "Unknown notification"; } -static void GetProcSemaphore(Service::Interface* self) { +/** + * SRV::RegisterClient service function + * Inputs: + * 0: 0x00010002 + * 1: ProcessId Header (must be 0x20) + * Outputs: + * 1: ResultCode + */ +static void RegisterClient(Service::Interface* self) { + u32* cmd_buff = Kernel::GetCommandBuffer(); + + cmd_buff[1] = RESULT_SUCCESS.raw; // No error + LOG_WARNING(Service_SRV, "(STUBBED) called"); +} + +/** + * SRV::EnableNotification service function + * Inputs: + * 0: 0x00020000 + * Outputs: + * 1: ResultCode + * 2: Translation descriptor: 0x20 + * 3: Handle to semaphore signaled on process notification + */ +static void EnableNotification(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); // TODO(bunnei): Change to a semaphore once these have been implemented event_handle = Kernel::Event::Create(Kernel::ResetType::OneShot, "SRV:Event"); event_handle->Clear(); - cmd_buff[1] = 0; // No error + cmd_buff[1] = RESULT_SUCCESS.raw; // No error + cmd_buff[2] = 0x20; cmd_buff[3] = Kernel::g_handle_table.Create(event_handle).MoveFrom(); + LOG_WARNING(Service_SRV, "(STUBBED) called"); } +/** + * SRV::EnableNotification service function + * Inputs: + * 0: 0x00050100 + * 1-2: 8-byte UTF-8 service name + * 3: Name length + * 4: Flags (bit0: if not set, return port-handle if session-handle unavailable) + * Outputs: + * 1: ResultCode + * 3: Service handle + */ static void GetServiceHandle(Service::Interface* self) { ResultCode res = RESULT_SUCCESS; u32* cmd_buff = Kernel::GetCommandBuffer(); @@ -49,16 +112,74 @@ static void GetServiceHandle(Service::Interface* self) { cmd_buff[1] = res.raw; } +/** + * SRV::Subscribe service function + * Inputs: + * 0: 0x00090040 + * 1: Notification ID + * Outputs: + * 1: ResultCode + */ +static void Subscribe(Service::Interface* self) { + u32* cmd_buff = Kernel::GetCommandBuffer(); + + u32 notif_id = cmd_buff[1]; + + cmd_buff[1] = RESULT_SUCCESS.raw; // No error + LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, desc: %s", notif_id, NotifDesc(notif_id)); +} + +/** + * SRV::Unsubscribe service function + * Inputs: + * 0: 0x000A0040 + * 1: Notification ID + * Outputs: + * 1: ResultCode + */ +static void Unsubscribe(Service::Interface* self) { + u32* cmd_buff = Kernel::GetCommandBuffer(); + + u32 notif_id = cmd_buff[1]; + + cmd_buff[1] = RESULT_SUCCESS.raw; // No error + LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, desc: %s", notif_id, NotifDesc(notif_id)); +} + +/** + * SRV::PublishToSubscriber service function + * Inputs: + * 0: 0x000C0080 + * 1: Notification ID + * 2: Flags (bit0: only fire if not fired, bit1: report errors) + * Outputs: + * 1: ResultCode + */ +static void PublishToSubscriber(Service::Interface* self) { + u32* cmd_buff = Kernel::GetCommandBuffer(); + + u32 notif_id = cmd_buff[1]; + u8 flags = cmd_buff[2] & 0xFF; + + cmd_buff[1] = RESULT_SUCCESS.raw; // No error + LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, flags=%u, desc: %s", notif_id, flags, NotifDesc(notif_id)); +} + const Interface::FunctionInfo FunctionTable[] = { - {0x00010002, Initialize, "Initialize"}, - {0x00020000, GetProcSemaphore, "GetProcSemaphore"}, - {0x00030100, nullptr, "RegisterService"}, - {0x000400C0, nullptr, "UnregisterService"}, - {0x00050100, GetServiceHandle, "GetServiceHandle"}, - {0x000600C2, nullptr, "RegisterHandle"}, - {0x00090040, nullptr, "Subscribe"}, - {0x000B0000, nullptr, "ReceiveNotification"}, - {0x000C0080, nullptr, "PublishToSubscriber"}, + {0x00010002, RegisterClient, "RegisterClient"}, + {0x00020000, EnableNotification, "EnableNotification"}, + {0x00030100, nullptr, "RegisterService"}, + {0x000400C0, nullptr, "UnregisterService"}, + {0x00050100, GetServiceHandle, "GetServiceHandle"}, + {0x000600C2, nullptr, "RegisterPort"}, + {0x000700C0, nullptr, "UnregisterPort"}, + {0x00080100, nullptr, "GetPort"}, + {0x00090040, Subscribe, "Subscribe"}, + {0x000A0040, Unsubscribe, "Unsubscribe"}, + {0x000B0000, nullptr, "ReceiveNotification"}, + {0x000C0080, PublishToSubscriber, "PublishToSubscriber"}, + {0x000D0040, nullptr, "PublishAndGetSubscriber"}, + {0x000E00C0, nullptr, "IsServiceRegistered"}, }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -66,10 +187,11 @@ const Interface::FunctionInfo FunctionTable[] = { Interface::Interface() { Register(FunctionTable); + event_handle = nullptr; } Interface::~Interface() { event_handle = nullptr; } -} // namespace +} // namespace SRV From eb231cb19d13116e126797532fcffc5ae5410be5 Mon Sep 17 00:00:00 2001 From: mailwl Date: Sat, 28 May 2016 21:29:13 +0300 Subject: [PATCH 2/4] remove ugly function --- src/core/hle/service/srv.cpp | 38 +++--------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index 9aebb67b2..76bbe3d1a 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp @@ -15,38 +15,6 @@ namespace SRV { static Kernel::SharedPtr event_handle; -static const char* NotifDesc(u32 notif_id) { - switch (notif_id) { - case 0x100: return "This indicates that all processes must terminate : power - off, reboot, or FIRM - launch."; - case 0x104: return "This indicates that the system is entering sleep mode. (PTM : NotifySleepPreparationComplete needed for this and the following ? )"; - case 0x105: return "This indicates that the system has exited sleep mode."; - case 0x107: return "Unknown.Subscribed to by CECD module."; - case 0x108: return "error at boot ?"; - case 0x109: return "?(Subscribed to by GSP)"; - case 0x10C: return "Unknown."; - //case 0x110 - 0x11F Unknown.See PM launch flags. - case 0x179: return "Unknown"; - case 0x202: return "POWER button pressed"; - case 0x203: return "POWER button held long"; - case 0x204: return "HOME button pressed"; - case 0x205: return "HOME button released"; - case 0x206: return "This is signaled by NWMEXT : ControlWirelessEnabled and when the physical Wi - Fi slider is enabled"; - case 0x207: return "SD card inserted"; - case 0x208: return "Game cartridge inserted"; - case 0x209: return "SD card removed"; - case 0x20A: return "Game cartridge removed"; - case 0x20B: return "Game cartridge inserted or removed"; - case 0x20D: return "? (Subscribed to by GSP)"; - case 0x20E: return "? (Subscribed to by GSP)"; - case 0x213: return "? (Subscribed to by GSP)"; - case 0x214: return "? (Subscribed to by GSP)"; - case 0x302: return "Unknown.Signaled by nwm module."; - case 0x303: return "Unknown.Subscribed to by CECD module."; - case 0x304: return "Unknown.Subscribed to by CECD module"; - } - return "Unknown notification"; -} - /** * SRV::RegisterClient service function * Inputs: @@ -126,7 +94,7 @@ static void Subscribe(Service::Interface* self) { u32 notif_id = cmd_buff[1]; cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, desc: %s", notif_id, NotifDesc(notif_id)); + LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X", notif_id); } /** @@ -143,7 +111,7 @@ static void Unsubscribe(Service::Interface* self) { u32 notif_id = cmd_buff[1]; cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, desc: %s", notif_id, NotifDesc(notif_id)); + LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X", notif_id); } /** @@ -162,7 +130,7 @@ static void PublishToSubscriber(Service::Interface* self) { u8 flags = cmd_buff[2] & 0xFF; cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, flags=%u, desc: %s", notif_id, flags, NotifDesc(notif_id)); + LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, flags=%u", notif_id, flags); } const Interface::FunctionInfo FunctionTable[] = { From eea08f281d96791593f5f9fc59bec6e64fd7fc84 Mon Sep 17 00:00:00 2001 From: mailwl Date: Sun, 29 May 2016 12:00:27 +0300 Subject: [PATCH 3/4] Fix mistakes, add output header codes --- src/core/hle/service/srv.cpp | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index 76bbe3d1a..2afc04d27 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp @@ -21,11 +21,19 @@ static Kernel::SharedPtr event_handle; * 0: 0x00010002 * 1: ProcessId Header (must be 0x20) * Outputs: + * 0: 0x00010040 * 1: ResultCode */ static void RegisterClient(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); + if (cmd_buff[1] != 0x20) { + cmd_buff[0] = IPC::MakeHeader(0x0, 0x1, 0); //0x40 + cmd_buff[1] = ResultCode(ErrorDescription::OS_InvalidBufferDescriptor, ErrorModule::OS, + ErrorSummary::WrongArgument, ErrorLevel::Permanent).raw; + return; + } + cmd_buff[0] = IPC::MakeHeader(0x1, 0x1, 0); //0x10040 cmd_buff[1] = RESULT_SUCCESS.raw; // No error LOG_WARNING(Service_SRV, "(STUBBED) called"); } @@ -35,6 +43,7 @@ static void RegisterClient(Service::Interface* self) { * Inputs: * 0: 0x00020000 * Outputs: + * 0: 0x00020042 * 1: ResultCode * 2: Translation descriptor: 0x20 * 3: Handle to semaphore signaled on process notification @@ -46,14 +55,15 @@ static void EnableNotification(Service::Interface* self) { event_handle = Kernel::Event::Create(Kernel::ResetType::OneShot, "SRV:Event"); event_handle->Clear(); + cmd_buff[0] = IPC::MakeHeader(0x2, 0x1, 0x2); // 0x20042 cmd_buff[1] = RESULT_SUCCESS.raw; // No error - cmd_buff[2] = 0x20; + cmd_buff[2] = IPC::CallingPidDesc(); cmd_buff[3] = Kernel::g_handle_table.Create(event_handle).MoveFrom(); LOG_WARNING(Service_SRV, "(STUBBED) called"); } /** - * SRV::EnableNotification service function + * SRV::GetServiceHandle service function * Inputs: * 0: 0x00050100 * 1-2: 8-byte UTF-8 service name @@ -86,15 +96,17 @@ static void GetServiceHandle(Service::Interface* self) { * 0: 0x00090040 * 1: Notification ID * Outputs: + * 0: 0x00090040 * 1: ResultCode */ static void Subscribe(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); - u32 notif_id = cmd_buff[1]; + u32 notification_id = cmd_buff[1]; + cmd_buff[0] = IPC::MakeHeader(0x9, 0x1, 0); // 0x90040 cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X", notif_id); + LOG_WARNING(Service_SRV, "(STUBBED) called, notification_id=0x%X", notification_id); } /** @@ -103,15 +115,17 @@ static void Subscribe(Service::Interface* self) { * 0: 0x000A0040 * 1: Notification ID * Outputs: + * 0: 0x000A0040 * 1: ResultCode */ static void Unsubscribe(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); - u32 notif_id = cmd_buff[1]; + u32 notification_id = cmd_buff[1]; + cmd_buff[0] = IPC::MakeHeader(0xA, 0x1, 0); // 0xA0040 cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X", notif_id); + LOG_WARNING(Service_SRV, "(STUBBED) called, notification_id=0x%X", notification_id); } /** @@ -121,16 +135,18 @@ static void Unsubscribe(Service::Interface* self) { * 1: Notification ID * 2: Flags (bit0: only fire if not fired, bit1: report errors) * Outputs: + * 0: 0x000C0040 * 1: ResultCode */ static void PublishToSubscriber(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); - u32 notif_id = cmd_buff[1]; + u32 notification_id = cmd_buff[1]; u8 flags = cmd_buff[2] & 0xFF; + cmd_buff[0] = IPC::MakeHeader(0xC, 0x1, 0); // 0xC0040 cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_WARNING(Service_SRV, "(STUBBED) called, notif_id=0x%X, flags=%u", notif_id, flags); + LOG_WARNING(Service_SRV, "(STUBBED) called, notification_id=0x%X, flags=%u", notification_id, flags); } const Interface::FunctionInfo FunctionTable[] = { From e85b22320ab339a3f57f829606cf47eabc8f2b04 Mon Sep 17 00:00:00 2001 From: mailwl Date: Tue, 31 May 2016 10:05:31 +0300 Subject: [PATCH 4/4] Fix parameter name in EnableNotification --- src/core/hle/kernel/session.h | 4 ++++ src/core/hle/service/srv.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h index 6ddaf970e..26b086f87 100644 --- a/src/core/hle/kernel/session.h +++ b/src/core/hle/kernel/session.h @@ -32,6 +32,10 @@ constexpr u32 CallingPidDesc() { return 0x20; } +constexpr u32 TransferHandleDesc() { + return 0x20; +} + constexpr u32 StaticBufferDesc(u32 size, unsigned int buffer_id) { return 0x2 | (size << 14) | ((buffer_id & 0xF) << 10); } diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index 2afc04d27..8bd36d5ea 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp @@ -27,7 +27,7 @@ static Kernel::SharedPtr event_handle; static void RegisterClient(Service::Interface* self) { u32* cmd_buff = Kernel::GetCommandBuffer(); - if (cmd_buff[1] != 0x20) { + if (cmd_buff[1] != IPC::CallingPidDesc()) { cmd_buff[0] = IPC::MakeHeader(0x0, 0x1, 0); //0x40 cmd_buff[1] = ResultCode(ErrorDescription::OS_InvalidBufferDescriptor, ErrorModule::OS, ErrorSummary::WrongArgument, ErrorLevel::Permanent).raw; @@ -57,7 +57,7 @@ static void EnableNotification(Service::Interface* self) { cmd_buff[0] = IPC::MakeHeader(0x2, 0x1, 0x2); // 0x20042 cmd_buff[1] = RESULT_SUCCESS.raw; // No error - cmd_buff[2] = IPC::CallingPidDesc(); + cmd_buff[2] = IPC::TransferHandleDesc(); cmd_buff[3] = Kernel::g_handle_table.Create(event_handle).MoveFrom(); LOG_WARNING(Service_SRV, "(STUBBED) called"); }