summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Hexagon122018-04-17 18:37:43 +0300
committerGravatar bunnei2018-04-17 11:37:43 -0400
commite52a87b98a8aba7df498f4cdb861484ecd0333ca (patch)
treed23babf7fd3e6b40c77a1ba5141ff3cad6357787 /src
parentMerge pull request #342 from bunnei/indexed-verts (diff)
downloadyuzu-e52a87b98a8aba7df498f4cdb861484ecd0333ca.tar.gz
yuzu-e52a87b98a8aba7df498f4cdb861484ecd0333ca.tar.xz
yuzu-e52a87b98a8aba7df498f4cdb861484ecd0333ca.zip
Various service name fixes - part 2 (rebased) (#322)
* Updated ACC with more service names * Updated SVC with more service names * Updated set with more service names * Updated sockets with more service names * Updated SPL with more service names * Updated time with more service names * Updated vi with more service names
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/svc.cpp16
-rw-r--r--src/core/hle/service/acc/acc.cpp8
-rw-r--r--src/core/hle/service/set/set.cpp1
-rw-r--r--src/core/hle/service/set/set_cal.cpp9
-rw-r--r--src/core/hle/service/set/set_sys.cpp10
-rw-r--r--src/core/hle/service/sockets/bsd.cpp25
-rw-r--r--src/core/hle/service/sockets/sfdnsres.cpp1
-rw-r--r--src/core/hle/service/spl/spl.cpp6
-rw-r--r--src/core/hle/service/time/time.cpp6
-rw-r--r--src/core/hle/service/time/time_s.cpp11
-rw-r--r--src/core/hle/service/time/time_u.cpp11
-rw-r--r--src/core/hle/service/vi/vi.cpp113
-rw-r--r--src/core/hle/service/vi/vi_u.cpp1
13 files changed, 207 insertions, 11 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 36ea23cd9..54b1d5d75 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -861,14 +861,14 @@ static const FunctionDef SVC_Table[] = {
861 {0x2B, nullptr, "FlushDataCache"}, 861 {0x2B, nullptr, "FlushDataCache"},
862 {0x2C, nullptr, "MapPhysicalMemory"}, 862 {0x2C, nullptr, "MapPhysicalMemory"},
863 {0x2D, nullptr, "UnmapPhysicalMemory"}, 863 {0x2D, nullptr, "UnmapPhysicalMemory"},
864 {0x2E, nullptr, "Unknown"}, 864 {0x2E, nullptr, "GetNextThreadInfo"},
865 {0x2F, nullptr, "GetLastThreadInfo"}, 865 {0x2F, nullptr, "GetLastThreadInfo"},
866 {0x30, nullptr, "GetResourceLimitLimitValue"}, 866 {0x30, nullptr, "GetResourceLimitLimitValue"},
867 {0x31, nullptr, "GetResourceLimitCurrentValue"}, 867 {0x31, nullptr, "GetResourceLimitCurrentValue"},
868 {0x32, SvcWrap<SetThreadActivity>, "SetThreadActivity"}, 868 {0x32, SvcWrap<SetThreadActivity>, "SetThreadActivity"},
869 {0x33, SvcWrap<GetThreadContext>, "GetThreadContext"}, 869 {0x33, SvcWrap<GetThreadContext>, "GetThreadContext"},
870 {0x34, nullptr, "Unknown"}, 870 {0x34, nullptr, "WaitForAddress"},
871 {0x35, nullptr, "Unknown"}, 871 {0x35, nullptr, "SignalToAddress"},
872 {0x36, nullptr, "Unknown"}, 872 {0x36, nullptr, "Unknown"},
873 {0x37, nullptr, "Unknown"}, 873 {0x37, nullptr, "Unknown"},
874 {0x38, nullptr, "Unknown"}, 874 {0x38, nullptr, "Unknown"},
@@ -876,7 +876,7 @@ static const FunctionDef SVC_Table[] = {
876 {0x3A, nullptr, "Unknown"}, 876 {0x3A, nullptr, "Unknown"},
877 {0x3B, nullptr, "Unknown"}, 877 {0x3B, nullptr, "Unknown"},
878 {0x3C, nullptr, "DumpInfo"}, 878 {0x3C, nullptr, "DumpInfo"},
879 {0x3D, nullptr, "Unknown"}, 879 {0x3D, nullptr, "DumpInfoNew"},
880 {0x3E, nullptr, "Unknown"}, 880 {0x3E, nullptr, "Unknown"},
881 {0x3F, nullptr, "Unknown"}, 881 {0x3F, nullptr, "Unknown"},
882 {0x40, nullptr, "CreateSession"}, 882 {0x40, nullptr, "CreateSession"},
@@ -887,9 +887,9 @@ static const FunctionDef SVC_Table[] = {
887 {0x45, nullptr, "CreateEvent"}, 887 {0x45, nullptr, "CreateEvent"},
888 {0x46, nullptr, "Unknown"}, 888 {0x46, nullptr, "Unknown"},
889 {0x47, nullptr, "Unknown"}, 889 {0x47, nullptr, "Unknown"},
890 {0x48, nullptr, "Unknown"}, 890 {0x48, nullptr, "AllocateUnsafeMemory"},
891 {0x49, nullptr, "Unknown"}, 891 {0x49, nullptr, "FreeUnsafeMemory"},
892 {0x4A, nullptr, "Unknown"}, 892 {0x4A, nullptr, "SetUnsafeAllocationLimit"},
893 {0x4B, nullptr, "CreateJitMemory"}, 893 {0x4B, nullptr, "CreateJitMemory"},
894 {0x4C, nullptr, "MapJitMemory"}, 894 {0x4C, nullptr, "MapJitMemory"},
895 {0x4D, nullptr, "SleepSystem"}, 895 {0x4D, nullptr, "SleepSystem"},
@@ -926,7 +926,7 @@ static const FunctionDef SVC_Table[] = {
926 {0x6C, nullptr, "SetHardwareBreakPoint"}, 926 {0x6C, nullptr, "SetHardwareBreakPoint"},
927 {0x6D, nullptr, "GetDebugThreadParam"}, 927 {0x6D, nullptr, "GetDebugThreadParam"},
928 {0x6E, nullptr, "Unknown"}, 928 {0x6E, nullptr, "Unknown"},
929 {0x6F, nullptr, "Unknown"}, 929 {0x6F, nullptr, "GetMemoryInfo"},
930 {0x70, nullptr, "CreatePort"}, 930 {0x70, nullptr, "CreatePort"},
931 {0x71, nullptr, "ManageNamedPort"}, 931 {0x71, nullptr, "ManageNamedPort"},
932 {0x72, nullptr, "ConnectToPort"}, 932 {0x72, nullptr, "ConnectToPort"},
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index cfb6e05a5..949bf06b3 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -38,7 +38,10 @@ class IProfile final : public ServiceFramework<IProfile> {
38public: 38public:
39 IProfile() : ServiceFramework("IProfile") { 39 IProfile() : ServiceFramework("IProfile") {
40 static const FunctionInfo functions[] = { 40 static const FunctionInfo functions[] = {
41 {0, nullptr, "Get"},
41 {1, &IProfile::GetBase, "GetBase"}, 42 {1, &IProfile::GetBase, "GetBase"},
43 {10, nullptr, "GetImageSize"},
44 {11, nullptr, "LoadImage"},
42 }; 45 };
43 RegisterHandlers(functions); 46 RegisterHandlers(functions);
44 } 47 }
@@ -59,6 +62,11 @@ public:
59 static const FunctionInfo functions[] = { 62 static const FunctionInfo functions[] = {
60 {0, &IManagerForApplication::CheckAvailability, "CheckAvailability"}, 63 {0, &IManagerForApplication::CheckAvailability, "CheckAvailability"},
61 {1, &IManagerForApplication::GetAccountId, "GetAccountId"}, 64 {1, &IManagerForApplication::GetAccountId, "GetAccountId"},
65 {2, nullptr, "EnsureIdTokenCacheAsync"},
66 {3, nullptr, "LoadIdTokenCache"},
67 {130, nullptr, "GetNintendoAccountUserResourceCacheForApplication"},
68 {150, nullptr, "CreateAuthorizationRequest"},
69 {160, nullptr, "StoreOpenContext"},
62 }; 70 };
63 RegisterHandlers(functions); 71 RegisterHandlers(functions);
64 } 72 }
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp
index aa7c924e7..8908a04a2 100644
--- a/src/core/hle/service/set/set.cpp
+++ b/src/core/hle/service/set/set.cpp
@@ -36,6 +36,7 @@ SET::SET() : ServiceFramework("set") {
36 {5, nullptr, "GetAvailableLanguageCodes2"}, 36 {5, nullptr, "GetAvailableLanguageCodes2"},
37 {6, nullptr, "GetAvailableLanguageCodeCount2"}, 37 {6, nullptr, "GetAvailableLanguageCodeCount2"},
38 {7, nullptr, "GetKeyCodeMap"}, 38 {7, nullptr, "GetKeyCodeMap"},
39 {8, nullptr, "GetQuestFlag"},
39 }; 40 };
40 RegisterHandlers(functions); 41 RegisterHandlers(functions);
41} 42}
diff --git a/src/core/hle/service/set/set_cal.cpp b/src/core/hle/service/set/set_cal.cpp
index 6231acd96..4810d39e8 100644
--- a/src/core/hle/service/set/set_cal.cpp
+++ b/src/core/hle/service/set/set_cal.cpp
@@ -32,6 +32,15 @@ SET_CAL::SET_CAL() : ServiceFramework("set:cal") {
32 {21, nullptr, "GetEticketDeviceKey"}, 32 {21, nullptr, "GetEticketDeviceKey"},
33 {22, nullptr, "GetSpeakerParameter"}, 33 {22, nullptr, "GetSpeakerParameter"},
34 {23, nullptr, "GetLcdVendorId"}, 34 {23, nullptr, "GetLcdVendorId"},
35 {24, nullptr, "GetEciDeviceCertificate2"},
36 {25, nullptr, "GetEciDeviceKey2"},
37 {26, nullptr, "GetAmiiboKey"},
38 {27, nullptr, "GetAmiiboEcqvCertificate"},
39 {28, nullptr, "GetAmiiboEcdsaCertificate"},
40 {29, nullptr, "GetAmiiboEcqvBlsKey"},
41 {30, nullptr, "GetAmiiboEcqvBlsCertificate"},
42 {31, nullptr, "GetAmiiboEcqvBlsRootCertificate"},
43 {32, nullptr, "GetUnknownId"},
35 }; 44 };
36 RegisterHandlers(functions); 45 RegisterHandlers(functions);
37} 46}
diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cpp
index 363abd10a..b9115ca9e 100644
--- a/src/core/hle/service/set/set_sys.cpp
+++ b/src/core/hle/service/set/set_sys.cpp
@@ -27,6 +27,7 @@ SET_SYS::SET_SYS() : ServiceFramework("set:sys") {
27 {2, nullptr, "GetNetworkSettings"}, 27 {2, nullptr, "GetNetworkSettings"},
28 {3, nullptr, "GetFirmwareVersion"}, 28 {3, nullptr, "GetFirmwareVersion"},
29 {4, nullptr, "GetFirmwareVersion2"}, 29 {4, nullptr, "GetFirmwareVersion2"},
30 {5, nullptr, "GetFirmwareVersionDigest"},
30 {7, nullptr, "GetLockScreenFlag"}, 31 {7, nullptr, "GetLockScreenFlag"},
31 {8, nullptr, "SetLockScreenFlag"}, 32 {8, nullptr, "SetLockScreenFlag"},
32 {9, nullptr, "GetBacklightSettings"}, 33 {9, nullptr, "GetBacklightSettings"},
@@ -159,6 +160,15 @@ SET_SYS::SET_SYS() : ServiceFramework("set:sys") {
159 {138, nullptr, "GetWebInspectorFlag"}, 160 {138, nullptr, "GetWebInspectorFlag"},
160 {139, nullptr, "GetAllowedSslHosts"}, 161 {139, nullptr, "GetAllowedSslHosts"},
161 {140, nullptr, "GetHostFsMountPoint"}, 162 {140, nullptr, "GetHostFsMountPoint"},
163 {141, nullptr, "GetRequiresRunRepairTimeReviser"},
164 {142, nullptr, "SetRequiresRunRepairTimeReviser"},
165 {143, nullptr, "SetBlePairingSettings"},
166 {144, nullptr, "GetBlePairingSettings"},
167 {145, nullptr, "GetConsoleSixAxisSensorAngularVelocityTimeBias"},
168 {146, nullptr, "SetConsoleSixAxisSensorAngularVelocityTimeBias"},
169 {147, nullptr, "GetConsoleSixAxisSensorAngularAcceleration"},
170 {148, nullptr, "SetConsoleSixAxisSensorAngularAcceleration"},
171 {149, nullptr, "GetRebootlessSystemUpdateVersion"},
162 }; 172 };
163 RegisterHandlers(functions); 173 RegisterHandlers(functions);
164} 174}
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp
index 790ff82b3..929e19fec 100644
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -79,9 +79,34 @@ BSD::BSD(const char* name) : ServiceFramework(name) {
79 {0, &BSD::RegisterClient, "RegisterClient"}, 79 {0, &BSD::RegisterClient, "RegisterClient"},
80 {1, &BSD::StartMonitoring, "StartMonitoring"}, 80 {1, &BSD::StartMonitoring, "StartMonitoring"},
81 {2, &BSD::Socket, "Socket"}, 81 {2, &BSD::Socket, "Socket"},
82 {3, nullptr, "SocketExempt"},
83 {4, nullptr, "Open"},
84 {5, nullptr, "Select"},
85 {6, nullptr, "Poll"},
86 {7, nullptr, "Sysctl"},
87 {8, nullptr, "Recv"},
88 {9, nullptr, "RecvFrom"},
89 {10, nullptr, "Send"},
82 {11, &BSD::SendTo, "SendTo"}, 90 {11, &BSD::SendTo, "SendTo"},
91 {12, nullptr, "Accept"},
92 {13, nullptr, "Bind"},
83 {14, &BSD::Connect, "Connect"}, 93 {14, &BSD::Connect, "Connect"},
94 {15, nullptr, "GetPeerName"},
95 {16, nullptr, "GetSockName"},
96 {17, nullptr, "GetSockOpt"},
97 {18, nullptr, "Listen"},
98 {19, nullptr, "Ioctl"},
99 {20, nullptr, "Fcntl"},
100 {21, nullptr, "SetSockOpt"},
101 {22, nullptr, "Shutdown"},
102 {23, nullptr, "ShutdownAllSockets"},
103 {24, nullptr, "Write"},
104 {25, nullptr, "Read"},
84 {26, &BSD::Close, "Close"}, 105 {26, &BSD::Close, "Close"},
106 {27, nullptr, "DuplicateSocket"},
107 {28, nullptr, "GetResourceStatistics"},
108 {29, nullptr, "RecvMMsg"},
109 {30, nullptr, "SendMMsg"},
85 }; 110 };
86 RegisterHandlers(functions); 111 RegisterHandlers(functions);
87} 112}
diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp
index eb4b5fa57..633488b18 100644
--- a/src/core/hle/service/sockets/sfdnsres.cpp
+++ b/src/core/hle/service/sockets/sfdnsres.cpp
@@ -30,6 +30,7 @@ SFDNSRES::SFDNSRES() : ServiceFramework("sfdnsres") {
30 {7, nullptr, "GetNameInfo"}, 30 {7, nullptr, "GetNameInfo"},
31 {8, nullptr, "RequestCancelHandle"}, 31 {8, nullptr, "RequestCancelHandle"},
32 {9, nullptr, "CancelSocketCall"}, 32 {9, nullptr, "CancelSocketCall"},
33 {11, nullptr, "ClearDnsIpServerAddressArray"},
33 }; 34 };
34 RegisterHandlers(functions); 35 RegisterHandlers(functions);
35} 36}
diff --git a/src/core/hle/service/spl/spl.cpp b/src/core/hle/service/spl/spl.cpp
index deab29b91..3fcef341e 100644
--- a/src/core/hle/service/spl/spl.cpp
+++ b/src/core/hle/service/spl/spl.cpp
@@ -33,6 +33,12 @@ SPL::SPL(std::shared_ptr<Module> module) : Module::Interface(std::move(module),
33 {23, nullptr, "GetSplWaitEvent"}, 33 {23, nullptr, "GetSplWaitEvent"},
34 {24, nullptr, "SetSharedData"}, 34 {24, nullptr, "SetSharedData"},
35 {25, nullptr, "GetSharedData"}, 35 {25, nullptr, "GetSharedData"},
36 {26, nullptr, "ImportSslRsaKey"},
37 {27, nullptr, "SecureExpModWithSslKey"},
38 {28, nullptr, "ImportEsRsaKey"},
39 {29, nullptr, "SecureExpModWithEsKey"},
40 {30, nullptr, "EncryptManuRsaKeyForImport"},
41 {31, nullptr, "GetPackage2Hash"},
36 }; 42 };
37 RegisterHandlers(functions); 43 RegisterHandlers(functions);
38} 44}
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index c3e46f866..382188a62 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -20,7 +20,11 @@ public:
20 ISystemClock() : ServiceFramework("ISystemClock") { 20 ISystemClock() : ServiceFramework("ISystemClock") {
21 static const FunctionInfo functions[] = { 21 static const FunctionInfo functions[] = {
22 {0, &ISystemClock::GetCurrentTime, "GetCurrentTime"}, 22 {0, &ISystemClock::GetCurrentTime, "GetCurrentTime"},
23 {2, &ISystemClock::GetSystemClockContext, "GetSystemClockContext"}}; 23 {1, nullptr, "SetCurrentTime"},
24 {2, &ISystemClock::GetSystemClockContext, "GetSystemClockContext"},
25 {3, nullptr, "SetSystemClockContext"},
26
27 };
24 RegisterHandlers(functions); 28 RegisterHandlers(functions);
25 } 29 }
26 30
diff --git a/src/core/hle/service/time/time_s.cpp b/src/core/hle/service/time/time_s.cpp
index b172b2bd6..cb58efcb3 100644
--- a/src/core/hle/service/time/time_s.cpp
+++ b/src/core/hle/service/time/time_s.cpp
@@ -14,6 +14,17 @@ TIME_S::TIME_S(std::shared_ptr<Module> time) : Module::Interface(std::move(time)
14 {2, &TIME_S::GetStandardSteadyClock, "GetStandardSteadyClock"}, 14 {2, &TIME_S::GetStandardSteadyClock, "GetStandardSteadyClock"},
15 {3, &TIME_S::GetTimeZoneService, "GetTimeZoneService"}, 15 {3, &TIME_S::GetTimeZoneService, "GetTimeZoneService"},
16 {4, &TIME_S::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"}, 16 {4, &TIME_S::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"},
17 {5, nullptr, "GetEphemeralNetworkSystemClock"},
18 {50, nullptr, "SetStandardSteadyClockInternalOffset"},
19 {100, nullptr, "IsStandardUserSystemClockAutomaticCorrectionEnabled"},
20 {101, nullptr, "SetStandardUserSystemClockAutomaticCorrectionEnabled"},
21 {102, nullptr, "GetStandardUserSystemClockInitialYear"},
22 {200, nullptr, "IsStandardNetworkSystemClockAccuracySufficient"},
23 {300, nullptr, "CalculateMonotonicSystemClockBaseTimePoint"},
24 {400, nullptr, "GetClockSnapshot"},
25 {401, nullptr, "GetClockSnapshotFromSystemClockContext"},
26 {500, nullptr, "CalculateStandardUserSystemClockDifferenceByUser"},
27 {501, nullptr, "CalculateSpanBetween"},
17 }; 28 };
18 RegisterHandlers(functions); 29 RegisterHandlers(functions);
19} 30}
diff --git a/src/core/hle/service/time/time_u.cpp b/src/core/hle/service/time/time_u.cpp
index fc1ace325..bbd1ecab3 100644
--- a/src/core/hle/service/time/time_u.cpp
+++ b/src/core/hle/service/time/time_u.cpp
@@ -14,6 +14,17 @@ TIME_U::TIME_U(std::shared_ptr<Module> time) : Module::Interface(std::move(time)
14 {2, &TIME_U::GetStandardSteadyClock, "GetStandardSteadyClock"}, 14 {2, &TIME_U::GetStandardSteadyClock, "GetStandardSteadyClock"},
15 {3, &TIME_U::GetTimeZoneService, "GetTimeZoneService"}, 15 {3, &TIME_U::GetTimeZoneService, "GetTimeZoneService"},
16 {4, &TIME_U::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"}, 16 {4, &TIME_U::GetStandardLocalSystemClock, "GetStandardLocalSystemClock"},
17 {5, nullptr, "GetEphemeralNetworkSystemClock"},
18 {50, nullptr, "SetStandardSteadyClockInternalOffset"},
19 {100, nullptr, "IsStandardUserSystemClockAutomaticCorrectionEnabled"},
20 {101, nullptr, "SetStandardUserSystemClockAutomaticCorrectionEnabled"},
21 {102, nullptr, "GetStandardUserSystemClockInitialYear"},
22 {200, nullptr, "IsStandardNetworkSystemClockAccuracySufficient"},
23 {300, nullptr, "CalculateMonotonicSystemClockBaseTimePoint"},
24 {400, nullptr, "GetClockSnapshot"},
25 {401, nullptr, "GetClockSnapshotFromSystemClockContext"},
26 {500, nullptr, "CalculateStandardUserSystemClockDifferenceByUser"},
27 {501, nullptr, "CalculateSpanBetween"},
17 }; 28 };
18 RegisterHandlers(functions); 29 RegisterHandlers(functions);
19} 30}
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index 715206493..7c319ee67 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -580,7 +580,48 @@ public:
580 ISystemDisplayService() : ServiceFramework("ISystemDisplayService") { 580 ISystemDisplayService() : ServiceFramework("ISystemDisplayService") {
581 static const FunctionInfo functions[] = { 581 static const FunctionInfo functions[] = {
582 {1200, nullptr, "GetZOrderCountMin"}, 582 {1200, nullptr, "GetZOrderCountMin"},
583 {1202, nullptr, "GetZOrderCountMax"},
584 {1203, nullptr, "GetDisplayLogicalResolution"},
585 {1204, nullptr, "SetDisplayMagnification"},
586 {2201, nullptr, "SetLayerPosition"},
587 {2203, nullptr, "SetLayerSize"},
588 {2204, nullptr, "GetLayerZ"},
583 {2205, &ISystemDisplayService::SetLayerZ, "SetLayerZ"}, 589 {2205, &ISystemDisplayService::SetLayerZ, "SetLayerZ"},
590 {2207, nullptr, "SetLayerVisibility"},
591 {2209, nullptr, "SetLayerAlpha"},
592 {2312, nullptr, "CreateStrayLayer"},
593 {2400, nullptr, "OpenIndirectLayer"},
594 {2401, nullptr, "CloseIndirectLayer"},
595 {2402, nullptr, "FlipIndirectLayer"},
596 {3000, nullptr, "ListDisplayModes"},
597 {3001, nullptr, "ListDisplayRgbRanges"},
598 {3002, nullptr, "ListDisplayContentTypes"},
599 {3200, nullptr, "GetDisplayMode"},
600 {3201, nullptr, "SetDisplayMode"},
601 {3202, nullptr, "GetDisplayUnderscan"},
602 {3203, nullptr, "SetDisplayUnderscan"},
603 {3204, nullptr, "GetDisplayContentType"},
604 {3205, nullptr, "SetDisplayContentType"},
605 {3206, nullptr, "GetDisplayRgbRange"},
606 {3207, nullptr, "SetDisplayRgbRange"},
607 {3208, nullptr, "GetDisplayCmuMode"},
608 {3209, nullptr, "SetDisplayCmuMode"},
609 {3210, nullptr, "GetDisplayContrastRatio"},
610 {3211, nullptr, "SetDisplayContrastRatio"},
611 {3214, nullptr, "GetDisplayGamma"},
612 {3215, nullptr, "SetDisplayGamma"},
613 {3216, nullptr, "GetDisplayCmuLuma"},
614 {3217, nullptr, "SetDisplayCmuLuma"},
615 {8225, nullptr, "GetSharedBufferMemoryHandleId"},
616 {8250, nullptr, "OpenSharedLayer"},
617 {8251, nullptr, "CloseSharedLayer"},
618 {8252, nullptr, "ConnectSharedLayer"},
619 {8253, nullptr, "DisconnectSharedLayer"},
620 {8254, nullptr, "AcquireSharedFrameBuffer"},
621 {8255, nullptr, "PresentSharedFrameBuffer"},
622 {8256, nullptr, "GetSharedFrameBufferAcquirableEvent"},
623 {8257, nullptr, "FillSharedFrameBufferColor"},
624 {8258, nullptr, "CancelSharedFrameBuffer"},
584 }; 625 };
585 RegisterHandlers(functions); 626 RegisterHandlers(functions);
586 } 627 }
@@ -603,10 +644,72 @@ public:
603 explicit IManagerDisplayService(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger) 644 explicit IManagerDisplayService(std::shared_ptr<NVFlinger::NVFlinger> nv_flinger)
604 : ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) { 645 : ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) {
605 static const FunctionInfo functions[] = { 646 static const FunctionInfo functions[] = {
647 {200, nullptr, "AllocateProcessHeapBlock"},
648 {201, nullptr, "FreeProcessHeapBlock"},
606 {1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"}, 649 {1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"},
607 {1102, nullptr, "GetDisplayResolution"}, 650 {1102, nullptr, "GetDisplayResolution"},
608 {2010, &IManagerDisplayService::CreateManagedLayer, "CreateManagedLayer"}, 651 {2010, &IManagerDisplayService::CreateManagedLayer, "CreateManagedLayer"},
652 {2011, nullptr, "DestroyManagedLayer"},
653 {2050, nullptr, "CreateIndirectLayer"},
654 {2051, nullptr, "DestroyIndirectLayer"},
655 {2052, nullptr, "CreateIndirectProducerEndPoint"},
656 {2053, nullptr, "DestroyIndirectProducerEndPoint"},
657 {2054, nullptr, "CreateIndirectConsumerEndPoint"},
658 {2055, nullptr, "DestroyIndirectConsumerEndPoint"},
659 {2300, nullptr, "AcquireLayerTexturePresentingEvent"},
660 {2301, nullptr, "ReleaseLayerTexturePresentingEvent"},
661 {2302, nullptr, "GetDisplayHotplugEvent"},
662 {2402, nullptr, "GetDisplayHotplugState"},
663 {2501, nullptr, "GetCompositorErrorInfo"},
664 {2601, nullptr, "GetDisplayErrorEvent"},
665 {4201, nullptr, "SetDisplayAlpha"},
666 {4203, nullptr, "SetDisplayLayerStack"},
667 {4205, nullptr, "SetDisplayPowerState"},
668 {4206, nullptr, "SetDefaultDisplay"},
609 {6000, &IManagerDisplayService::AddToLayerStack, "AddToLayerStack"}, 669 {6000, &IManagerDisplayService::AddToLayerStack, "AddToLayerStack"},
670 {6001, nullptr, "RemoveFromLayerStack"},
671 {6002, nullptr, "SetLayerVisibility"},
672 {6003, nullptr, "SetLayerConfig"},
673 {6004, nullptr, "AttachLayerPresentationTracer"},
674 {6005, nullptr, "DetachLayerPresentationTracer"},
675 {6006, nullptr, "StartLayerPresentationRecording"},
676 {6007, nullptr, "StopLayerPresentationRecording"},
677 {6008, nullptr, "StartLayerPresentationFenceWait"},
678 {6009, nullptr, "StopLayerPresentationFenceWait"},
679 {6010, nullptr, "GetLayerPresentationAllFencesExpiredEvent"},
680 {7000, nullptr, "SetContentVisibility"},
681 {8000, nullptr, "SetConductorLayer"},
682 {8100, nullptr, "SetIndirectProducerFlipOffset"},
683 {8200, nullptr, "CreateSharedBufferStaticStorage"},
684 {8201, nullptr, "CreateSharedBufferTransferMemory"},
685 {8202, nullptr, "DestroySharedBuffer"},
686 {8203, nullptr, "BindSharedLowLevelLayerToManagedLayer"},
687 {8204, nullptr, "BindSharedLowLevelLayerToIndirectLayer"},
688 {8207, nullptr, "UnbindSharedLowLevelLayer"},
689 {8208, nullptr, "ConnectSharedLowLevelLayerToSharedBuffer"},
690 {8209, nullptr, "DisconnectSharedLowLevelLayerFromSharedBuffer"},
691 {8210, nullptr, "CreateSharedLayer"},
692 {8211, nullptr, "DestroySharedLayer"},
693 {8216, nullptr, "AttachSharedLayerToLowLevelLayer"},
694 {8217, nullptr, "ForceDetachSharedLayerFromLowLevelLayer"},
695 {8218, nullptr, "StartDetachSharedLayerFromLowLevelLayer"},
696 {8219, nullptr, "FinishDetachSharedLayerFromLowLevelLayer"},
697 {8220, nullptr, "GetSharedLayerDetachReadyEvent"},
698 {8221, nullptr, "GetSharedLowLevelLayerSynchronizedEvent"},
699 {8222, nullptr, "CheckSharedLowLevelLayerSynchronized"},
700 {8223, nullptr, "RegisterSharedBufferImporterAruid"},
701 {8224, nullptr, "UnregisterSharedBufferImporterAruid"},
702 {8227, nullptr, "CreateSharedBufferProcessHeap"},
703 {8228, nullptr, "GetSharedLayerLayerStacks"},
704 {8229, nullptr, "SetSharedLayerLayerStacks"},
705 {8291, nullptr, "PresentDetachedSharedFrameBufferToLowLevelLayer"},
706 {8292, nullptr, "FillDetachedSharedFrameBufferColor"},
707 {8293, nullptr, "GetDetachedSharedFrameBufferImage"},
708 {8294, nullptr, "SetDetachedSharedFrameBufferImage"},
709 {8295, nullptr, "CopyDetachedSharedFrameBufferImage"},
710 {8296, nullptr, "SetDetachedSharedFrameBufferSubImage"},
711 {8297, nullptr, "GetSharedFrameBufferContentParameter"},
712 {8298, nullptr, "ExpandStartupLogoOnSharedFrameBuffer"},
610 }; 713 };
611 RegisterHandlers(functions); 714 RegisterHandlers(functions);
612 } 715 }
@@ -825,13 +928,21 @@ IApplicationDisplayService::IApplicationDisplayService(
825 "GetIndirectDisplayTransactionService"}, 928 "GetIndirectDisplayTransactionService"},
826 {1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"}, 929 {1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"},
827 {1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"}, 930 {1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"},
931 {1011, nullptr, "OpenDefaultDisplay"},
828 {1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"}, 932 {1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"},
933 {1101, nullptr, "SetDisplayEnabled"},
829 {1102, &IApplicationDisplayService::GetDisplayResolution, "GetDisplayResolution"}, 934 {1102, &IApplicationDisplayService::GetDisplayResolution, "GetDisplayResolution"},
830 {2101, &IApplicationDisplayService::SetLayerScalingMode, "SetLayerScalingMode"},
831 {2020, &IApplicationDisplayService::OpenLayer, "OpenLayer"}, 935 {2020, &IApplicationDisplayService::OpenLayer, "OpenLayer"},
936 {2021, nullptr, "CloseLayer"},
832 {2030, &IApplicationDisplayService::CreateStrayLayer, "CreateStrayLayer"}, 937 {2030, &IApplicationDisplayService::CreateStrayLayer, "CreateStrayLayer"},
833 {2031, &IApplicationDisplayService::DestroyStrayLayer, "DestroyStrayLayer"}, 938 {2031, &IApplicationDisplayService::DestroyStrayLayer, "DestroyStrayLayer"},
939 {2101, &IApplicationDisplayService::SetLayerScalingMode, "SetLayerScalingMode"},
940 {2102, nullptr, "ConvertScalingMode"},
941 {2450, nullptr, "GetIndirectLayerImageMap"},
942 {2451, nullptr, "GetIndirectLayerImageCropMap"},
943 {2460, nullptr, "GetIndirectLayerImageRequiredMemoryInfo"},
834 {5202, &IApplicationDisplayService::GetDisplayVsyncEvent, "GetDisplayVsyncEvent"}, 944 {5202, &IApplicationDisplayService::GetDisplayVsyncEvent, "GetDisplayVsyncEvent"},
945 {5203, nullptr, "GetDisplayVsyncEventForDebug"},
835 }; 946 };
836 RegisterHandlers(functions); 947 RegisterHandlers(functions);
837} 948}
diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/core/hle/service/vi/vi_u.cpp
index 14e375b86..d675dfd9e 100644
--- a/src/core/hle/service/vi/vi_u.cpp
+++ b/src/core/hle/service/vi/vi_u.cpp
@@ -11,7 +11,6 @@ VI_U::VI_U(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger>
11 : Module::Interface(std::move(module), "vi:u", std::move(nv_flinger)) { 11 : Module::Interface(std::move(module), "vi:u", std::move(nv_flinger)) {
12 static const FunctionInfo functions[] = { 12 static const FunctionInfo functions[] = {
13 {0, &VI_U::GetDisplayService, "GetDisplayService"}, 13 {0, &VI_U::GetDisplayService, "GetDisplayService"},
14 {3, nullptr, "GetDisplayServiceWithProxyNameExchange"},
15 }; 14 };
16 RegisterHandlers(functions); 15 RegisterHandlers(functions);
17} 16}