Use IPC:MakeHeader instead of hardcoded raw values for IPC command tables. (#6453)

* Use IPC:MakeHeader instead of hardcoded values for IPC command tables.

* Use u32 instead of unsigned int in MakeHeader function

Co-authored-by: SachinVin <26602104+SachinVin@users.noreply.github.com>

* Fix clang format

---------

Co-authored-by: SachinVin <26602104+SachinVin@users.noreply.github.com>
This commit is contained in:
PabloMK7 2023-04-28 07:31:03 +02:00 committed by GitHub
parent 9bd8c9290b
commit 63bc0b59bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
74 changed files with 1983 additions and 1896 deletions

View file

@ -13,26 +13,26 @@ namespace Service::DLP {
DLP_CLNT::DLP_CLNT() : ServiceFramework("dlp:CLNT", 1) {
static const FunctionInfo functions[] = {
// clang-format off
{0x000100C3, nullptr, "Initialize"},
{0x00020000, nullptr, "Finalize"},
{0x00030000, nullptr, "GetEventDesc"},
{0x00040000, nullptr, "GetChannel"},
{0x00050180, nullptr, "StartScan"},
{0x00060000, nullptr, "StopScan"},
{0x00070080, nullptr, "GetServerInfo"},
{0x00080100, nullptr, "GetTitleInfo"},
{0x00090040, nullptr, "GetTitleInfoInOrder"},
{0x000A0080, nullptr, "DeleteScanInfo"},
{0x000B0100, nullptr, "PrepareForSystemDownload"},
{0x000C0000, nullptr, "StartSystemDownload"},
{0x000D0100, nullptr, "StartTitleDownload"},
{0x000E0000, nullptr, "GetMyStatus"},
{0x000F0040, nullptr, "GetConnectingNodes"},
{0x00100040, nullptr, "GetNodeInfo"},
{0x00110000, nullptr, "GetWirelessRebootPassphrase"},
{0x00120000, nullptr, "StopSession"},
{0x00130100, nullptr, "GetCupVersion"},
{0x00140100, nullptr, "GetDupAvailability"},
{IPC::MakeHeader(0x0001, 3, 3), nullptr, "Initialize"},
{IPC::MakeHeader(0x0002, 0, 0), nullptr, "Finalize"},
{IPC::MakeHeader(0x0003, 0, 0), nullptr, "GetEventDesc"},
{IPC::MakeHeader(0x0004, 0, 0), nullptr, "GetChannel"},
{IPC::MakeHeader(0x0005, 6, 0), nullptr, "StartScan"},
{IPC::MakeHeader(0x0006, 0, 0), nullptr, "StopScan"},
{IPC::MakeHeader(0x0007, 2, 0), nullptr, "GetServerInfo"},
{IPC::MakeHeader(0x0008, 4, 0), nullptr, "GetTitleInfo"},
{IPC::MakeHeader(0x0009, 1, 0), nullptr, "GetTitleInfoInOrder"},
{IPC::MakeHeader(0x000A, 2, 0), nullptr, "DeleteScanInfo"},
{IPC::MakeHeader(0x000B, 4, 0), nullptr, "PrepareForSystemDownload"},
{IPC::MakeHeader(0x000C, 0, 0), nullptr, "StartSystemDownload"},
{IPC::MakeHeader(0x000D, 4, 0), nullptr, "StartTitleDownload"},
{IPC::MakeHeader(0x000E, 0, 0), nullptr, "GetMyStatus"},
{IPC::MakeHeader(0x000F, 1, 0), nullptr, "GetConnectingNodes"},
{IPC::MakeHeader(0x0010, 1, 0), nullptr, "GetNodeInfo"},
{IPC::MakeHeader(0x0011, 0, 0), nullptr, "GetWirelessRebootPassphrase"},
{IPC::MakeHeader(0x0012, 0, 0), nullptr, "StopSession"},
{IPC::MakeHeader(0x0013, 4, 0), nullptr, "GetCupVersion"},
{IPC::MakeHeader(0x0014, 4, 0), nullptr, "GetDupAvailability"},
// clang-format on
};

View file

@ -13,23 +13,23 @@ namespace Service::DLP {
DLP_FKCL::DLP_FKCL() : ServiceFramework("dlp:FKCL", 1) {
static const FunctionInfo functions[] = {
// clang-format off
{0x00010083, nullptr, "Initialize"},
{0x00020000, nullptr, "Finalize"},
{0x00030000, nullptr, "GetEventDesc"},
{0x00040000, nullptr, "GetChannels"},
{0x00050180, nullptr, "StartScan"},
{0x00060000, nullptr, "StopScan"},
{0x00070080, nullptr, "GetServerInfo"},
{0x00080100, nullptr, "GetTitleInfo"},
{0x00090040, nullptr, "GetTitleInfoInOrder"},
{0x000A0080, nullptr, "DeleteScanInfo"},
{0x000B0100, nullptr, "StartFakeSession"},
{0x000C0000, nullptr, "GetMyStatus"},
{0x000D0040, nullptr, "GetConnectingNodes"},
{0x000E0040, nullptr, "GetNodeInfo"},
{0x000F0000, nullptr, "GetWirelessRebootPassphrase"},
{0x00100000, nullptr, "StopSession"},
{0x00110203, nullptr, "Initialize2"},
{IPC::MakeHeader(0x0001, 2, 3), nullptr, "Initialize"},
{IPC::MakeHeader(0x0002, 0, 0), nullptr, "Finalize"},
{IPC::MakeHeader(0x0003, 0, 0), nullptr, "GetEventDesc"},
{IPC::MakeHeader(0x0004, 0, 0), nullptr, "GetChannels"},
{IPC::MakeHeader(0x0005, 6, 0), nullptr, "StartScan"},
{IPC::MakeHeader(0x0006, 0, 0), nullptr, "StopScan"},
{IPC::MakeHeader(0x0007, 2, 0), nullptr, "GetServerInfo"},
{IPC::MakeHeader(0x0008, 4, 0), nullptr, "GetTitleInfo"},
{IPC::MakeHeader(0x0009, 1, 0), nullptr, "GetTitleInfoInOrder"},
{IPC::MakeHeader(0x000A, 2, 0), nullptr, "DeleteScanInfo"},
{IPC::MakeHeader(0x000B, 4, 0), nullptr, "StartFakeSession"},
{IPC::MakeHeader(0x000C, 0, 0), nullptr, "GetMyStatus"},
{IPC::MakeHeader(0x000D, 1, 0), nullptr, "GetConnectingNodes"},
{IPC::MakeHeader(0x000E, 1, 0), nullptr, "GetNodeInfo"},
{IPC::MakeHeader(0x000F, 0, 0), nullptr, "GetWirelessRebootPassphrase"},
{IPC::MakeHeader(0x0010, 0, 0), nullptr, "StopSession"},
{IPC::MakeHeader(0x0011, 8, 3), nullptr, "Initialize2"},
// clang-format on
};

View file

@ -27,22 +27,22 @@ void DLP_SRVR::IsChild(Kernel::HLERequestContext& ctx) {
DLP_SRVR::DLP_SRVR() : ServiceFramework("dlp:SRVR", 1) {
static const FunctionInfo functions[] = {
// clang-format off
{0x00010183, nullptr, "Initialize"},
{0x00020000, nullptr, "Finalize"},
{0x00030000, nullptr, "GetServerState"},
{0x00040000, nullptr, "GetEventDescription"},
{0x00050080, nullptr, "StartAccepting"},
{0x00060000, nullptr, "EndAccepting"},
{0x00070000, nullptr, "StartDistribution"},
{0x000800C0, nullptr, "SendWirelessRebootPassphrase"},
{0x00090040, nullptr, "AcceptClient"},
{0x000A0040, nullptr, "DisconnectClient"},
{0x000B0042, nullptr, "GetConnectingClients"},
{0x000C0040, nullptr, "GetClientInfo"},
{0x000D0040, nullptr, "GetClientState"},
{0x000E0040, &DLP_SRVR::IsChild, "IsChild"},
{0x000F0303, nullptr, "InitializeWithName"},
{0x00100000, nullptr, "GetDupNoticeNeed"},
{IPC::MakeHeader(0x0001, 6, 3), nullptr, "Initialize"},
{IPC::MakeHeader(0x0002, 0, 0), nullptr, "Finalize"},
{IPC::MakeHeader(0x0003, 0, 0), nullptr, "GetServerState"},
{IPC::MakeHeader(0x0004, 0, 0), nullptr, "GetEventDescription"},
{IPC::MakeHeader(0x0005, 2, 0), nullptr, "StartAccepting"},
{IPC::MakeHeader(0x0006, 0, 0), nullptr, "EndAccepting"},
{IPC::MakeHeader(0x0007, 0, 0), nullptr, "StartDistribution"},
{IPC::MakeHeader(0x0008, 3, 0), nullptr, "SendWirelessRebootPassphrase"},
{IPC::MakeHeader(0x0009, 1, 0), nullptr, "AcceptClient"},
{IPC::MakeHeader(0x000A, 1, 0), nullptr, "DisconnectClient"},
{IPC::MakeHeader(0x000B, 1, 2), nullptr, "GetConnectingClients"},
{IPC::MakeHeader(0x000C, 1, 0), nullptr, "GetClientInfo"},
{IPC::MakeHeader(0x000D, 1, 0), nullptr, "GetClientState"},
{IPC::MakeHeader(0x000E, 1, 0), &DLP_SRVR::IsChild, "IsChild"},
{IPC::MakeHeader(0x000F, 12, 3), nullptr, "InitializeWithName"},
{IPC::MakeHeader(0x0010, 0, 0), nullptr, "GetDupNoticeNeed"},
// clang-format on
};