summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar german772021-04-08 13:12:42 -0600
committerGravatar german772021-04-08 19:40:25 -0600
commit278c38aa4a3d6571f8ebcab24baab654f176ebb2 (patch)
treed74b1a244157a6eec764ca9d2c43d06a5c2680e1 /src
parentarp: Use proper names, update to 12.x (diff)
downloadyuzu-278c38aa4a3d6571f8ebcab24baab654f176ebb2.tar.gz
yuzu-278c38aa4a3d6571f8ebcab24baab654f176ebb2.tar.xz
yuzu-278c38aa4a3d6571f8ebcab24baab654f176ebb2.zip
ldr: Use proper names
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/ldr/ldr.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index d111c1357..c8bc60ad1 100644
--- a/src/core/hle/service/ldr/ldr.cpp
+++ b/src/core/hle/service/ldr/ldr.cpp
@@ -118,9 +118,9 @@ public:
118 explicit DebugMonitor(Core::System& system_) : ServiceFramework{system_, "ldr:dmnt"} { 118 explicit DebugMonitor(Core::System& system_) : ServiceFramework{system_, "ldr:dmnt"} {
119 // clang-format off 119 // clang-format off
120 static const FunctionInfo functions[] = { 120 static const FunctionInfo functions[] = {
121 {0, nullptr, "AddProcessToDebugLaunchQueue"}, 121 {0, nullptr, "SetProgramArgument"},
122 {1, nullptr, "ClearDebugLaunchQueue"}, 122 {1, nullptr, "FlushArguments"},
123 {2, nullptr, "GetNsoInfos"}, 123 {2, nullptr, "GetProcessModuleInfo"},
124 }; 124 };
125 // clang-format on 125 // clang-format on
126 126
@@ -135,8 +135,8 @@ public:
135 static const FunctionInfo functions[] = { 135 static const FunctionInfo functions[] = {
136 {0, nullptr, "CreateProcess"}, 136 {0, nullptr, "CreateProcess"},
137 {1, nullptr, "GetProgramInfo"}, 137 {1, nullptr, "GetProgramInfo"},
138 {2, nullptr, "RegisterTitle"}, 138 {2, nullptr, "PinProgram"},
139 {3, nullptr, "UnregisterTitle"}, 139 {3, nullptr, "UnpinProgram"},
140 {4, nullptr, "SetEnabledProgramVerification"}, 140 {4, nullptr, "SetEnabledProgramVerification"},
141 }; 141 };
142 // clang-format on 142 // clang-format on
@@ -150,8 +150,8 @@ public:
150 explicit Shell(Core::System& system_) : ServiceFramework{system_, "ldr:shel"} { 150 explicit Shell(Core::System& system_) : ServiceFramework{system_, "ldr:shel"} {
151 // clang-format off 151 // clang-format off
152 static const FunctionInfo functions[] = { 152 static const FunctionInfo functions[] = {
153 {0, nullptr, "AddProcessToLaunchQueue"}, 153 {0, nullptr, "SetProgramArgument"},
154 {1, nullptr, "ClearLaunchQueue"}, 154 {1, nullptr, "FlushArguments"},
155 }; 155 };
156 // clang-format on 156 // clang-format on
157 157
@@ -164,19 +164,19 @@ public:
164 explicit RelocatableObject(Core::System& system_) : ServiceFramework{system_, "ldr:ro"} { 164 explicit RelocatableObject(Core::System& system_) : ServiceFramework{system_, "ldr:ro"} {
165 // clang-format off 165 // clang-format off
166 static const FunctionInfo functions[] = { 166 static const FunctionInfo functions[] = {
167 {0, &RelocatableObject::LoadNro, "LoadNro"}, 167 {0, &RelocatableObject::LoadModule, "LoadModule"},
168 {1, &RelocatableObject::UnloadNro, "UnloadNro"}, 168 {1, &RelocatableObject::UnloadModule, "UnloadModule"},
169 {2, &RelocatableObject::LoadNrr, "LoadNrr"}, 169 {2, &RelocatableObject::RegisterModuleInfo, "RegisterModuleInfo"},
170 {3, &RelocatableObject::UnloadNrr, "UnloadNrr"}, 170 {3, &RelocatableObject::UnregisterModuleInfo, "UnregisterModuleInfo"},
171 {4, &RelocatableObject::Initialize, "Initialize"}, 171 {4, &RelocatableObject::Initialize, "Initialize"},
172 {10, nullptr, "LoadNrrEx"}, 172 {10, nullptr, "RegisterModuleInfo2"},
173 }; 173 };
174 // clang-format on 174 // clang-format on
175 175
176 RegisterHandlers(functions); 176 RegisterHandlers(functions);
177 } 177 }
178 178
179 void LoadNrr(Kernel::HLERequestContext& ctx) { 179 void RegisterModuleInfo(Kernel::HLERequestContext& ctx) {
180 struct Parameters { 180 struct Parameters {
181 u64_le process_id; 181 u64_le process_id;
182 u64_le nrr_address; 182 u64_le nrr_address;
@@ -273,7 +273,7 @@ public:
273 rb.Push(RESULT_SUCCESS); 273 rb.Push(RESULT_SUCCESS);
274 } 274 }
275 275
276 void UnloadNrr(Kernel::HLERequestContext& ctx) { 276 void UnregisterModuleInfo(Kernel::HLERequestContext& ctx) {
277 IPC::RequestParser rp{ctx}; 277 IPC::RequestParser rp{ctx};
278 const auto pid = rp.Pop<u64>(); 278 const auto pid = rp.Pop<u64>();
279 const auto nrr_address = rp.Pop<VAddr>(); 279 const auto nrr_address = rp.Pop<VAddr>();
@@ -408,7 +408,7 @@ public:
408 data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite); 408 data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite);
409 } 409 }
410 410
411 void LoadNro(Kernel::HLERequestContext& ctx) { 411 void LoadModule(Kernel::HLERequestContext& ctx) {
412 struct Parameters { 412 struct Parameters {
413 u64_le process_id; 413 u64_le process_id;
414 u64_le image_address; 414 u64_le image_address;
@@ -546,7 +546,7 @@ public:
546 return RESULT_SUCCESS; 546 return RESULT_SUCCESS;
547 } 547 }
548 548
549 void UnloadNro(Kernel::HLERequestContext& ctx) { 549 void UnloadModule(Kernel::HLERequestContext& ctx) {
550 if (!initialized) { 550 if (!initialized) {
551 LOG_ERROR(Service_LDR, "LDR:RO not initialized before use!"); 551 LOG_ERROR(Service_LDR, "LDR:RO not initialized before use!");
552 IPC::ResponseBuilder rb{ctx, 2}; 552 IPC::ResponseBuilder rb{ctx, 2};