summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/acc/acc.cpp20
-rw-r--r--src/core/hle/service/am/am.cpp64
-rw-r--r--src/core/hle/service/am/applet_ae.cpp18
-rw-r--r--src/core/hle/service/am/applet_oe.cpp18
-rw-r--r--src/core/hle/service/aoc/aoc_u.cpp4
-rw-r--r--src/core/hle/service/apm/interface.cpp6
-rw-r--r--src/core/hle/service/audio/audout_u.cpp16
-rw-r--r--src/core/hle/service/audio/audren_u.cpp26
-rw-r--r--src/core/hle/service/fatal/fatal.cpp4
-rw-r--r--src/core/hle/service/filesystem/filesystem.cpp8
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp51
-rw-r--r--src/core/hle/service/friend/friend.cpp2
-rw-r--r--src/core/hle/service/hid/hid.cpp50
-rw-r--r--src/core/hle/service/lm/lm.cpp12
-rw-r--r--src/core/hle/service/nfp/nfp.cpp2
-rw-r--r--src/core/hle/service/nifm/nifm.cpp22
-rw-r--r--src/core/hle/service/ns/pl_u.cpp12
-rw-r--r--src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp6
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp26
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp12
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp16
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp37
-rw-r--r--src/core/hle/service/nvdrv/devices/nvmap.cpp10
-rw-r--r--src/core/hle/service/nvdrv/interface.cpp14
-rw-r--r--src/core/hle/service/nvflinger/buffer_queue.cpp4
-rw-r--r--src/core/hle/service/nvflinger/nvflinger.cpp2
-rw-r--r--src/core/hle/service/pctl/pctl_a.cpp2
-rw-r--r--src/core/hle/service/service.cpp10
-rw-r--r--src/core/hle/service/set/set.cpp2
-rw-r--r--src/core/hle/service/set/set_sys.cpp2
-rw-r--r--src/core/hle/service/sm/controller.cpp8
-rw-r--r--src/core/hle/service/sm/sm.cpp9
-rw-r--r--src/core/hle/service/sockets/bsd.cpp13
-rw-r--r--src/core/hle/service/sockets/sfdnsres.cpp2
-rw-r--r--src/core/hle/service/spl/module.cpp2
-rw-r--r--src/core/hle/service/ssl/ssl.cpp6
-rw-r--r--src/core/hle/service/time/time.cpp24
-rw-r--r--src/core/hle/service/vi/vi.cpp53
38 files changed, 298 insertions, 297 deletions
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index 6bafb2dce..f2fffa760 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -47,7 +47,7 @@ public:
47 47
48private: 48private:
49 void GetBase(Kernel::HLERequestContext& ctx) { 49 void GetBase(Kernel::HLERequestContext& ctx) {
50 LOG_WARNING(Service_ACC, "(STUBBED) called"); 50 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
51 ProfileBase profile_base{}; 51 ProfileBase profile_base{};
52 IPC::ResponseBuilder rb{ctx, 16}; 52 IPC::ResponseBuilder rb{ctx, 16};
53 rb.Push(RESULT_SUCCESS); 53 rb.Push(RESULT_SUCCESS);
@@ -72,14 +72,14 @@ public:
72 72
73private: 73private:
74 void CheckAvailability(Kernel::HLERequestContext& ctx) { 74 void CheckAvailability(Kernel::HLERequestContext& ctx) {
75 LOG_WARNING(Service_ACC, "(STUBBED) called"); 75 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
76 IPC::ResponseBuilder rb{ctx, 3}; 76 IPC::ResponseBuilder rb{ctx, 3};
77 rb.Push(RESULT_SUCCESS); 77 rb.Push(RESULT_SUCCESS);
78 rb.Push(true); // TODO: Check when this is supposed to return true and when not 78 rb.Push(true); // TODO: Check when this is supposed to return true and when not
79 } 79 }
80 80
81 void GetAccountId(Kernel::HLERequestContext& ctx) { 81 void GetAccountId(Kernel::HLERequestContext& ctx) {
82 LOG_WARNING(Service_ACC, "(STUBBED) called"); 82 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
83 IPC::ResponseBuilder rb{ctx, 4}; 83 IPC::ResponseBuilder rb{ctx, 4};
84 rb.Push(RESULT_SUCCESS); 84 rb.Push(RESULT_SUCCESS);
85 rb.Push<u64>(0x12345678ABCDEF); 85 rb.Push<u64>(0x12345678ABCDEF);
@@ -87,14 +87,14 @@ private:
87}; 87};
88 88
89void Module::Interface::GetUserExistence(Kernel::HLERequestContext& ctx) { 89void Module::Interface::GetUserExistence(Kernel::HLERequestContext& ctx) {
90 LOG_WARNING(Service_ACC, "(STUBBED) called"); 90 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
91 IPC::ResponseBuilder rb{ctx, 3}; 91 IPC::ResponseBuilder rb{ctx, 3};
92 rb.Push(RESULT_SUCCESS); 92 rb.Push(RESULT_SUCCESS);
93 rb.Push(true); // TODO: Check when this is supposed to return true and when not 93 rb.Push(true); // TODO: Check when this is supposed to return true and when not
94} 94}
95 95
96void Module::Interface::ListAllUsers(Kernel::HLERequestContext& ctx) { 96void Module::Interface::ListAllUsers(Kernel::HLERequestContext& ctx) {
97 LOG_WARNING(Service_ACC, "(STUBBED) called"); 97 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
98 constexpr std::array<u128, 10> user_ids{DEFAULT_USER_ID}; 98 constexpr std::array<u128, 10> user_ids{DEFAULT_USER_ID};
99 ctx.WriteBuffer(user_ids.data(), user_ids.size()); 99 ctx.WriteBuffer(user_ids.data(), user_ids.size());
100 IPC::ResponseBuilder rb{ctx, 2}; 100 IPC::ResponseBuilder rb{ctx, 2};
@@ -102,7 +102,7 @@ void Module::Interface::ListAllUsers(Kernel::HLERequestContext& ctx) {
102} 102}
103 103
104void Module::Interface::ListOpenUsers(Kernel::HLERequestContext& ctx) { 104void Module::Interface::ListOpenUsers(Kernel::HLERequestContext& ctx) {
105 LOG_WARNING(Service_ACC, "(STUBBED) called"); 105 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
106 constexpr std::array<u128, 10> user_ids{DEFAULT_USER_ID}; 106 constexpr std::array<u128, 10> user_ids{DEFAULT_USER_ID};
107 ctx.WriteBuffer(user_ids.data(), user_ids.size()); 107 ctx.WriteBuffer(user_ids.data(), user_ids.size());
108 IPC::ResponseBuilder rb{ctx, 2}; 108 IPC::ResponseBuilder rb{ctx, 2};
@@ -113,11 +113,11 @@ void Module::Interface::GetProfile(Kernel::HLERequestContext& ctx) {
113 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 113 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
114 rb.Push(RESULT_SUCCESS); 114 rb.Push(RESULT_SUCCESS);
115 rb.PushIpcInterface<IProfile>(); 115 rb.PushIpcInterface<IProfile>();
116 LOG_DEBUG(Service_ACC, "called"); 116 NGLOG_DEBUG(Service_ACC, "called");
117} 117}
118 118
119void Module::Interface::InitializeApplicationInfo(Kernel::HLERequestContext& ctx) { 119void Module::Interface::InitializeApplicationInfo(Kernel::HLERequestContext& ctx) {
120 LOG_WARNING(Service_ACC, "(STUBBED) called"); 120 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
121 IPC::ResponseBuilder rb{ctx, 2}; 121 IPC::ResponseBuilder rb{ctx, 2};
122 rb.Push(RESULT_SUCCESS); 122 rb.Push(RESULT_SUCCESS);
123} 123}
@@ -126,11 +126,11 @@ void Module::Interface::GetBaasAccountManagerForApplication(Kernel::HLERequestCo
126 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 126 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
127 rb.Push(RESULT_SUCCESS); 127 rb.Push(RESULT_SUCCESS);
128 rb.PushIpcInterface<IManagerForApplication>(); 128 rb.PushIpcInterface<IManagerForApplication>();
129 LOG_DEBUG(Service_ACC, "called"); 129 NGLOG_DEBUG(Service_ACC, "called");
130} 130}
131 131
132void Module::Interface::GetLastOpenedUser(Kernel::HLERequestContext& ctx) { 132void Module::Interface::GetLastOpenedUser(Kernel::HLERequestContext& ctx) {
133 LOG_WARNING(Service_ACC, "(STUBBED) called"); 133 NGLOG_WARNING(Service_ACC, "(STUBBED) called");
134 IPC::ResponseBuilder rb{ctx, 6}; 134 IPC::ResponseBuilder rb{ctx, 6};
135 rb.Push(RESULT_SUCCESS); 135 rb.Push(RESULT_SUCCESS);
136 rb.PushRaw(DEFAULT_USER_ID); 136 rb.PushRaw(DEFAULT_USER_ID);
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index f41a59afe..19fadcb8e 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -28,14 +28,14 @@ IWindowController::IWindowController() : ServiceFramework("IWindowController") {
28} 28}
29 29
30void IWindowController::GetAppletResourceUserId(Kernel::HLERequestContext& ctx) { 30void IWindowController::GetAppletResourceUserId(Kernel::HLERequestContext& ctx) {
31 LOG_WARNING(Service_AM, "(STUBBED) called"); 31 NGLOG_WARNING(Service_AM, "(STUBBED) called");
32 IPC::ResponseBuilder rb{ctx, 4}; 32 IPC::ResponseBuilder rb{ctx, 4};
33 rb.Push(RESULT_SUCCESS); 33 rb.Push(RESULT_SUCCESS);
34 rb.Push<u64>(0); 34 rb.Push<u64>(0);
35} 35}
36 36
37void IWindowController::AcquireForegroundRights(Kernel::HLERequestContext& ctx) { 37void IWindowController::AcquireForegroundRights(Kernel::HLERequestContext& ctx) {
38 LOG_WARNING(Service_AM, "(STUBBED) called"); 38 NGLOG_WARNING(Service_AM, "(STUBBED) called");
39 IPC::ResponseBuilder rb{ctx, 2}; 39 IPC::ResponseBuilder rb{ctx, 2};
40 rb.Push(RESULT_SUCCESS); 40 rb.Push(RESULT_SUCCESS);
41} 41}
@@ -54,20 +54,20 @@ IAudioController::IAudioController() : ServiceFramework("IAudioController") {
54} 54}
55 55
56void IAudioController::SetExpectedMasterVolume(Kernel::HLERequestContext& ctx) { 56void IAudioController::SetExpectedMasterVolume(Kernel::HLERequestContext& ctx) {
57 LOG_WARNING(Service_AM, "(STUBBED) called"); 57 NGLOG_WARNING(Service_AM, "(STUBBED) called");
58 IPC::ResponseBuilder rb{ctx, 2}; 58 IPC::ResponseBuilder rb{ctx, 2};
59 rb.Push(RESULT_SUCCESS); 59 rb.Push(RESULT_SUCCESS);
60} 60}
61 61
62void IAudioController::GetMainAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx) { 62void IAudioController::GetMainAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx) {
63 LOG_WARNING(Service_AM, "(STUBBED) called"); 63 NGLOG_WARNING(Service_AM, "(STUBBED) called");
64 IPC::ResponseBuilder rb{ctx, 3}; 64 IPC::ResponseBuilder rb{ctx, 3};
65 rb.Push(RESULT_SUCCESS); 65 rb.Push(RESULT_SUCCESS);
66 rb.Push(volume); 66 rb.Push(volume);
67} 67}
68 68
69void IAudioController::GetLibraryAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx) { 69void IAudioController::GetLibraryAppletExpectedMasterVolume(Kernel::HLERequestContext& ctx) {
70 LOG_WARNING(Service_AM, "(STUBBED) called"); 70 NGLOG_WARNING(Service_AM, "(STUBBED) called");
71 IPC::ResponseBuilder rb{ctx, 3}; 71 IPC::ResponseBuilder rb{ctx, 3};
72 rb.Push(RESULT_SUCCESS); 72 rb.Push(RESULT_SUCCESS);
73 rb.Push(volume); 73 rb.Push(volume);
@@ -139,14 +139,14 @@ void ISelfController::SetFocusHandlingMode(Kernel::HLERequestContext& ctx) {
139 IPC::ResponseBuilder rb{ctx, 2}; 139 IPC::ResponseBuilder rb{ctx, 2};
140 rb.Push(RESULT_SUCCESS); 140 rb.Push(RESULT_SUCCESS);
141 141
142 LOG_WARNING(Service_AM, "(STUBBED) called"); 142 NGLOG_WARNING(Service_AM, "(STUBBED) called");
143} 143}
144 144
145void ISelfController::SetRestartMessageEnabled(Kernel::HLERequestContext& ctx) { 145void ISelfController::SetRestartMessageEnabled(Kernel::HLERequestContext& ctx) {
146 IPC::ResponseBuilder rb{ctx, 2}; 146 IPC::ResponseBuilder rb{ctx, 2};
147 rb.Push(RESULT_SUCCESS); 147 rb.Push(RESULT_SUCCESS);
148 148
149 LOG_WARNING(Service_AM, "(STUBBED) called"); 149 NGLOG_WARNING(Service_AM, "(STUBBED) called");
150} 150}
151 151
152void ISelfController::SetPerformanceModeChangedNotification(Kernel::HLERequestContext& ctx) { 152void ISelfController::SetPerformanceModeChangedNotification(Kernel::HLERequestContext& ctx) {
@@ -157,14 +157,14 @@ void ISelfController::SetPerformanceModeChangedNotification(Kernel::HLERequestCo
157 IPC::ResponseBuilder rb{ctx, 2}; 157 IPC::ResponseBuilder rb{ctx, 2};
158 rb.Push(RESULT_SUCCESS); 158 rb.Push(RESULT_SUCCESS);
159 159
160 LOG_WARNING(Service_AM, "(STUBBED) called flag=%u", static_cast<u32>(flag)); 160 NGLOG_WARNING(Service_AM, "(STUBBED) called flag={}", flag);
161} 161}
162 162
163void ISelfController::SetScreenShotPermission(Kernel::HLERequestContext& ctx) { 163void ISelfController::SetScreenShotPermission(Kernel::HLERequestContext& ctx) {
164 IPC::ResponseBuilder rb{ctx, 2}; 164 IPC::ResponseBuilder rb{ctx, 2};
165 rb.Push(RESULT_SUCCESS); 165 rb.Push(RESULT_SUCCESS);
166 166
167 LOG_WARNING(Service_AM, "(STUBBED) called"); 167 NGLOG_WARNING(Service_AM, "(STUBBED) called");
168} 168}
169 169
170void ISelfController::SetOperationModeChangedNotification(Kernel::HLERequestContext& ctx) { 170void ISelfController::SetOperationModeChangedNotification(Kernel::HLERequestContext& ctx) {
@@ -175,7 +175,7 @@ void ISelfController::SetOperationModeChangedNotification(Kernel::HLERequestCont
175 IPC::ResponseBuilder rb{ctx, 2}; 175 IPC::ResponseBuilder rb{ctx, 2};
176 rb.Push(RESULT_SUCCESS); 176 rb.Push(RESULT_SUCCESS);
177 177
178 LOG_WARNING(Service_AM, "(STUBBED) called flag=%u", static_cast<u32>(flag)); 178 NGLOG_WARNING(Service_AM, "(STUBBED) called flag={}", flag);
179} 179}
180 180
181void ISelfController::SetOutOfFocusSuspendingEnabled(Kernel::HLERequestContext& ctx) { 181void ISelfController::SetOutOfFocusSuspendingEnabled(Kernel::HLERequestContext& ctx) {
@@ -188,21 +188,21 @@ void ISelfController::SetOutOfFocusSuspendingEnabled(Kernel::HLERequestContext&
188 IPC::ResponseBuilder rb{ctx, 2}; 188 IPC::ResponseBuilder rb{ctx, 2};
189 rb.Push(RESULT_SUCCESS); 189 rb.Push(RESULT_SUCCESS);
190 190
191 LOG_WARNING(Service_AM, "(STUBBED) called enabled=%u", static_cast<u32>(enabled)); 191 NGLOG_WARNING(Service_AM, "(STUBBED) called enabled={}", enabled);
192} 192}
193 193
194void ISelfController::LockExit(Kernel::HLERequestContext& ctx) { 194void ISelfController::LockExit(Kernel::HLERequestContext& ctx) {
195 IPC::ResponseBuilder rb{ctx, 2}; 195 IPC::ResponseBuilder rb{ctx, 2};
196 rb.Push(RESULT_SUCCESS); 196 rb.Push(RESULT_SUCCESS);
197 197
198 LOG_WARNING(Service_AM, "(STUBBED) called"); 198 NGLOG_WARNING(Service_AM, "(STUBBED) called");
199} 199}
200 200
201void ISelfController::UnlockExit(Kernel::HLERequestContext& ctx) { 201void ISelfController::UnlockExit(Kernel::HLERequestContext& ctx) {
202 IPC::ResponseBuilder rb{ctx, 2}; 202 IPC::ResponseBuilder rb{ctx, 2};
203 rb.Push(RESULT_SUCCESS); 203 rb.Push(RESULT_SUCCESS);
204 204
205 LOG_WARNING(Service_AM, "(STUBBED) called"); 205 NGLOG_WARNING(Service_AM, "(STUBBED) called");
206} 206}
207 207
208void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx) { 208void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext& ctx) {
@@ -212,7 +212,7 @@ void ISelfController::GetLibraryAppletLaunchableEvent(Kernel::HLERequestContext&
212 rb.Push(RESULT_SUCCESS); 212 rb.Push(RESULT_SUCCESS);
213 rb.PushCopyObjects(launchable_event); 213 rb.PushCopyObjects(launchable_event);
214 214
215 LOG_WARNING(Service_AM, "(STUBBED) called"); 215 NGLOG_WARNING(Service_AM, "(STUBBED) called");
216} 216}
217 217
218void ISelfController::CreateManagedDisplayLayer(Kernel::HLERequestContext& ctx) { 218void ISelfController::CreateManagedDisplayLayer(Kernel::HLERequestContext& ctx) {
@@ -225,7 +225,7 @@ void ISelfController::CreateManagedDisplayLayer(Kernel::HLERequestContext& ctx)
225 rb.Push(RESULT_SUCCESS); 225 rb.Push(RESULT_SUCCESS);
226 rb.Push(layer_id); 226 rb.Push(layer_id);
227 227
228 LOG_WARNING(Service_AM, "(STUBBED) called"); 228 NGLOG_WARNING(Service_AM, "(STUBBED) called");
229} 229}
230 230
231ICommonStateGetter::ICommonStateGetter() : ServiceFramework("ICommonStateGetter") { 231ICommonStateGetter::ICommonStateGetter() : ServiceFramework("ICommonStateGetter") {
@@ -269,7 +269,7 @@ void ICommonStateGetter::GetEventHandle(Kernel::HLERequestContext& ctx) {
269 rb.Push(RESULT_SUCCESS); 269 rb.Push(RESULT_SUCCESS);
270 rb.PushCopyObjects(event); 270 rb.PushCopyObjects(event);
271 271
272 LOG_WARNING(Service_AM, "(STUBBED) called"); 272 NGLOG_WARNING(Service_AM, "(STUBBED) called");
273} 273}
274 274
275void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) { 275void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) {
@@ -277,7 +277,7 @@ void ICommonStateGetter::ReceiveMessage(Kernel::HLERequestContext& ctx) {
277 rb.Push(RESULT_SUCCESS); 277 rb.Push(RESULT_SUCCESS);
278 rb.Push<u32>(15); 278 rb.Push<u32>(15);
279 279
280 LOG_WARNING(Service_AM, "(STUBBED) called"); 280 NGLOG_WARNING(Service_AM, "(STUBBED) called");
281} 281}
282 282
283void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) { 283void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) {
@@ -285,7 +285,7 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) {
285 rb.Push(RESULT_SUCCESS); 285 rb.Push(RESULT_SUCCESS);
286 rb.Push(static_cast<u8>(FocusState::InFocus)); 286 rb.Push(static_cast<u8>(FocusState::InFocus));
287 287
288 LOG_WARNING(Service_AM, "(STUBBED) called"); 288 NGLOG_WARNING(Service_AM, "(STUBBED) called");
289} 289}
290 290
291void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { 291void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) {
@@ -294,7 +294,7 @@ void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) {
294 rb.Push(RESULT_SUCCESS); 294 rb.Push(RESULT_SUCCESS);
295 rb.Push(static_cast<u8>(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld)); 295 rb.Push(static_cast<u8>(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld));
296 296
297 LOG_WARNING(Service_AM, "(STUBBED) called"); 297 NGLOG_WARNING(Service_AM, "(STUBBED) called");
298} 298}
299 299
300void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { 300void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
@@ -304,7 +304,7 @@ void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
304 rb.Push(static_cast<u32>(use_docked_mode ? APM::PerformanceMode::Docked 304 rb.Push(static_cast<u32>(use_docked_mode ? APM::PerformanceMode::Docked
305 : APM::PerformanceMode::Handheld)); 305 : APM::PerformanceMode::Handheld));
306 306
307 LOG_WARNING(Service_AM, "(STUBBED) called"); 307 NGLOG_WARNING(Service_AM, "(STUBBED) called");
308} 308}
309 309
310class ILibraryAppletAccessor final : public ServiceFramework<ILibraryAppletAccessor> { 310class ILibraryAppletAccessor final : public ServiceFramework<ILibraryAppletAccessor> {
@@ -344,7 +344,7 @@ private:
344 rb.Push(RESULT_SUCCESS); 344 rb.Push(RESULT_SUCCESS);
345 rb.PushCopyObjects(state_changed_event); 345 rb.PushCopyObjects(state_changed_event);
346 346
347 LOG_WARNING(Service_AM, "(STUBBED) called"); 347 NGLOG_WARNING(Service_AM, "(STUBBED) called");
348 } 348 }
349 349
350 Kernel::SharedPtr<Kernel::Event> state_changed_event; 350 Kernel::SharedPtr<Kernel::Event> state_changed_event;
@@ -368,7 +368,7 @@ void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx)
368 rb.Push(RESULT_SUCCESS); 368 rb.Push(RESULT_SUCCESS);
369 rb.PushIpcInterface<AM::ILibraryAppletAccessor>(); 369 rb.PushIpcInterface<AM::ILibraryAppletAccessor>();
370 370
371 LOG_DEBUG(Service_AM, "called"); 371 NGLOG_DEBUG(Service_AM, "called");
372} 372}
373 373
374class IStorageAccessor final : public ServiceFramework<IStorageAccessor> { 374class IStorageAccessor final : public ServiceFramework<IStorageAccessor> {
@@ -392,7 +392,7 @@ private:
392 rb.Push(RESULT_SUCCESS); 392 rb.Push(RESULT_SUCCESS);
393 rb.Push(static_cast<u64>(buffer.size())); 393 rb.Push(static_cast<u64>(buffer.size()));
394 394
395 LOG_DEBUG(Service_AM, "called"); 395 NGLOG_DEBUG(Service_AM, "called");
396 } 396 }
397 397
398 void Read(Kernel::HLERequestContext& ctx) { 398 void Read(Kernel::HLERequestContext& ctx) {
@@ -410,7 +410,7 @@ private:
410 410
411 rb.Push(RESULT_SUCCESS); 411 rb.Push(RESULT_SUCCESS);
412 412
413 LOG_DEBUG(Service_AM, "called"); 413 NGLOG_DEBUG(Service_AM, "called");
414 } 414 }
415}; 415};
416 416
@@ -434,7 +434,7 @@ private:
434 rb.Push(RESULT_SUCCESS); 434 rb.Push(RESULT_SUCCESS);
435 rb.PushIpcInterface<AM::IStorageAccessor>(buffer); 435 rb.PushIpcInterface<AM::IStorageAccessor>(buffer);
436 436
437 LOG_DEBUG(Service_AM, "called"); 437 NGLOG_DEBUG(Service_AM, "called");
438 } 438 }
439}; 439};
440 440
@@ -498,14 +498,14 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
498 rb.Push(RESULT_SUCCESS); 498 rb.Push(RESULT_SUCCESS);
499 rb.PushIpcInterface<AM::IStorage>(buffer); 499 rb.PushIpcInterface<AM::IStorage>(buffer);
500 500
501 LOG_DEBUG(Service_AM, "called"); 501 NGLOG_DEBUG(Service_AM, "called");
502} 502}
503 503
504void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) { 504void IApplicationFunctions::EnsureSaveData(Kernel::HLERequestContext& ctx) {
505 IPC::RequestParser rp{ctx}; 505 IPC::RequestParser rp{ctx};
506 u128 uid = rp.PopRaw<u128>(); 506 u128 uid = rp.PopRaw<u128>();
507 507
508 LOG_WARNING(Service, "(STUBBED) called uid = %016" PRIX64 "%016" PRIX64, uid[1], uid[0]); 508 NGLOG_WARNING(Service, "(STUBBED) called uid = {:016X}{:016X}", uid[1], uid[0]);
509 509
510 IPC::ResponseBuilder rb{ctx, 4}; 510 IPC::ResponseBuilder rb{ctx, 4};
511 511
@@ -533,27 +533,27 @@ void IApplicationFunctions::SetTerminateResult(Kernel::HLERequestContext& ctx) {
533 IPC::ResponseBuilder rb{ctx, 2}; 533 IPC::ResponseBuilder rb{ctx, 2};
534 rb.Push(RESULT_SUCCESS); 534 rb.Push(RESULT_SUCCESS);
535 535
536 LOG_WARNING(Service_AM, "(STUBBED) called, result=0x%08X", result); 536 NGLOG_WARNING(Service_AM, "(STUBBED) called, result={:#010}", result);
537} 537}
538 538
539void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) { 539void IApplicationFunctions::GetDesiredLanguage(Kernel::HLERequestContext& ctx) {
540 IPC::ResponseBuilder rb{ctx, 4}; 540 IPC::ResponseBuilder rb{ctx, 4};
541 rb.Push(RESULT_SUCCESS); 541 rb.Push(RESULT_SUCCESS);
542 rb.Push<u64>(SystemLanguage::English); 542 rb.Push<u64>(SystemLanguage::English);
543 LOG_WARNING(Service_AM, "(STUBBED) called"); 543 NGLOG_WARNING(Service_AM, "(STUBBED) called");
544} 544}
545 545
546void IApplicationFunctions::InitializeGamePlayRecording(Kernel::HLERequestContext& ctx) { 546void IApplicationFunctions::InitializeGamePlayRecording(Kernel::HLERequestContext& ctx) {
547 IPC::ResponseBuilder rb{ctx, 2}; 547 IPC::ResponseBuilder rb{ctx, 2};
548 rb.Push(RESULT_SUCCESS); 548 rb.Push(RESULT_SUCCESS);
549 LOG_WARNING(Service_AM, "(STUBBED) called"); 549 NGLOG_WARNING(Service_AM, "(STUBBED) called");
550} 550}
551 551
552void IApplicationFunctions::SetGamePlayRecordingState(Kernel::HLERequestContext& ctx) { 552void IApplicationFunctions::SetGamePlayRecordingState(Kernel::HLERequestContext& ctx) {
553 IPC::ResponseBuilder rb{ctx, 2}; 553 IPC::ResponseBuilder rb{ctx, 2};
554 rb.Push(RESULT_SUCCESS); 554 rb.Push(RESULT_SUCCESS);
555 555
556 LOG_WARNING(Service_AM, "(STUBBED) called"); 556 NGLOG_WARNING(Service_AM, "(STUBBED) called");
557} 557}
558 558
559void IApplicationFunctions::NotifyRunning(Kernel::HLERequestContext& ctx) { 559void IApplicationFunctions::NotifyRunning(Kernel::HLERequestContext& ctx) {
@@ -561,7 +561,7 @@ void IApplicationFunctions::NotifyRunning(Kernel::HLERequestContext& ctx) {
561 rb.Push(RESULT_SUCCESS); 561 rb.Push(RESULT_SUCCESS);
562 rb.Push<u8>(0); // Unknown, seems to be ignored by official processes 562 rb.Push<u8>(0); // Unknown, seems to be ignored by official processes
563 563
564 LOG_WARNING(Service_AM, "(STUBBED) called"); 564 NGLOG_WARNING(Service_AM, "(STUBBED) called");
565} 565}
566 566
567void InstallInterfaces(SM::ServiceManager& service_manager, 567void InstallInterfaces(SM::ServiceManager& service_manager,
diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/core/hle/service/am/applet_ae.cpp
index 4f0698a8a..8951980cf 100644
--- a/src/core/hle/service/am/applet_ae.cpp
+++ b/src/core/hle/service/am/applet_ae.cpp
@@ -33,56 +33,56 @@ private:
33 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 33 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
34 rb.Push(RESULT_SUCCESS); 34 rb.Push(RESULT_SUCCESS);
35 rb.PushIpcInterface<ICommonStateGetter>(); 35 rb.PushIpcInterface<ICommonStateGetter>();
36 LOG_DEBUG(Service_AM, "called"); 36 NGLOG_DEBUG(Service_AM, "called");
37 } 37 }
38 38
39 void GetSelfController(Kernel::HLERequestContext& ctx) { 39 void GetSelfController(Kernel::HLERequestContext& ctx) {
40 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 40 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
41 rb.Push(RESULT_SUCCESS); 41 rb.Push(RESULT_SUCCESS);
42 rb.PushIpcInterface<ISelfController>(nvflinger); 42 rb.PushIpcInterface<ISelfController>(nvflinger);
43 LOG_DEBUG(Service_AM, "called"); 43 NGLOG_DEBUG(Service_AM, "called");
44 } 44 }
45 45
46 void GetWindowController(Kernel::HLERequestContext& ctx) { 46 void GetWindowController(Kernel::HLERequestContext& ctx) {
47 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 47 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
48 rb.Push(RESULT_SUCCESS); 48 rb.Push(RESULT_SUCCESS);
49 rb.PushIpcInterface<IWindowController>(); 49 rb.PushIpcInterface<IWindowController>();
50 LOG_DEBUG(Service_AM, "called"); 50 NGLOG_DEBUG(Service_AM, "called");
51 } 51 }
52 52
53 void GetAudioController(Kernel::HLERequestContext& ctx) { 53 void GetAudioController(Kernel::HLERequestContext& ctx) {
54 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 54 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
55 rb.Push(RESULT_SUCCESS); 55 rb.Push(RESULT_SUCCESS);
56 rb.PushIpcInterface<IAudioController>(); 56 rb.PushIpcInterface<IAudioController>();
57 LOG_DEBUG(Service_AM, "called"); 57 NGLOG_DEBUG(Service_AM, "called");
58 } 58 }
59 59
60 void GetDisplayController(Kernel::HLERequestContext& ctx) { 60 void GetDisplayController(Kernel::HLERequestContext& ctx) {
61 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 61 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
62 rb.Push(RESULT_SUCCESS); 62 rb.Push(RESULT_SUCCESS);
63 rb.PushIpcInterface<IDisplayController>(); 63 rb.PushIpcInterface<IDisplayController>();
64 LOG_DEBUG(Service_AM, "called"); 64 NGLOG_DEBUG(Service_AM, "called");
65 } 65 }
66 66
67 void GetDebugFunctions(Kernel::HLERequestContext& ctx) { 67 void GetDebugFunctions(Kernel::HLERequestContext& ctx) {
68 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 68 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
69 rb.Push(RESULT_SUCCESS); 69 rb.Push(RESULT_SUCCESS);
70 rb.PushIpcInterface<IDebugFunctions>(); 70 rb.PushIpcInterface<IDebugFunctions>();
71 LOG_DEBUG(Service_AM, "called"); 71 NGLOG_DEBUG(Service_AM, "called");
72 } 72 }
73 73
74 void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) { 74 void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) {
75 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 75 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
76 rb.Push(RESULT_SUCCESS); 76 rb.Push(RESULT_SUCCESS);
77 rb.PushIpcInterface<ILibraryAppletCreator>(); 77 rb.PushIpcInterface<ILibraryAppletCreator>();
78 LOG_DEBUG(Service_AM, "called"); 78 NGLOG_DEBUG(Service_AM, "called");
79 } 79 }
80 80
81 void GetApplicationFunctions(Kernel::HLERequestContext& ctx) { 81 void GetApplicationFunctions(Kernel::HLERequestContext& ctx) {
82 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 82 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
83 rb.Push(RESULT_SUCCESS); 83 rb.Push(RESULT_SUCCESS);
84 rb.PushIpcInterface<IApplicationFunctions>(); 84 rb.PushIpcInterface<IApplicationFunctions>();
85 LOG_DEBUG(Service_AM, "called"); 85 NGLOG_DEBUG(Service_AM, "called");
86 } 86 }
87 87
88 std::shared_ptr<NVFlinger::NVFlinger> nvflinger; 88 std::shared_ptr<NVFlinger::NVFlinger> nvflinger;
@@ -92,7 +92,7 @@ void AppletAE::OpenLibraryAppletProxyOld(Kernel::HLERequestContext& ctx) {
92 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 92 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
93 rb.Push(RESULT_SUCCESS); 93 rb.Push(RESULT_SUCCESS);
94 rb.PushIpcInterface<ILibraryAppletProxy>(nvflinger); 94 rb.PushIpcInterface<ILibraryAppletProxy>(nvflinger);
95 LOG_DEBUG(Service_AM, "called"); 95 NGLOG_DEBUG(Service_AM, "called");
96} 96}
97 97
98AppletAE::AppletAE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger) 98AppletAE::AppletAE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp
index 674b4d753..68388bf5e 100644
--- a/src/core/hle/service/am/applet_oe.cpp
+++ b/src/core/hle/service/am/applet_oe.cpp
@@ -33,56 +33,56 @@ private:
33 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 33 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
34 rb.Push(RESULT_SUCCESS); 34 rb.Push(RESULT_SUCCESS);
35 rb.PushIpcInterface<IAudioController>(); 35 rb.PushIpcInterface<IAudioController>();
36 LOG_DEBUG(Service_AM, "called"); 36 NGLOG_DEBUG(Service_AM, "called");
37 } 37 }
38 38
39 void GetDisplayController(Kernel::HLERequestContext& ctx) { 39 void GetDisplayController(Kernel::HLERequestContext& ctx) {
40 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 40 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
41 rb.Push(RESULT_SUCCESS); 41 rb.Push(RESULT_SUCCESS);
42 rb.PushIpcInterface<IDisplayController>(); 42 rb.PushIpcInterface<IDisplayController>();
43 LOG_DEBUG(Service_AM, "called"); 43 NGLOG_DEBUG(Service_AM, "called");
44 } 44 }
45 45
46 void GetDebugFunctions(Kernel::HLERequestContext& ctx) { 46 void GetDebugFunctions(Kernel::HLERequestContext& ctx) {
47 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 47 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
48 rb.Push(RESULT_SUCCESS); 48 rb.Push(RESULT_SUCCESS);
49 rb.PushIpcInterface<IDebugFunctions>(); 49 rb.PushIpcInterface<IDebugFunctions>();
50 LOG_DEBUG(Service_AM, "called"); 50 NGLOG_DEBUG(Service_AM, "called");
51 } 51 }
52 52
53 void GetWindowController(Kernel::HLERequestContext& ctx) { 53 void GetWindowController(Kernel::HLERequestContext& ctx) {
54 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 54 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
55 rb.Push(RESULT_SUCCESS); 55 rb.Push(RESULT_SUCCESS);
56 rb.PushIpcInterface<IWindowController>(); 56 rb.PushIpcInterface<IWindowController>();
57 LOG_DEBUG(Service_AM, "called"); 57 NGLOG_DEBUG(Service_AM, "called");
58 } 58 }
59 59
60 void GetSelfController(Kernel::HLERequestContext& ctx) { 60 void GetSelfController(Kernel::HLERequestContext& ctx) {
61 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 61 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
62 rb.Push(RESULT_SUCCESS); 62 rb.Push(RESULT_SUCCESS);
63 rb.PushIpcInterface<ISelfController>(nvflinger); 63 rb.PushIpcInterface<ISelfController>(nvflinger);
64 LOG_DEBUG(Service_AM, "called"); 64 NGLOG_DEBUG(Service_AM, "called");
65 } 65 }
66 66
67 void GetCommonStateGetter(Kernel::HLERequestContext& ctx) { 67 void GetCommonStateGetter(Kernel::HLERequestContext& ctx) {
68 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 68 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
69 rb.Push(RESULT_SUCCESS); 69 rb.Push(RESULT_SUCCESS);
70 rb.PushIpcInterface<ICommonStateGetter>(); 70 rb.PushIpcInterface<ICommonStateGetter>();
71 LOG_DEBUG(Service_AM, "called"); 71 NGLOG_DEBUG(Service_AM, "called");
72 } 72 }
73 73
74 void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) { 74 void GetLibraryAppletCreator(Kernel::HLERequestContext& ctx) {
75 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 75 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
76 rb.Push(RESULT_SUCCESS); 76 rb.Push(RESULT_SUCCESS);
77 rb.PushIpcInterface<ILibraryAppletCreator>(); 77 rb.PushIpcInterface<ILibraryAppletCreator>();
78 LOG_DEBUG(Service_AM, "called"); 78 NGLOG_DEBUG(Service_AM, "called");
79 } 79 }
80 80
81 void GetApplicationFunctions(Kernel::HLERequestContext& ctx) { 81 void GetApplicationFunctions(Kernel::HLERequestContext& ctx) {
82 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 82 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
83 rb.Push(RESULT_SUCCESS); 83 rb.Push(RESULT_SUCCESS);
84 rb.PushIpcInterface<IApplicationFunctions>(); 84 rb.PushIpcInterface<IApplicationFunctions>();
85 LOG_DEBUG(Service_AM, "called"); 85 NGLOG_DEBUG(Service_AM, "called");
86 } 86 }
87 87
88 std::shared_ptr<NVFlinger::NVFlinger> nvflinger; 88 std::shared_ptr<NVFlinger::NVFlinger> nvflinger;
@@ -92,7 +92,7 @@ void AppletOE::OpenApplicationProxy(Kernel::HLERequestContext& ctx) {
92 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 92 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
93 rb.Push(RESULT_SUCCESS); 93 rb.Push(RESULT_SUCCESS);
94 rb.PushIpcInterface<IApplicationProxy>(nvflinger); 94 rb.PushIpcInterface<IApplicationProxy>(nvflinger);
95 LOG_DEBUG(Service_AM, "called"); 95 NGLOG_DEBUG(Service_AM, "called");
96} 96}
97 97
98AppletOE::AppletOE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger) 98AppletOE::AppletOE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger)
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp
index 6e7438580..5b6dfb48f 100644
--- a/src/core/hle/service/aoc/aoc_u.cpp
+++ b/src/core/hle/service/aoc/aoc_u.cpp
@@ -27,14 +27,14 @@ void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
27 IPC::ResponseBuilder rb{ctx, 4}; 27 IPC::ResponseBuilder rb{ctx, 4};
28 rb.Push(RESULT_SUCCESS); 28 rb.Push(RESULT_SUCCESS);
29 rb.Push<u64>(0); 29 rb.Push<u64>(0);
30 LOG_WARNING(Service_AOC, "(STUBBED) called"); 30 NGLOG_WARNING(Service_AOC, "(STUBBED) called");
31} 31}
32 32
33void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) { 33void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) {
34 IPC::ResponseBuilder rb{ctx, 4}; 34 IPC::ResponseBuilder rb{ctx, 4};
35 rb.Push(RESULT_SUCCESS); 35 rb.Push(RESULT_SUCCESS);
36 rb.Push<u64>(0); 36 rb.Push<u64>(0);
37 LOG_WARNING(Service_AOC, "(STUBBED) called"); 37 NGLOG_WARNING(Service_AOC, "(STUBBED) called");
38} 38}
39 39
40void InstallInterfaces(SM::ServiceManager& service_manager) { 40void InstallInterfaces(SM::ServiceManager& service_manager) {
diff --git a/src/core/hle/service/apm/interface.cpp b/src/core/hle/service/apm/interface.cpp
index 4e11f3f14..3a03188ce 100644
--- a/src/core/hle/service/apm/interface.cpp
+++ b/src/core/hle/service/apm/interface.cpp
@@ -29,8 +29,8 @@ private:
29 IPC::ResponseBuilder rb{ctx, 2}; 29 IPC::ResponseBuilder rb{ctx, 2};
30 rb.Push(RESULT_SUCCESS); 30 rb.Push(RESULT_SUCCESS);
31 31
32 LOG_WARNING(Service_APM, "(STUBBED) called mode=%u config=%u", static_cast<u32>(mode), 32 NGLOG_WARNING(Service_APM, "(STUBBED) called mode={} config={}", static_cast<u32>(mode),
33 config); 33 config);
34 } 34 }
35 35
36 void GetPerformanceConfiguration(Kernel::HLERequestContext& ctx) { 36 void GetPerformanceConfiguration(Kernel::HLERequestContext& ctx) {
@@ -42,7 +42,7 @@ private:
42 rb.Push(RESULT_SUCCESS); 42 rb.Push(RESULT_SUCCESS);
43 rb.Push<u32>(0); // Performance configuration 43 rb.Push<u32>(0); // Performance configuration
44 44
45 LOG_WARNING(Service_APM, "(STUBBED) called mode=%u", static_cast<u32>(mode)); 45 NGLOG_WARNING(Service_APM, "(STUBBED) called mode={}", static_cast<u32>(mode));
46 } 46 }
47}; 47};
48 48
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index 2d7f8cb04..6297dc450 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -60,14 +60,14 @@ public:
60 60
61private: 61private:
62 void GetAudioOutState(Kernel::HLERequestContext& ctx) { 62 void GetAudioOutState(Kernel::HLERequestContext& ctx) {
63 LOG_DEBUG(Service_Audio, "called"); 63 NGLOG_DEBUG(Service_Audio, "called");
64 IPC::ResponseBuilder rb{ctx, 3}; 64 IPC::ResponseBuilder rb{ctx, 3};
65 rb.Push(RESULT_SUCCESS); 65 rb.Push(RESULT_SUCCESS);
66 rb.Push(static_cast<u32>(audio_out_state)); 66 rb.Push(static_cast<u32>(audio_out_state));
67 } 67 }
68 68
69 void StartAudioOut(Kernel::HLERequestContext& ctx) { 69 void StartAudioOut(Kernel::HLERequestContext& ctx) {
70 LOG_WARNING(Service_Audio, "(STUBBED) called"); 70 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
71 71
72 // Start audio 72 // Start audio
73 audio_out_state = AudioState::Started; 73 audio_out_state = AudioState::Started;
@@ -77,7 +77,7 @@ private:
77 } 77 }
78 78
79 void StopAudioOut(Kernel::HLERequestContext& ctx) { 79 void StopAudioOut(Kernel::HLERequestContext& ctx) {
80 LOG_WARNING(Service_Audio, "(STUBBED) called"); 80 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
81 81
82 // Stop audio 82 // Stop audio
83 audio_out_state = AudioState::Stopped; 83 audio_out_state = AudioState::Stopped;
@@ -89,7 +89,7 @@ private:
89 } 89 }
90 90
91 void RegisterBufferEvent(Kernel::HLERequestContext& ctx) { 91 void RegisterBufferEvent(Kernel::HLERequestContext& ctx) {
92 LOG_WARNING(Service_Audio, "(STUBBED) called"); 92 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
93 93
94 IPC::ResponseBuilder rb{ctx, 2, 1}; 94 IPC::ResponseBuilder rb{ctx, 2, 1};
95 rb.Push(RESULT_SUCCESS); 95 rb.Push(RESULT_SUCCESS);
@@ -97,7 +97,7 @@ private:
97 } 97 }
98 98
99 void AppendAudioOutBuffer(Kernel::HLERequestContext& ctx) { 99 void AppendAudioOutBuffer(Kernel::HLERequestContext& ctx) {
100 LOG_WARNING(Service_Audio, "(STUBBED) called"); 100 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
101 IPC::RequestParser rp{ctx}; 101 IPC::RequestParser rp{ctx};
102 102
103 const u64 key{rp.Pop<u64>()}; 103 const u64 key{rp.Pop<u64>()};
@@ -108,7 +108,7 @@ private:
108 } 108 }
109 109
110 void GetReleasedAudioOutBuffer(Kernel::HLERequestContext& ctx) { 110 void GetReleasedAudioOutBuffer(Kernel::HLERequestContext& ctx) {
111 LOG_WARNING(Service_Audio, "(STUBBED) called"); 111 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
112 112
113 // TODO(st4rk): This is how libtransistor currently implements the 113 // TODO(st4rk): This is how libtransistor currently implements the
114 // GetReleasedAudioOutBuffer, it should return the key (a VAddr) to the app and this address 114 // GetReleasedAudioOutBuffer, it should return the key (a VAddr) to the app and this address
@@ -164,7 +164,7 @@ private:
164}; 164};
165 165
166void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { 166void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) {
167 LOG_WARNING(Service_Audio, "(STUBBED) called"); 167 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
168 IPC::RequestParser rp{ctx}; 168 IPC::RequestParser rp{ctx};
169 169
170 const std::string audio_interface = "AudioInterface"; 170 const std::string audio_interface = "AudioInterface";
@@ -180,7 +180,7 @@ void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) {
180} 180}
181 181
182void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) { 182void AudOutU::OpenAudioOut(Kernel::HLERequestContext& ctx) {
183 LOG_WARNING(Service_Audio, "(STUBBED) called"); 183 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
184 184
185 if (!audio_out_interface) { 185 if (!audio_out_interface) {
186 audio_out_interface = std::make_shared<IAudioOut>(); 186 audio_out_interface = std::make_shared<IAudioOut>();
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index d9245cb19..72810b436 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -56,7 +56,7 @@ private:
56 } 56 }
57 57
58 void RequestUpdateAudioRenderer(Kernel::HLERequestContext& ctx) { 58 void RequestUpdateAudioRenderer(Kernel::HLERequestContext& ctx) {
59 LOG_DEBUG(Service_Audio, "%s", ctx.Description().c_str()); 59 NGLOG_DEBUG(Service_Audio, "{}", ctx.Description());
60 AudioRendererResponseData response_data{}; 60 AudioRendererResponseData response_data{};
61 61
62 response_data.section_0_size = 62 response_data.section_0_size =
@@ -79,7 +79,7 @@ private:
79 79
80 rb.Push(RESULT_SUCCESS); 80 rb.Push(RESULT_SUCCESS);
81 81
82 LOG_WARNING(Service_Audio, "(STUBBED) called"); 82 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
83 } 83 }
84 84
85 void StartAudioRenderer(Kernel::HLERequestContext& ctx) { 85 void StartAudioRenderer(Kernel::HLERequestContext& ctx) {
@@ -87,7 +87,7 @@ private:
87 87
88 rb.Push(RESULT_SUCCESS); 88 rb.Push(RESULT_SUCCESS);
89 89
90 LOG_WARNING(Service_Audio, "(STUBBED) called"); 90 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
91 } 91 }
92 92
93 void StopAudioRenderer(Kernel::HLERequestContext& ctx) { 93 void StopAudioRenderer(Kernel::HLERequestContext& ctx) {
@@ -95,7 +95,7 @@ private:
95 95
96 rb.Push(RESULT_SUCCESS); 96 rb.Push(RESULT_SUCCESS);
97 97
98 LOG_WARNING(Service_Audio, "(STUBBED) called"); 98 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
99 } 99 }
100 100
101 void QuerySystemEvent(Kernel::HLERequestContext& ctx) { 101 void QuerySystemEvent(Kernel::HLERequestContext& ctx) {
@@ -105,7 +105,7 @@ private:
105 rb.Push(RESULT_SUCCESS); 105 rb.Push(RESULT_SUCCESS);
106 rb.PushCopyObjects(system_event); 106 rb.PushCopyObjects(system_event);
107 107
108 LOG_WARNING(Service_Audio, "(STUBBED) called"); 108 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
109 } 109 }
110 110
111 struct AudioRendererStateEntry { 111 struct AudioRendererStateEntry {
@@ -176,7 +176,7 @@ public:
176 176
177private: 177private:
178 void ListAudioDeviceName(Kernel::HLERequestContext& ctx) { 178 void ListAudioDeviceName(Kernel::HLERequestContext& ctx) {
179 LOG_WARNING(Service_Audio, "(STUBBED) called"); 179 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
180 IPC::RequestParser rp{ctx}; 180 IPC::RequestParser rp{ctx};
181 181
182 const std::string audio_interface = "AudioInterface"; 182 const std::string audio_interface = "AudioInterface";
@@ -188,7 +188,7 @@ private:
188 } 188 }
189 189
190 void SetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) { 190 void SetAudioDeviceOutputVolume(Kernel::HLERequestContext& ctx) {
191 LOG_WARNING(Service_Audio, "(STUBBED) called"); 191 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
192 192
193 IPC::RequestParser rp{ctx}; 193 IPC::RequestParser rp{ctx};
194 f32 volume = static_cast<f32>(rp.Pop<u32>()); 194 f32 volume = static_cast<f32>(rp.Pop<u32>());
@@ -201,7 +201,7 @@ private:
201 } 201 }
202 202
203 void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) { 203 void GetActiveAudioDeviceName(Kernel::HLERequestContext& ctx) {
204 LOG_WARNING(Service_Audio, "(STUBBED) called"); 204 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
205 IPC::RequestParser rp{ctx}; 205 IPC::RequestParser rp{ctx};
206 206
207 const std::string audio_interface = "AudioDevice"; 207 const std::string audio_interface = "AudioDevice";
@@ -213,7 +213,7 @@ private:
213 } 213 }
214 214
215 void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) { 215 void QueryAudioDeviceSystemEvent(Kernel::HLERequestContext& ctx) {
216 LOG_WARNING(Service_Audio, "(STUBBED) called"); 216 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
217 217
218 buffer_event->Signal(); 218 buffer_event->Signal();
219 219
@@ -223,7 +223,7 @@ private:
223 } 223 }
224 224
225 void GetActiveChannelCount(Kernel::HLERequestContext& ctx) { 225 void GetActiveChannelCount(Kernel::HLERequestContext& ctx) {
226 LOG_WARNING(Service_Audio, "(STUBBED) called"); 226 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
227 IPC::ResponseBuilder rb{ctx, 3}; 227 IPC::ResponseBuilder rb{ctx, 3};
228 rb.Push(RESULT_SUCCESS); 228 rb.Push(RESULT_SUCCESS);
229 rb.Push<u32>(1); 229 rb.Push<u32>(1);
@@ -250,7 +250,7 @@ void AudRenU::OpenAudioRenderer(Kernel::HLERequestContext& ctx) {
250 rb.Push(RESULT_SUCCESS); 250 rb.Push(RESULT_SUCCESS);
251 rb.PushIpcInterface<Audio::IAudioRenderer>(); 251 rb.PushIpcInterface<Audio::IAudioRenderer>();
252 252
253 LOG_DEBUG(Service_Audio, "called"); 253 NGLOG_DEBUG(Service_Audio, "called");
254} 254}
255 255
256void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) { 256void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
@@ -259,7 +259,7 @@ void AudRenU::GetAudioRendererWorkBufferSize(Kernel::HLERequestContext& ctx) {
259 rb.Push(RESULT_SUCCESS); 259 rb.Push(RESULT_SUCCESS);
260 rb.Push<u64>(0x400); 260 rb.Push<u64>(0x400);
261 261
262 LOG_WARNING(Service_Audio, "(STUBBED) called"); 262 NGLOG_WARNING(Service_Audio, "(STUBBED) called");
263} 263}
264 264
265void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) { 265void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) {
@@ -268,7 +268,7 @@ void AudRenU::GetAudioDevice(Kernel::HLERequestContext& ctx) {
268 rb.Push(RESULT_SUCCESS); 268 rb.Push(RESULT_SUCCESS);
269 rb.PushIpcInterface<Audio::IAudioDevice>(); 269 rb.PushIpcInterface<Audio::IAudioDevice>();
270 270
271 LOG_DEBUG(Service_Audio, "called"); 271 NGLOG_DEBUG(Service_Audio, "called");
272} 272}
273 273
274} // namespace Service::Audio 274} // namespace Service::Audio
diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp
index 41d58f999..d7ad0600a 100644
--- a/src/core/hle/service/fatal/fatal.cpp
+++ b/src/core/hle/service/fatal/fatal.cpp
@@ -16,13 +16,13 @@ Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
16void Module::Interface::FatalSimple(Kernel::HLERequestContext& ctx) { 16void Module::Interface::FatalSimple(Kernel::HLERequestContext& ctx) {
17 IPC::RequestParser rp(ctx); 17 IPC::RequestParser rp(ctx);
18 u32 error_code = rp.Pop<u32>(); 18 u32 error_code = rp.Pop<u32>();
19 LOG_WARNING(Service_Fatal, "(STUBBED) called, error_code=0x%X", error_code); 19 NGLOG_WARNING(Service_Fatal, "(STUBBED) called, error_code={:#X}", error_code);
20 IPC::ResponseBuilder rb{ctx, 2}; 20 IPC::ResponseBuilder rb{ctx, 2};
21 rb.Push(RESULT_SUCCESS); 21 rb.Push(RESULT_SUCCESS);
22} 22}
23 23
24void Module::Interface::TransitionToFatalError(Kernel::HLERequestContext& ctx) { 24void Module::Interface::TransitionToFatalError(Kernel::HLERequestContext& ctx) {
25 LOG_WARNING(Service_Fatal, "(STUBBED) called"); 25 NGLOG_WARNING(Service_Fatal, "(STUBBED) called");
26 IPC::ResponseBuilder rb{ctx, 2}; 26 IPC::ResponseBuilder rb{ctx, 2};
27 rb.Push(RESULT_SUCCESS); 27 rb.Push(RESULT_SUCCESS);
28} 28}
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp
index 9e504992f..c2951c560 100644
--- a/src/core/hle/service/filesystem/filesystem.cpp
+++ b/src/core/hle/service/filesystem/filesystem.cpp
@@ -25,14 +25,14 @@ ResultCode RegisterFileSystem(std::unique_ptr<FileSys::FileSystemFactory>&& fact
25 ASSERT_MSG(inserted, "Tried to register more than one system with same id code"); 25 ASSERT_MSG(inserted, "Tried to register more than one system with same id code");
26 26
27 auto& filesystem = result.first->second; 27 auto& filesystem = result.first->second;
28 LOG_DEBUG(Service_FS, "Registered file system %s with id code 0x%08X", 28 NGLOG_DEBUG(Service_FS, "Registered file system {} with id code {:#010X}",
29 filesystem->GetName().c_str(), static_cast<u32>(type)); 29 filesystem->GetName(), static_cast<u32>(type));
30 return RESULT_SUCCESS; 30 return RESULT_SUCCESS;
31} 31}
32 32
33ResultVal<std::unique_ptr<FileSys::FileSystemBackend>> OpenFileSystem(Type type, 33ResultVal<std::unique_ptr<FileSys::FileSystemBackend>> OpenFileSystem(Type type,
34 FileSys::Path& path) { 34 FileSys::Path& path) {
35 LOG_TRACE(Service_FS, "Opening FileSystem with type=%d", type); 35 NGLOG_TRACE(Service_FS, "Opening FileSystem with type={}", static_cast<u32>(type));
36 36
37 auto itr = filesystem_map.find(type); 37 auto itr = filesystem_map.find(type);
38 if (itr == filesystem_map.end()) { 38 if (itr == filesystem_map.end()) {
@@ -44,7 +44,7 @@ ResultVal<std::unique_ptr<FileSys::FileSystemBackend>> OpenFileSystem(Type type,
44} 44}
45 45
46ResultCode FormatFileSystem(Type type) { 46ResultCode FormatFileSystem(Type type) {
47 LOG_TRACE(Service_FS, "Formatting FileSystem with type=%d", type); 47 NGLOG_TRACE(Service_FS, "Formatting FileSystem with type={}", static_cast<u32>(type));
48 48
49 auto itr = filesystem_map.find(type); 49 auto itr = filesystem_map.find(type);
50 if (itr == filesystem_map.end()) { 50 if (itr == filesystem_map.end()) {
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 02e270f26..ed9f2ef72 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -35,7 +35,7 @@ private:
35 const s64 offset = rp.Pop<s64>(); 35 const s64 offset = rp.Pop<s64>();
36 const s64 length = rp.Pop<s64>(); 36 const s64 length = rp.Pop<s64>();
37 37
38 LOG_DEBUG(Service_FS, "called, offset=0x%ld, length=0x%ld", offset, length); 38 NGLOG_DEBUG(Service_FS, "called, offset={:#X}, length={}", offset, length);
39 39
40 // Error checking 40 // Error checking
41 if (length < 0) { 41 if (length < 0) {
@@ -87,7 +87,7 @@ private:
87 const s64 offset = rp.Pop<s64>(); 87 const s64 offset = rp.Pop<s64>();
88 const s64 length = rp.Pop<s64>(); 88 const s64 length = rp.Pop<s64>();
89 89
90 LOG_DEBUG(Service_FS, "called, offset=0x%ld, length=0x%ld", offset, length); 90 NGLOG_DEBUG(Service_FS, "called, offset={:#X}, length={}", offset, length);
91 91
92 // Error checking 92 // Error checking
93 if (length < 0) { 93 if (length < 0) {
@@ -124,7 +124,7 @@ private:
124 const s64 offset = rp.Pop<s64>(); 124 const s64 offset = rp.Pop<s64>();
125 const s64 length = rp.Pop<s64>(); 125 const s64 length = rp.Pop<s64>();
126 126
127 LOG_DEBUG(Service_FS, "called, offset=0x%ld, length=0x%ld", offset, length); 127 NGLOG_DEBUG(Service_FS, "called, offset={:#X}, length={}", offset, length);
128 128
129 // Error checking 129 // Error checking
130 if (length < 0) { 130 if (length < 0) {
@@ -152,7 +152,7 @@ private:
152 } 152 }
153 153
154 void Flush(Kernel::HLERequestContext& ctx) { 154 void Flush(Kernel::HLERequestContext& ctx) {
155 LOG_DEBUG(Service_FS, "called"); 155 NGLOG_DEBUG(Service_FS, "called");
156 backend->Flush(); 156 backend->Flush();
157 157
158 IPC::ResponseBuilder rb{ctx, 2}; 158 IPC::ResponseBuilder rb{ctx, 2};
@@ -163,7 +163,7 @@ private:
163 IPC::RequestParser rp{ctx}; 163 IPC::RequestParser rp{ctx};
164 const u64 size = rp.Pop<u64>(); 164 const u64 size = rp.Pop<u64>();
165 backend->SetSize(size); 165 backend->SetSize(size);
166 LOG_DEBUG(Service_FS, "called, size=%" PRIu64, size); 166 NGLOG_DEBUG(Service_FS, "called, size={}", size);
167 167
168 IPC::ResponseBuilder rb{ctx, 2}; 168 IPC::ResponseBuilder rb{ctx, 2};
169 rb.Push(RESULT_SUCCESS); 169 rb.Push(RESULT_SUCCESS);
@@ -171,7 +171,7 @@ private:
171 171
172 void GetSize(Kernel::HLERequestContext& ctx) { 172 void GetSize(Kernel::HLERequestContext& ctx) {
173 const u64 size = backend->GetSize(); 173 const u64 size = backend->GetSize();
174 LOG_DEBUG(Service_FS, "called, size=%" PRIu64, size); 174 NGLOG_DEBUG(Service_FS, "called, size={}", size);
175 175
176 IPC::ResponseBuilder rb{ctx, 4}; 176 IPC::ResponseBuilder rb{ctx, 4};
177 rb.Push(RESULT_SUCCESS); 177 rb.Push(RESULT_SUCCESS);
@@ -197,7 +197,7 @@ private:
197 IPC::RequestParser rp{ctx}; 197 IPC::RequestParser rp{ctx};
198 const u64 unk = rp.Pop<u64>(); 198 const u64 unk = rp.Pop<u64>();
199 199
200 LOG_DEBUG(Service_FS, "called, unk=0x%llx", unk); 200 NGLOG_DEBUG(Service_FS, "called, unk={:#X}", unk);
201 201
202 // Calculate how many entries we can fit in the output buffer 202 // Calculate how many entries we can fit in the output buffer
203 u64 count_entries = ctx.GetWriteBufferSize() / sizeof(FileSys::Entry); 203 u64 count_entries = ctx.GetWriteBufferSize() / sizeof(FileSys::Entry);
@@ -219,7 +219,7 @@ private:
219 } 219 }
220 220
221 void GetEntryCount(Kernel::HLERequestContext& ctx) { 221 void GetEntryCount(Kernel::HLERequestContext& ctx) {
222 LOG_DEBUG(Service_FS, "called"); 222 NGLOG_DEBUG(Service_FS, "called");
223 223
224 u64 count = backend->GetEntryCount(); 224 u64 count = backend->GetEntryCount();
225 225
@@ -265,8 +265,7 @@ public:
265 u64 mode = rp.Pop<u64>(); 265 u64 mode = rp.Pop<u64>();
266 u32 size = rp.Pop<u32>(); 266 u32 size = rp.Pop<u32>();
267 267
268 LOG_DEBUG(Service_FS, "called file %s mode 0x%" PRIX64 " size 0x%08X", name.c_str(), mode, 268 NGLOG_DEBUG(Service_FS, "called file {} mode {:#X} size {:#010X}", name, mode, size);
269 size);
270 269
271 IPC::ResponseBuilder rb{ctx, 2}; 270 IPC::ResponseBuilder rb{ctx, 2};
272 rb.Push(backend->CreateFile(name, size)); 271 rb.Push(backend->CreateFile(name, size));
@@ -280,7 +279,7 @@ public:
280 279
281 std::string name(file_buffer.begin(), end); 280 std::string name(file_buffer.begin(), end);
282 281
283 LOG_DEBUG(Service_FS, "called file %s", name.c_str()); 282 NGLOG_DEBUG(Service_FS, "called file {}", name);
284 283
285 IPC::ResponseBuilder rb{ctx, 2}; 284 IPC::ResponseBuilder rb{ctx, 2};
286 rb.Push(backend->DeleteFile(name)); 285 rb.Push(backend->DeleteFile(name));
@@ -294,7 +293,7 @@ public:
294 293
295 std::string name(file_buffer.begin(), end); 294 std::string name(file_buffer.begin(), end);
296 295
297 LOG_DEBUG(Service_FS, "called directory %s", name.c_str()); 296 NGLOG_DEBUG(Service_FS, "called directory {}", name);
298 297
299 IPC::ResponseBuilder rb{ctx, 2}; 298 IPC::ResponseBuilder rb{ctx, 2};
300 rb.Push(backend->CreateDirectory(name)); 299 rb.Push(backend->CreateDirectory(name));
@@ -314,7 +313,7 @@ public:
314 end = std::find(buffer.begin(), buffer.end(), '\0'); 313 end = std::find(buffer.begin(), buffer.end(), '\0');
315 std::string dst_name(buffer.begin(), end); 314 std::string dst_name(buffer.begin(), end);
316 315
317 LOG_DEBUG(Service_FS, "called file '%s' to file '%s'", src_name.c_str(), dst_name.c_str()); 316 NGLOG_DEBUG(Service_FS, "called file '{}' to file '{}'", src_name, dst_name);
318 317
319 IPC::ResponseBuilder rb{ctx, 2}; 318 IPC::ResponseBuilder rb{ctx, 2};
320 rb.Push(backend->RenameFile(src_name, dst_name)); 319 rb.Push(backend->RenameFile(src_name, dst_name));
@@ -330,7 +329,7 @@ public:
330 329
331 auto mode = static_cast<FileSys::Mode>(rp.Pop<u32>()); 330 auto mode = static_cast<FileSys::Mode>(rp.Pop<u32>());
332 331
333 LOG_DEBUG(Service_FS, "called file %s mode %u", name.c_str(), static_cast<u32>(mode)); 332 NGLOG_DEBUG(Service_FS, "called file {} mode {}", name, static_cast<u32>(mode));
334 333
335 auto result = backend->OpenFile(name, mode); 334 auto result = backend->OpenFile(name, mode);
336 if (result.Failed()) { 335 if (result.Failed()) {
@@ -357,7 +356,7 @@ public:
357 // TODO(Subv): Implement this filter. 356 // TODO(Subv): Implement this filter.
358 u32 filter_flags = rp.Pop<u32>(); 357 u32 filter_flags = rp.Pop<u32>();
359 358
360 LOG_DEBUG(Service_FS, "called directory %s filter %u", name.c_str(), filter_flags); 359 NGLOG_DEBUG(Service_FS, "called directory {} filter {}", name, filter_flags);
361 360
362 auto result = backend->OpenDirectory(name); 361 auto result = backend->OpenDirectory(name);
363 if (result.Failed()) { 362 if (result.Failed()) {
@@ -381,7 +380,7 @@ public:
381 380
382 std::string name(file_buffer.begin(), end); 381 std::string name(file_buffer.begin(), end);
383 382
384 LOG_DEBUG(Service_FS, "called file %s", name.c_str()); 383 NGLOG_DEBUG(Service_FS, "called file {}", name);
385 384
386 auto result = backend->GetEntryType(name); 385 auto result = backend->GetEntryType(name);
387 if (result.Failed()) { 386 if (result.Failed()) {
@@ -396,7 +395,7 @@ public:
396 } 395 }
397 396
398 void Commit(Kernel::HLERequestContext& ctx) { 397 void Commit(Kernel::HLERequestContext& ctx) {
399 LOG_WARNING(Service_FS, "(STUBBED) called"); 398 NGLOG_WARNING(Service_FS, "(STUBBED) called");
400 399
401 IPC::ResponseBuilder rb{ctx, 2}; 400 IPC::ResponseBuilder rb{ctx, 2};
402 rb.Push(RESULT_SUCCESS); 401 rb.Push(RESULT_SUCCESS);
@@ -512,14 +511,14 @@ void FSP_SRV::TryLoadRomFS() {
512} 511}
513 512
514void FSP_SRV::Initialize(Kernel::HLERequestContext& ctx) { 513void FSP_SRV::Initialize(Kernel::HLERequestContext& ctx) {
515 LOG_WARNING(Service_FS, "(STUBBED) called"); 514 NGLOG_WARNING(Service_FS, "(STUBBED) called");
516 515
517 IPC::ResponseBuilder rb{ctx, 2}; 516 IPC::ResponseBuilder rb{ctx, 2};
518 rb.Push(RESULT_SUCCESS); 517 rb.Push(RESULT_SUCCESS);
519} 518}
520 519
521void FSP_SRV::MountSdCard(Kernel::HLERequestContext& ctx) { 520void FSP_SRV::MountSdCard(Kernel::HLERequestContext& ctx) {
522 LOG_DEBUG(Service_FS, "called"); 521 NGLOG_DEBUG(Service_FS, "called");
523 522
524 FileSys::Path unused; 523 FileSys::Path unused;
525 auto filesystem = OpenFileSystem(Type::SDMC, unused).Unwrap(); 524 auto filesystem = OpenFileSystem(Type::SDMC, unused).Unwrap();
@@ -536,14 +535,14 @@ void FSP_SRV::CreateSaveData(Kernel::HLERequestContext& ctx) {
536 auto save_create_struct = rp.PopRaw<std::array<u8, 0x40>>(); 535 auto save_create_struct = rp.PopRaw<std::array<u8, 0x40>>();
537 u128 uid = rp.PopRaw<u128>(); 536 u128 uid = rp.PopRaw<u128>();
538 537
539 LOG_WARNING(Service_FS, "(STUBBED) called uid = %016" PRIX64 "%016" PRIX64, uid[1], uid[0]); 538 NGLOG_WARNING(Service_FS, "(STUBBED) called uid = {:016X}{:016X}", uid[1], uid[0]);
540 539
541 IPC::ResponseBuilder rb{ctx, 2}; 540 IPC::ResponseBuilder rb{ctx, 2};
542 rb.Push(RESULT_SUCCESS); 541 rb.Push(RESULT_SUCCESS);
543} 542}
544 543
545void FSP_SRV::MountSaveData(Kernel::HLERequestContext& ctx) { 544void FSP_SRV::MountSaveData(Kernel::HLERequestContext& ctx) {
546 LOG_WARNING(Service_FS, "(STUBBED) called"); 545 NGLOG_WARNING(Service_FS, "(STUBBED) called");
547 546
548 FileSys::Path unused; 547 FileSys::Path unused;
549 auto filesystem = OpenFileSystem(Type::SaveData, unused).Unwrap(); 548 auto filesystem = OpenFileSystem(Type::SaveData, unused).Unwrap();
@@ -554,7 +553,7 @@ void FSP_SRV::MountSaveData(Kernel::HLERequestContext& ctx) {
554} 553}
555 554
556void FSP_SRV::GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) { 555void FSP_SRV::GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) {
557 LOG_WARNING(Service_FS, "(STUBBED) called"); 556 NGLOG_WARNING(Service_FS, "(STUBBED) called");
558 557
559 IPC::ResponseBuilder rb{ctx, 3}; 558 IPC::ResponseBuilder rb{ctx, 3};
560 rb.Push(RESULT_SUCCESS); 559 rb.Push(RESULT_SUCCESS);
@@ -562,12 +561,12 @@ void FSP_SRV::GetGlobalAccessLogMode(Kernel::HLERequestContext& ctx) {
562} 561}
563 562
564void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) { 563void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) {
565 LOG_DEBUG(Service_FS, "called"); 564 NGLOG_DEBUG(Service_FS, "called");
566 565
567 TryLoadRomFS(); 566 TryLoadRomFS();
568 if (!romfs) { 567 if (!romfs) {
569 // TODO (bunnei): Find the right error code to use here 568 // TODO (bunnei): Find the right error code to use here
570 LOG_CRITICAL(Service_FS, "no file system interface available!"); 569 NGLOG_CRITICAL(Service_FS, "no file system interface available!");
571 IPC::ResponseBuilder rb{ctx, 2}; 570 IPC::ResponseBuilder rb{ctx, 2};
572 rb.Push(ResultCode(-1)); 571 rb.Push(ResultCode(-1));
573 return; 572 return;
@@ -576,7 +575,7 @@ void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) {
576 // Attempt to open a StorageBackend interface to the RomFS 575 // Attempt to open a StorageBackend interface to the RomFS
577 auto storage = romfs->OpenFile({}, {}); 576 auto storage = romfs->OpenFile({}, {});
578 if (storage.Failed()) { 577 if (storage.Failed()) {
579 LOG_CRITICAL(Service_FS, "no storage interface available!"); 578 NGLOG_CRITICAL(Service_FS, "no storage interface available!");
580 IPC::ResponseBuilder rb{ctx, 2}; 579 IPC::ResponseBuilder rb{ctx, 2};
581 rb.Push(storage.Code()); 580 rb.Push(storage.Code());
582 return; 581 return;
@@ -588,7 +587,7 @@ void FSP_SRV::OpenDataStorageByCurrentProcess(Kernel::HLERequestContext& ctx) {
588} 587}
589 588
590void FSP_SRV::OpenRomStorage(Kernel::HLERequestContext& ctx) { 589void FSP_SRV::OpenRomStorage(Kernel::HLERequestContext& ctx) {
591 LOG_WARNING(Service_FS, "(STUBBED) called, using OpenDataStorageByCurrentProcess"); 590 NGLOG_WARNING(Service_FS, "(STUBBED) called, using OpenDataStorageByCurrentProcess");
592 OpenDataStorageByCurrentProcess(ctx); 591 OpenDataStorageByCurrentProcess(ctx);
593} 592}
594 593
diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp
index c98a46e05..94d9fbf25 100644
--- a/src/core/hle/service/friend/friend.cpp
+++ b/src/core/hle/service/friend/friend.cpp
@@ -13,7 +13,7 @@ namespace Service::Friend {
13void Module::Interface::CreateFriendService(Kernel::HLERequestContext& ctx) { 13void Module::Interface::CreateFriendService(Kernel::HLERequestContext& ctx) {
14 IPC::ResponseBuilder rb{ctx, 2}; 14 IPC::ResponseBuilder rb{ctx, 2};
15 rb.Push(RESULT_SUCCESS); 15 rb.Push(RESULT_SUCCESS);
16 LOG_WARNING(Service_Friend, "(STUBBED) called"); 16 NGLOG_WARNING(Service_Friend, "(STUBBED) called");
17} 17}
18 18
19Module::Interface::Interface(std::shared_ptr<Module> module, const char* name) 19Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index aad5e688b..736180b63 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -53,7 +53,7 @@ private:
53 IPC::ResponseBuilder rb{ctx, 2, 1}; 53 IPC::ResponseBuilder rb{ctx, 2, 1};
54 rb.Push(RESULT_SUCCESS); 54 rb.Push(RESULT_SUCCESS);
55 rb.PushCopyObjects(shared_mem); 55 rb.PushCopyObjects(shared_mem);
56 LOG_DEBUG(Service_HID, "called"); 56 NGLOG_DEBUG(Service_HID, "called");
57 } 57 }
58 58
59 void LoadInputDevices() { 59 void LoadInputDevices() {
@@ -184,7 +184,7 @@ private:
184 void ActivateVibrationDevice(Kernel::HLERequestContext& ctx) { 184 void ActivateVibrationDevice(Kernel::HLERequestContext& ctx) {
185 IPC::ResponseBuilder rb{ctx, 2}; 185 IPC::ResponseBuilder rb{ctx, 2};
186 rb.Push(RESULT_SUCCESS); 186 rb.Push(RESULT_SUCCESS);
187 LOG_WARNING(Service_HID, "(STUBBED) called"); 187 NGLOG_WARNING(Service_HID, "(STUBBED) called");
188 } 188 }
189}; 189};
190 190
@@ -286,144 +286,144 @@ private:
286 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 286 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
287 rb.Push(RESULT_SUCCESS); 287 rb.Push(RESULT_SUCCESS);
288 rb.PushIpcInterface<IAppletResource>(applet_resource); 288 rb.PushIpcInterface<IAppletResource>(applet_resource);
289 LOG_DEBUG(Service_HID, "called"); 289 NGLOG_DEBUG(Service_HID, "called");
290 } 290 }
291 291
292 void ActivateDebugPad(Kernel::HLERequestContext& ctx) { 292 void ActivateDebugPad(Kernel::HLERequestContext& ctx) {
293 IPC::ResponseBuilder rb{ctx, 2}; 293 IPC::ResponseBuilder rb{ctx, 2};
294 rb.Push(RESULT_SUCCESS); 294 rb.Push(RESULT_SUCCESS);
295 LOG_WARNING(Service_HID, "(STUBBED) called"); 295 NGLOG_WARNING(Service_HID, "(STUBBED) called");
296 } 296 }
297 297
298 void ActivateTouchScreen(Kernel::HLERequestContext& ctx) { 298 void ActivateTouchScreen(Kernel::HLERequestContext& ctx) {
299 IPC::ResponseBuilder rb{ctx, 2}; 299 IPC::ResponseBuilder rb{ctx, 2};
300 rb.Push(RESULT_SUCCESS); 300 rb.Push(RESULT_SUCCESS);
301 LOG_WARNING(Service_HID, "(STUBBED) called"); 301 NGLOG_WARNING(Service_HID, "(STUBBED) called");
302 } 302 }
303 303
304 void ActivateMouse(Kernel::HLERequestContext& ctx) { 304 void ActivateMouse(Kernel::HLERequestContext& ctx) {
305 IPC::ResponseBuilder rb{ctx, 2}; 305 IPC::ResponseBuilder rb{ctx, 2};
306 rb.Push(RESULT_SUCCESS); 306 rb.Push(RESULT_SUCCESS);
307 LOG_WARNING(Service_HID, "(STUBBED) called"); 307 NGLOG_WARNING(Service_HID, "(STUBBED) called");
308 } 308 }
309 309
310 void ActivateKeyboard(Kernel::HLERequestContext& ctx) { 310 void ActivateKeyboard(Kernel::HLERequestContext& ctx) {
311 IPC::ResponseBuilder rb{ctx, 2}; 311 IPC::ResponseBuilder rb{ctx, 2};
312 rb.Push(RESULT_SUCCESS); 312 rb.Push(RESULT_SUCCESS);
313 LOG_WARNING(Service_HID, "(STUBBED) called"); 313 NGLOG_WARNING(Service_HID, "(STUBBED) called");
314 } 314 }
315 315
316 void StartSixAxisSensor(Kernel::HLERequestContext& ctx) { 316 void StartSixAxisSensor(Kernel::HLERequestContext& ctx) {
317 IPC::ResponseBuilder rb{ctx, 2}; 317 IPC::ResponseBuilder rb{ctx, 2};
318 rb.Push(RESULT_SUCCESS); 318 rb.Push(RESULT_SUCCESS);
319 LOG_WARNING(Service_HID, "(STUBBED) called"); 319 NGLOG_WARNING(Service_HID, "(STUBBED) called");
320 } 320 }
321 321
322 void SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) { 322 void SetGyroscopeZeroDriftMode(Kernel::HLERequestContext& ctx) {
323 IPC::ResponseBuilder rb{ctx, 2}; 323 IPC::ResponseBuilder rb{ctx, 2};
324 rb.Push(RESULT_SUCCESS); 324 rb.Push(RESULT_SUCCESS);
325 LOG_WARNING(Service_HID, "(STUBBED) called"); 325 NGLOG_WARNING(Service_HID, "(STUBBED) called");
326 } 326 }
327 327
328 void SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { 328 void SetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) {
329 IPC::ResponseBuilder rb{ctx, 2}; 329 IPC::ResponseBuilder rb{ctx, 2};
330 rb.Push(RESULT_SUCCESS); 330 rb.Push(RESULT_SUCCESS);
331 LOG_WARNING(Service_HID, "(STUBBED) called"); 331 NGLOG_WARNING(Service_HID, "(STUBBED) called");
332 } 332 }
333 333
334 void GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) { 334 void GetSupportedNpadStyleSet(Kernel::HLERequestContext& ctx) {
335 IPC::ResponseBuilder rb{ctx, 3}; 335 IPC::ResponseBuilder rb{ctx, 3};
336 rb.Push(RESULT_SUCCESS); 336 rb.Push(RESULT_SUCCESS);
337 rb.Push<u32>(0); 337 rb.Push<u32>(0);
338 LOG_WARNING(Service_HID, "(STUBBED) called"); 338 NGLOG_WARNING(Service_HID, "(STUBBED) called");
339 } 339 }
340 340
341 void SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) { 341 void SetSupportedNpadIdType(Kernel::HLERequestContext& ctx) {
342 IPC::ResponseBuilder rb{ctx, 2}; 342 IPC::ResponseBuilder rb{ctx, 2};
343 rb.Push(RESULT_SUCCESS); 343 rb.Push(RESULT_SUCCESS);
344 LOG_WARNING(Service_HID, "(STUBBED) called"); 344 NGLOG_WARNING(Service_HID, "(STUBBED) called");
345 } 345 }
346 346
347 void ActivateNpad(Kernel::HLERequestContext& ctx) { 347 void ActivateNpad(Kernel::HLERequestContext& ctx) {
348 IPC::ResponseBuilder rb{ctx, 2}; 348 IPC::ResponseBuilder rb{ctx, 2};
349 rb.Push(RESULT_SUCCESS); 349 rb.Push(RESULT_SUCCESS);
350 LOG_WARNING(Service_HID, "(STUBBED) called"); 350 NGLOG_WARNING(Service_HID, "(STUBBED) called");
351 } 351 }
352 352
353 void AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) { 353 void AcquireNpadStyleSetUpdateEventHandle(Kernel::HLERequestContext& ctx) {
354 IPC::ResponseBuilder rb{ctx, 2, 1}; 354 IPC::ResponseBuilder rb{ctx, 2, 1};
355 rb.Push(RESULT_SUCCESS); 355 rb.Push(RESULT_SUCCESS);
356 rb.PushCopyObjects(event); 356 rb.PushCopyObjects(event);
357 LOG_WARNING(Service_HID, "(STUBBED) called"); 357 NGLOG_WARNING(Service_HID, "(STUBBED) called");
358 } 358 }
359 359
360 void GetPlayerLedPattern(Kernel::HLERequestContext& ctx) { 360 void GetPlayerLedPattern(Kernel::HLERequestContext& ctx) {
361 IPC::ResponseBuilder rb{ctx, 2}; 361 IPC::ResponseBuilder rb{ctx, 2};
362 rb.Push(RESULT_SUCCESS); 362 rb.Push(RESULT_SUCCESS);
363 LOG_WARNING(Service_HID, "(STUBBED) called"); 363 NGLOG_WARNING(Service_HID, "(STUBBED) called");
364 } 364 }
365 365
366 void SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { 366 void SetNpadJoyHoldType(Kernel::HLERequestContext& ctx) {
367 IPC::ResponseBuilder rb{ctx, 2}; 367 IPC::ResponseBuilder rb{ctx, 2};
368 rb.Push(RESULT_SUCCESS); 368 rb.Push(RESULT_SUCCESS);
369 LOG_WARNING(Service_HID, "(STUBBED) called"); 369 NGLOG_WARNING(Service_HID, "(STUBBED) called");
370 } 370 }
371 371
372 void GetNpadJoyHoldType(Kernel::HLERequestContext& ctx) { 372 void GetNpadJoyHoldType(Kernel::HLERequestContext& ctx) {
373 IPC::ResponseBuilder rb{ctx, 3}; 373 IPC::ResponseBuilder rb{ctx, 3};
374 rb.Push(RESULT_SUCCESS); 374 rb.Push(RESULT_SUCCESS);
375 rb.Push(joy_hold_type); 375 rb.Push(joy_hold_type);
376 LOG_WARNING(Service_HID, "(STUBBED) called"); 376 NGLOG_WARNING(Service_HID, "(STUBBED) called");
377 } 377 }
378 378
379 void SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx) { 379 void SetNpadJoyAssignmentModeSingleByDefault(Kernel::HLERequestContext& ctx) {
380 IPC::ResponseBuilder rb{ctx, 2}; 380 IPC::ResponseBuilder rb{ctx, 2};
381 rb.Push(RESULT_SUCCESS); 381 rb.Push(RESULT_SUCCESS);
382 LOG_WARNING(Service_HID, "(STUBBED) called"); 382 NGLOG_WARNING(Service_HID, "(STUBBED) called");
383 } 383 }
384 384
385 void SendVibrationValue(Kernel::HLERequestContext& ctx) { 385 void SendVibrationValue(Kernel::HLERequestContext& ctx) {
386 IPC::ResponseBuilder rb{ctx, 2}; 386 IPC::ResponseBuilder rb{ctx, 2};
387 rb.Push(RESULT_SUCCESS); 387 rb.Push(RESULT_SUCCESS);
388 LOG_WARNING(Service_HID, "(STUBBED) called"); 388 NGLOG_WARNING(Service_HID, "(STUBBED) called");
389 } 389 }
390 390
391 void GetActualVibrationValue(Kernel::HLERequestContext& ctx) { 391 void GetActualVibrationValue(Kernel::HLERequestContext& ctx) {
392 IPC::ResponseBuilder rb{ctx, 2}; 392 IPC::ResponseBuilder rb{ctx, 2};
393 rb.Push(RESULT_SUCCESS); 393 rb.Push(RESULT_SUCCESS);
394 LOG_WARNING(Service_HID, "(STUBBED) called"); 394 NGLOG_WARNING(Service_HID, "(STUBBED) called");
395 } 395 }
396 396
397 void SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) { 397 void SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) {
398 IPC::ResponseBuilder rb{ctx, 2}; 398 IPC::ResponseBuilder rb{ctx, 2};
399 rb.Push(RESULT_SUCCESS); 399 rb.Push(RESULT_SUCCESS);
400 LOG_WARNING(Service_HID, "(STUBBED) called"); 400 NGLOG_WARNING(Service_HID, "(STUBBED) called");
401 } 401 }
402 402
403 void SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) { 403 void SetNpadHandheldActivationMode(Kernel::HLERequestContext& ctx) {
404 IPC::ResponseBuilder rb{ctx, 2}; 404 IPC::ResponseBuilder rb{ctx, 2};
405 rb.Push(RESULT_SUCCESS); 405 rb.Push(RESULT_SUCCESS);
406 LOG_WARNING(Service_HID, "(STUBBED) called"); 406 NGLOG_WARNING(Service_HID, "(STUBBED) called");
407 } 407 }
408 408
409 void GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { 409 void GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) {
410 IPC::ResponseBuilder rb{ctx, 4}; 410 IPC::ResponseBuilder rb{ctx, 4};
411 rb.Push(RESULT_SUCCESS); 411 rb.Push(RESULT_SUCCESS);
412 rb.Push<u64>(0); 412 rb.Push<u64>(0);
413 LOG_WARNING(Service_HID, "(STUBBED) called"); 413 NGLOG_WARNING(Service_HID, "(STUBBED) called");
414 } 414 }
415 415
416 void CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) { 416 void CreateActiveVibrationDeviceList(Kernel::HLERequestContext& ctx) {
417 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 417 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
418 rb.Push(RESULT_SUCCESS); 418 rb.Push(RESULT_SUCCESS);
419 rb.PushIpcInterface<IActiveVibrationDeviceList>(); 419 rb.PushIpcInterface<IActiveVibrationDeviceList>();
420 LOG_DEBUG(Service_HID, "called"); 420 NGLOG_DEBUG(Service_HID, "called");
421 } 421 }
422 422
423 void SendVibrationValues(Kernel::HLERequestContext& ctx) { 423 void SendVibrationValues(Kernel::HLERequestContext& ctx) {
424 IPC::ResponseBuilder rb{ctx, 2}; 424 IPC::ResponseBuilder rb{ctx, 2};
425 rb.Push(RESULT_SUCCESS); 425 rb.Push(RESULT_SUCCESS);
426 LOG_WARNING(Service_HID, "(STUBBED) called"); 426 NGLOG_WARNING(Service_HID, "(STUBBED) called");
427 } 427 }
428}; 428};
429 429
diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp
index b87172dff..46194643e 100644
--- a/src/core/hle/service/lm/lm.cpp
+++ b/src/core/hle/service/lm/lm.cpp
@@ -141,19 +141,19 @@ private:
141 if (header.IsTailLog()) { 141 if (header.IsTailLog()) {
142 switch (header.severity) { 142 switch (header.severity) {
143 case MessageHeader::Severity::Trace: 143 case MessageHeader::Severity::Trace:
144 LOG_TRACE(Debug_Emulated, "%s", log_stream.str().c_str()); 144 NGLOG_TRACE(Debug_Emulated, "{}", log_stream.str());
145 break; 145 break;
146 case MessageHeader::Severity::Info: 146 case MessageHeader::Severity::Info:
147 LOG_INFO(Debug_Emulated, "%s", log_stream.str().c_str()); 147 NGLOG_INFO(Debug_Emulated, "{}", log_stream.str());
148 break; 148 break;
149 case MessageHeader::Severity::Warning: 149 case MessageHeader::Severity::Warning:
150 LOG_WARNING(Debug_Emulated, "%s", log_stream.str().c_str()); 150 NGLOG_WARNING(Debug_Emulated, "{}", log_stream.str());
151 break; 151 break;
152 case MessageHeader::Severity::Error: 152 case MessageHeader::Severity::Error:
153 LOG_ERROR(Debug_Emulated, "%s", log_stream.str().c_str()); 153 NGLOG_ERROR(Debug_Emulated, "{}", log_stream.str());
154 break; 154 break;
155 case MessageHeader::Severity::Critical: 155 case MessageHeader::Severity::Critical:
156 LOG_CRITICAL(Debug_Emulated, "%s", log_stream.str().c_str()); 156 NGLOG_CRITICAL(Debug_Emulated, "{}", log_stream.str());
157 break; 157 break;
158 } 158 }
159 } 159 }
@@ -178,7 +178,7 @@ void LM::Initialize(Kernel::HLERequestContext& ctx) {
178 rb.Push(RESULT_SUCCESS); 178 rb.Push(RESULT_SUCCESS);
179 rb.PushIpcInterface<Logger>(); 179 rb.PushIpcInterface<Logger>();
180 180
181 LOG_DEBUG(Service_LM, "called"); 181 NGLOG_DEBUG(Service_LM, "called");
182} 182}
183 183
184LM::LM() : ServiceFramework("lm") { 184LM::LM() : ServiceFramework("lm") {
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index 91e5f527a..6627aaddc 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -13,7 +13,7 @@ Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
13 : ServiceFramework(name), module(std::move(module)) {} 13 : ServiceFramework(name), module(std::move(module)) {}
14 14
15void Module::Interface::Unknown(Kernel::HLERequestContext& ctx) { 15void Module::Interface::Unknown(Kernel::HLERequestContext& ctx) {
16 LOG_WARNING(Service_NFP, "(STUBBED) called"); 16 NGLOG_WARNING(Service_NFP, "(STUBBED) called");
17 IPC::ResponseBuilder rb{ctx, 2}; 17 IPC::ResponseBuilder rb{ctx, 2};
18 rb.Push(RESULT_SUCCESS); 18 rb.Push(RESULT_SUCCESS);
19} 19}
diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp
index df1e7f8fe..eee92cfcd 100644
--- a/src/core/hle/service/nifm/nifm.cpp
+++ b/src/core/hle/service/nifm/nifm.cpp
@@ -62,24 +62,24 @@ public:
62 62
63private: 63private:
64 void GetRequestState(Kernel::HLERequestContext& ctx) { 64 void GetRequestState(Kernel::HLERequestContext& ctx) {
65 LOG_WARNING(Service_NIFM, "(STUBBED) called"); 65 NGLOG_WARNING(Service_NIFM, "(STUBBED) called");
66 IPC::ResponseBuilder rb{ctx, 3}; 66 IPC::ResponseBuilder rb{ctx, 3};
67 rb.Push(RESULT_SUCCESS); 67 rb.Push(RESULT_SUCCESS);
68 rb.Push<u32>(0); 68 rb.Push<u32>(0);
69 } 69 }
70 void GetResult(Kernel::HLERequestContext& ctx) { 70 void GetResult(Kernel::HLERequestContext& ctx) {
71 LOG_WARNING(Service_NIFM, "(STUBBED) called"); 71 NGLOG_WARNING(Service_NIFM, "(STUBBED) called");
72 IPC::ResponseBuilder rb{ctx, 2}; 72 IPC::ResponseBuilder rb{ctx, 2};
73 rb.Push(RESULT_SUCCESS); 73 rb.Push(RESULT_SUCCESS);
74 } 74 }
75 void GetSystemEventReadableHandles(Kernel::HLERequestContext& ctx) { 75 void GetSystemEventReadableHandles(Kernel::HLERequestContext& ctx) {
76 LOG_WARNING(Service_NIFM, "(STUBBED) called"); 76 NGLOG_WARNING(Service_NIFM, "(STUBBED) called");
77 IPC::ResponseBuilder rb{ctx, 2, 2}; 77 IPC::ResponseBuilder rb{ctx, 2, 2};
78 rb.Push(RESULT_SUCCESS); 78 rb.Push(RESULT_SUCCESS);
79 rb.PushCopyObjects(event1, event2); 79 rb.PushCopyObjects(event1, event2);
80 } 80 }
81 void Cancel(Kernel::HLERequestContext& ctx) { 81 void Cancel(Kernel::HLERequestContext& ctx) {
82 LOG_WARNING(Service_NIFM, "(STUBBED) called"); 82 NGLOG_WARNING(Service_NIFM, "(STUBBED) called");
83 IPC::ResponseBuilder rb{ctx, 2}; 83 IPC::ResponseBuilder rb{ctx, 2};
84 rb.Push(RESULT_SUCCESS); 84 rb.Push(RESULT_SUCCESS);
85 } 85 }
@@ -105,7 +105,7 @@ public:
105 105
106private: 106private:
107 void GetClientId(Kernel::HLERequestContext& ctx) { 107 void GetClientId(Kernel::HLERequestContext& ctx) {
108 LOG_WARNING(Service_NIFM, "(STUBBED) called"); 108 NGLOG_WARNING(Service_NIFM, "(STUBBED) called");
109 IPC::ResponseBuilder rb{ctx, 4}; 109 IPC::ResponseBuilder rb{ctx, 4};
110 rb.Push(RESULT_SUCCESS); 110 rb.Push(RESULT_SUCCESS);
111 rb.Push<u64>(0); 111 rb.Push<u64>(0);
@@ -116,7 +116,7 @@ private:
116 rb.Push(RESULT_SUCCESS); 116 rb.Push(RESULT_SUCCESS);
117 rb.PushIpcInterface<IScanRequest>(); 117 rb.PushIpcInterface<IScanRequest>();
118 118
119 LOG_DEBUG(Service_NIFM, "called"); 119 NGLOG_DEBUG(Service_NIFM, "called");
120 } 120 }
121 void CreateRequest(Kernel::HLERequestContext& ctx) { 121 void CreateRequest(Kernel::HLERequestContext& ctx) {
122 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 122 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
@@ -124,10 +124,10 @@ private:
124 rb.Push(RESULT_SUCCESS); 124 rb.Push(RESULT_SUCCESS);
125 rb.PushIpcInterface<IRequest>(); 125 rb.PushIpcInterface<IRequest>();
126 126
127 LOG_DEBUG(Service_NIFM, "called"); 127 NGLOG_DEBUG(Service_NIFM, "called");
128 } 128 }
129 void RemoveNetworkProfile(Kernel::HLERequestContext& ctx) { 129 void RemoveNetworkProfile(Kernel::HLERequestContext& ctx) {
130 LOG_WARNING(Service_NIFM, "(STUBBED) called"); 130 NGLOG_WARNING(Service_NIFM, "(STUBBED) called");
131 IPC::ResponseBuilder rb{ctx, 2}; 131 IPC::ResponseBuilder rb{ctx, 2};
132 rb.Push(RESULT_SUCCESS); 132 rb.Push(RESULT_SUCCESS);
133 } 133 }
@@ -137,7 +137,7 @@ private:
137 rb.Push(RESULT_SUCCESS); 137 rb.Push(RESULT_SUCCESS);
138 rb.PushIpcInterface<INetworkProfile>(); 138 rb.PushIpcInterface<INetworkProfile>();
139 139
140 LOG_DEBUG(Service_NIFM, "called"); 140 NGLOG_DEBUG(Service_NIFM, "called");
141 } 141 }
142}; 142};
143 143
@@ -187,14 +187,14 @@ void Module::Interface::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx)
187 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 187 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
188 rb.Push(RESULT_SUCCESS); 188 rb.Push(RESULT_SUCCESS);
189 rb.PushIpcInterface<IGeneralService>(); 189 rb.PushIpcInterface<IGeneralService>();
190 LOG_DEBUG(Service_NIFM, "called"); 190 NGLOG_DEBUG(Service_NIFM, "called");
191} 191}
192 192
193void Module::Interface::CreateGeneralService(Kernel::HLERequestContext& ctx) { 193void Module::Interface::CreateGeneralService(Kernel::HLERequestContext& ctx) {
194 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 194 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
195 rb.Push(RESULT_SUCCESS); 195 rb.Push(RESULT_SUCCESS);
196 rb.PushIpcInterface<IGeneralService>(); 196 rb.PushIpcInterface<IGeneralService>();
197 LOG_DEBUG(Service_NIFM, "called"); 197 NGLOG_DEBUG(Service_NIFM, "called");
198} 198}
199 199
200Module::Interface::Interface(std::shared_ptr<Module> module, const char* name) 200Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index c416ad720..c2a647e89 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -52,7 +52,7 @@ PL_U::PL_U() : ServiceFramework("pl:u") {
52 ASSERT(file.GetSize() == SHARED_FONT_MEM_SIZE); 52 ASSERT(file.GetSize() == SHARED_FONT_MEM_SIZE);
53 file.ReadBytes(shared_font->data(), shared_font->size()); 53 file.ReadBytes(shared_font->data(), shared_font->size());
54 } else { 54 } else {
55 LOG_WARNING(Service_NS, "Unable to load shared font: %s", filepath.c_str()); 55 NGLOG_WARNING(Service_NS, "Unable to load shared font: {}", filepath);
56 } 56 }
57} 57}
58 58
@@ -60,7 +60,7 @@ void PL_U::RequestLoad(Kernel::HLERequestContext& ctx) {
60 IPC::RequestParser rp{ctx}; 60 IPC::RequestParser rp{ctx};
61 const u32 shared_font_type{rp.Pop<u32>()}; 61 const u32 shared_font_type{rp.Pop<u32>()};
62 62
63 LOG_DEBUG(Service_NS, "called, shared_font_type=%d", shared_font_type); 63 NGLOG_DEBUG(Service_NS, "called, shared_font_type={}", shared_font_type);
64 IPC::ResponseBuilder rb{ctx, 2}; 64 IPC::ResponseBuilder rb{ctx, 2};
65 rb.Push(RESULT_SUCCESS); 65 rb.Push(RESULT_SUCCESS);
66} 66}
@@ -69,7 +69,7 @@ void PL_U::GetLoadState(Kernel::HLERequestContext& ctx) {
69 IPC::RequestParser rp{ctx}; 69 IPC::RequestParser rp{ctx};
70 const u32 font_id{rp.Pop<u32>()}; 70 const u32 font_id{rp.Pop<u32>()};
71 71
72 LOG_DEBUG(Service_NS, "called, font_id=%d", font_id); 72 NGLOG_DEBUG(Service_NS, "called, font_id={}", font_id);
73 IPC::ResponseBuilder rb{ctx, 3}; 73 IPC::ResponseBuilder rb{ctx, 3};
74 rb.Push(RESULT_SUCCESS); 74 rb.Push(RESULT_SUCCESS);
75 rb.Push<u32>(static_cast<u32>(LoadState::Done)); 75 rb.Push<u32>(static_cast<u32>(LoadState::Done));
@@ -79,7 +79,7 @@ void PL_U::GetSize(Kernel::HLERequestContext& ctx) {
79 IPC::RequestParser rp{ctx}; 79 IPC::RequestParser rp{ctx};
80 const u32 font_id{rp.Pop<u32>()}; 80 const u32 font_id{rp.Pop<u32>()};
81 81
82 LOG_DEBUG(Service_NS, "called, font_id=%d", font_id); 82 NGLOG_DEBUG(Service_NS, "called, font_id={}", font_id);
83 IPC::ResponseBuilder rb{ctx, 3}; 83 IPC::ResponseBuilder rb{ctx, 3};
84 rb.Push(RESULT_SUCCESS); 84 rb.Push(RESULT_SUCCESS);
85 rb.Push<u32>(SHARED_FONT_REGIONS[font_id].size); 85 rb.Push<u32>(SHARED_FONT_REGIONS[font_id].size);
@@ -89,7 +89,7 @@ void PL_U::GetSharedMemoryAddressOffset(Kernel::HLERequestContext& ctx) {
89 IPC::RequestParser rp{ctx}; 89 IPC::RequestParser rp{ctx};
90 const u32 font_id{rp.Pop<u32>()}; 90 const u32 font_id{rp.Pop<u32>()};
91 91
92 LOG_DEBUG(Service_NS, "called, font_id=%d", font_id); 92 NGLOG_DEBUG(Service_NS, "called, font_id={}", font_id);
93 IPC::ResponseBuilder rb{ctx, 3}; 93 IPC::ResponseBuilder rb{ctx, 3};
94 rb.Push(RESULT_SUCCESS); 94 rb.Push(RESULT_SUCCESS);
95 rb.Push<u32>(SHARED_FONT_REGIONS[font_id].offset); 95 rb.Push<u32>(SHARED_FONT_REGIONS[font_id].offset);
@@ -110,7 +110,7 @@ void PL_U::GetSharedMemoryNativeHandle(Kernel::HLERequestContext& ctx) {
110 Kernel::MemoryPermission::Read, SHARED_FONT_MEM_VADDR, Kernel::MemoryRegion::BASE, 110 Kernel::MemoryPermission::Read, SHARED_FONT_MEM_VADDR, Kernel::MemoryRegion::BASE,
111 "PL_U:shared_font_mem"); 111 "PL_U:shared_font_mem");
112 112
113 LOG_DEBUG(Service_NS, "called"); 113 NGLOG_DEBUG(Service_NS, "called");
114 IPC::ResponseBuilder rb{ctx, 2, 1}; 114 IPC::ResponseBuilder rb{ctx, 2, 1};
115 rb.Push(RESULT_SUCCESS); 115 rb.Push(RESULT_SUCCESS);
116 rb.PushCopyObjects(shared_font_mem); 116 rb.PushCopyObjects(shared_font_mem);
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
index aa6c7e8dc..103e66d0c 100644
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -20,9 +20,9 @@ u32 nvdisp_disp0::ioctl(Ioctl command, const std::vector<u8>& input, std::vector
20void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u32 height, 20void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u32 height,
21 u32 stride, NVFlinger::BufferQueue::BufferTransformFlags transform) { 21 u32 stride, NVFlinger::BufferQueue::BufferTransformFlags transform) {
22 VAddr addr = nvmap_dev->GetObjectAddress(buffer_handle); 22 VAddr addr = nvmap_dev->GetObjectAddress(buffer_handle);
23 LOG_WARNING(Service, 23 NGLOG_WARNING(Service,
24 "Drawing from address %lx offset %08X Width %u Height %u Stride %u Format %u", addr, 24 "Drawing from address {:X} offset {:08X} Width {} Height {} Stride {} Format {}",
25 offset, width, height, stride, format); 25 addr, offset, width, height, stride, format);
26 26
27 using PixelFormat = Tegra::FramebufferConfig::PixelFormat; 27 using PixelFormat = Tegra::FramebufferConfig::PixelFormat;
28 const Tegra::FramebufferConfig framebuffer{ 28 const Tegra::FramebufferConfig framebuffer{
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
index 8e7ca6123..36d7f837b 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
@@ -12,8 +12,8 @@
12namespace Service::Nvidia::Devices { 12namespace Service::Nvidia::Devices {
13 13
14u32 nvhost_as_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) { 14u32 nvhost_as_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
15 LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx", 15 NGLOG_DEBUG(Service_NVDRV, "called, command={:#010X}, input_size={:#X}, output_size={:#X}",
16 command.raw, input.size(), output.size()); 16 command.raw, input.size(), output.size());
17 17
18 switch (static_cast<IoctlCommand>(command.raw)) { 18 switch (static_cast<IoctlCommand>(command.raw)) {
19 case IoctlCommand::IocInitalizeExCommand: 19 case IoctlCommand::IocInitalizeExCommand:
@@ -38,7 +38,7 @@ u32 nvhost_as_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vecto
38u32 nvhost_as_gpu::InitalizeEx(const std::vector<u8>& input, std::vector<u8>& output) { 38u32 nvhost_as_gpu::InitalizeEx(const std::vector<u8>& input, std::vector<u8>& output) {
39 IoctlInitalizeEx params{}; 39 IoctlInitalizeEx params{};
40 std::memcpy(&params, input.data(), input.size()); 40 std::memcpy(&params, input.data(), input.size());
41 LOG_WARNING(Service_NVDRV, "(STUBBED) called, big_page_size=0x%x", params.big_page_size); 41 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, big_page_size={:#X}", params.big_page_size);
42 std::memcpy(output.data(), &params, output.size()); 42 std::memcpy(output.data(), &params, output.size());
43 return 0; 43 return 0;
44} 44}
@@ -46,8 +46,8 @@ u32 nvhost_as_gpu::InitalizeEx(const std::vector<u8>& input, std::vector<u8>& ou
46u32 nvhost_as_gpu::AllocateSpace(const std::vector<u8>& input, std::vector<u8>& output) { 46u32 nvhost_as_gpu::AllocateSpace(const std::vector<u8>& input, std::vector<u8>& output) {
47 IoctlAllocSpace params{}; 47 IoctlAllocSpace params{};
48 std::memcpy(&params, input.data(), input.size()); 48 std::memcpy(&params, input.data(), input.size());
49 LOG_DEBUG(Service_NVDRV, "called, pages=%x, page_size=%x, flags=%x", params.pages, 49 NGLOG_DEBUG(Service_NVDRV, "called, pages={:X}, page_size={:X}, flags={:X}", params.pages,
50 params.page_size, params.flags); 50 params.page_size, params.flags);
51 51
52 auto& gpu = Core::System::GetInstance().GPU(); 52 auto& gpu = Core::System::GetInstance().GPU();
53 const u64 size{static_cast<u64>(params.pages) * static_cast<u64>(params.page_size)}; 53 const u64 size{static_cast<u64>(params.pages) * static_cast<u64>(params.page_size)};
@@ -95,11 +95,11 @@ u32 nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& ou
95 IoctlMapBufferEx params{}; 95 IoctlMapBufferEx params{};
96 std::memcpy(&params, input.data(), input.size()); 96 std::memcpy(&params, input.data(), input.size());
97 97
98 LOG_DEBUG(Service_NVDRV, 98 NGLOG_DEBUG(Service_NVDRV,
99 "called, flags=%x, nvmap_handle=%x, buffer_offset=%" PRIu64 ", mapping_size=%" PRIu64 99 "called, flags={:X}, nvmap_handle={:X}, buffer_offset={}, mapping_size={}"
100 ", offset=%" PRIu64, 100 ", offset={}",
101 params.flags, params.nvmap_handle, params.buffer_offset, params.mapping_size, 101 params.flags, params.nvmap_handle, params.buffer_offset, params.mapping_size,
102 params.offset); 102 params.offset);
103 103
104 if (!params.nvmap_handle) { 104 if (!params.nvmap_handle) {
105 return 0; 105 return 0;
@@ -133,7 +133,7 @@ u32 nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& ou
133u32 nvhost_as_gpu::BindChannel(const std::vector<u8>& input, std::vector<u8>& output) { 133u32 nvhost_as_gpu::BindChannel(const std::vector<u8>& input, std::vector<u8>& output) {
134 IoctlBindChannel params{}; 134 IoctlBindChannel params{};
135 std::memcpy(&params, input.data(), input.size()); 135 std::memcpy(&params, input.data(), input.size());
136 LOG_DEBUG(Service_NVDRV, "called, fd=%x", params.fd); 136 NGLOG_DEBUG(Service_NVDRV, "called, fd={:X}", params.fd);
137 channel = params.fd; 137 channel = params.fd;
138 std::memcpy(output.data(), &params, output.size()); 138 std::memcpy(output.data(), &params, output.size());
139 return 0; 139 return 0;
@@ -142,8 +142,8 @@ u32 nvhost_as_gpu::BindChannel(const std::vector<u8>& input, std::vector<u8>& ou
142u32 nvhost_as_gpu::GetVARegions(const std::vector<u8>& input, std::vector<u8>& output) { 142u32 nvhost_as_gpu::GetVARegions(const std::vector<u8>& input, std::vector<u8>& output) {
143 IoctlGetVaRegions params{}; 143 IoctlGetVaRegions params{};
144 std::memcpy(&params, input.data(), input.size()); 144 std::memcpy(&params, input.data(), input.size());
145 LOG_WARNING(Service_NVDRV, "(STUBBED) called, buf_addr=%" PRIu64 ", buf_size=%x", 145 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, buf_addr={:X}, buf_size={:X}", params.buf_addr,
146 params.buf_addr, params.buf_size); 146 params.buf_size);
147 147
148 params.buf_size = 0x30; 148 params.buf_size = 0x30;
149 params.regions[0].offset = 0x04000000; 149 params.regions[0].offset = 0x04000000;
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 6e1ba1ac7..46f0b6862 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -9,8 +9,8 @@
9namespace Service::Nvidia::Devices { 9namespace Service::Nvidia::Devices {
10 10
11u32 nvhost_ctrl::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) { 11u32 nvhost_ctrl::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
12 LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx", 12 NGLOG_DEBUG(Service_NVDRV, "called, command={:#010X}, input_size={:#X}, output_size={:#X}",
13 command.raw, input.size(), output.size()); 13 command.raw, input.size(), output.size());
14 14
15 switch (static_cast<IoctlCommand>(command.raw)) { 15 switch (static_cast<IoctlCommand>(command.raw)) {
16 case IoctlCommand::IocGetConfigCommand: 16 case IoctlCommand::IocGetConfigCommand:
@@ -25,8 +25,8 @@ u32 nvhost_ctrl::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<
25u32 nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output) { 25u32 nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output) {
26 IocGetConfigParams params{}; 26 IocGetConfigParams params{};
27 std::memcpy(&params, input.data(), sizeof(params)); 27 std::memcpy(&params, input.data(), sizeof(params));
28 LOG_DEBUG(Service_NVDRV, "called, setting=%s!%s", params.domain_str.data(), 28 NGLOG_DEBUG(Service_NVDRV, "called, setting={}!{}", params.domain_str.data(),
29 params.param_str.data()); 29 params.param_str.data());
30 30
31 if (!strcmp(params.domain_str.data(), "nv")) { 31 if (!strcmp(params.domain_str.data(), "nv")) {
32 if (!strcmp(params.param_str.data(), "NV_MEMORY_PROFILER")) { 32 if (!strcmp(params.param_str.data(), "NV_MEMORY_PROFILER")) {
@@ -48,8 +48,8 @@ u32 nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>&
48u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output) { 48u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>& output) {
49 IocCtrlEventWaitParams params{}; 49 IocCtrlEventWaitParams params{};
50 std::memcpy(&params, input.data(), sizeof(params)); 50 std::memcpy(&params, input.data(), sizeof(params));
51 LOG_WARNING(Service_NVDRV, "(STUBBED) called, syncpt_id=%u threshold=%u timeout=%d", 51 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, syncpt_id={} threshold={} timeout={}",
52 params.syncpt_id, params.threshold, params.timeout); 52 params.syncpt_id, params.threshold, params.timeout);
53 53
54 // TODO(Subv): Implement actual syncpt waiting. 54 // TODO(Subv): Implement actual syncpt waiting.
55 params.value = 0; 55 params.value = 0;
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
index b715723d3..1e457ae6e 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
@@ -10,8 +10,8 @@
10namespace Service::Nvidia::Devices { 10namespace Service::Nvidia::Devices {
11 11
12u32 nvhost_ctrl_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) { 12u32 nvhost_ctrl_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
13 LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx", 13 NGLOG_DEBUG(Service_NVDRV, "called, command={:#010X}, input_size={:#X}, output_size={:#X}",
14 command.raw, input.size(), output.size()); 14 command.raw, input.size(), output.size());
15 15
16 switch (static_cast<IoctlCommand>(command.raw)) { 16 switch (static_cast<IoctlCommand>(command.raw)) {
17 case IoctlCommand::IocGetCharacteristicsCommand: 17 case IoctlCommand::IocGetCharacteristicsCommand:
@@ -30,7 +30,7 @@ u32 nvhost_ctrl_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vec
30} 30}
31 31
32u32 nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output) { 32u32 nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output) {
33 LOG_DEBUG(Service_NVDRV, "called"); 33 NGLOG_DEBUG(Service_NVDRV, "called");
34 IoctlCharacteristics params{}; 34 IoctlCharacteristics params{};
35 std::memcpy(&params, input.data(), input.size()); 35 std::memcpy(&params, input.data(), input.size());
36 params.gc.arch = 0x120; 36 params.gc.arch = 0x120;
@@ -77,14 +77,14 @@ u32 nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std::vecto
77u32 nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output) { 77u32 nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output) {
78 IoctlGpuGetTpcMasksArgs params{}; 78 IoctlGpuGetTpcMasksArgs params{};
79 std::memcpy(&params, input.data(), input.size()); 79 std::memcpy(&params, input.data(), input.size());
80 LOG_WARNING(Service_NVDRV, "(STUBBED) called, mask=0x%x, mask_buf_addr=0x%" PRIx64, 80 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, mask={:#X}, mask_buf_addr={:#X}",
81 params.mask_buf_size, params.mask_buf_addr); 81 params.mask_buf_size, params.mask_buf_addr);
82 std::memcpy(output.data(), &params, sizeof(params)); 82 std::memcpy(output.data(), &params, sizeof(params));
83 return 0; 83 return 0;
84} 84}
85 85
86u32 nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector<u8>& input, std::vector<u8>& output) { 86u32 nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector<u8>& input, std::vector<u8>& output) {
87 LOG_DEBUG(Service_NVDRV, "called"); 87 NGLOG_DEBUG(Service_NVDRV, "called");
88 IoctlActiveSlotMask params{}; 88 IoctlActiveSlotMask params{};
89 std::memcpy(&params, input.data(), input.size()); 89 std::memcpy(&params, input.data(), input.size());
90 params.slot = 0x07; 90 params.slot = 0x07;
@@ -94,7 +94,7 @@ u32 nvhost_ctrl_gpu::GetActiveSlotMask(const std::vector<u8>& input, std::vector
94} 94}
95 95
96u32 nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u8>& output) { 96u32 nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u8>& output) {
97 LOG_DEBUG(Service_NVDRV, "called"); 97 NGLOG_DEBUG(Service_NVDRV, "called");
98 IoctlZcullGetCtxSize params{}; 98 IoctlZcullGetCtxSize params{};
99 std::memcpy(&params, input.data(), input.size()); 99 std::memcpy(&params, input.data(), input.size());
100 params.size = 0x1; 100 params.size = 0x1;
@@ -103,7 +103,7 @@ u32 nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u
103} 103}
104 104
105u32 nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output) { 105u32 nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output) {
106 LOG_DEBUG(Service_NVDRV, "called"); 106 NGLOG_DEBUG(Service_NVDRV, "called");
107 IoctlNvgpuGpuZcullGetInfoArgs params{}; 107 IoctlNvgpuGpuZcullGetInfoArgs params{};
108 std::memcpy(&params, input.data(), input.size()); 108 std::memcpy(&params, input.data(), input.size());
109 params.width_align_pixels = 0x20; 109 params.width_align_pixels = 0x20;
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
index dab6d0533..70625211e 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
@@ -12,8 +12,8 @@
12namespace Service::Nvidia::Devices { 12namespace Service::Nvidia::Devices {
13 13
14u32 nvhost_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) { 14u32 nvhost_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) {
15 LOG_DEBUG(Service_NVDRV, "called, command=0x%08x, input_size=0x%zx, output_size=0x%zx", 15 NGLOG_DEBUG(Service_NVDRV, "called, command={:#010X}, input_size={:#X}, output_size={:#X}",
16 command.raw, input.size(), output.size()); 16 command.raw, input.size(), output.size());
17 17
18 switch (static_cast<IoctlCommand>(command.raw)) { 18 switch (static_cast<IoctlCommand>(command.raw)) {
19 case IoctlCommand::IocSetNVMAPfdCommand: 19 case IoctlCommand::IocSetNVMAPfdCommand:
@@ -47,14 +47,14 @@ u32 nvhost_gpu::ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u
47u32 nvhost_gpu::SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output) { 47u32 nvhost_gpu::SetNVMAPfd(const std::vector<u8>& input, std::vector<u8>& output) {
48 IoctlSetNvmapFD params{}; 48 IoctlSetNvmapFD params{};
49 std::memcpy(&params, input.data(), input.size()); 49 std::memcpy(&params, input.data(), input.size());
50 LOG_DEBUG(Service_NVDRV, "called, fd=%x", params.nvmap_fd); 50 NGLOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd);
51 nvmap_fd = params.nvmap_fd; 51 nvmap_fd = params.nvmap_fd;
52 std::memcpy(output.data(), &params, output.size()); 52 std::memcpy(output.data(), &params, output.size());
53 return 0; 53 return 0;
54} 54}
55 55
56u32 nvhost_gpu::SetClientData(const std::vector<u8>& input, std::vector<u8>& output) { 56u32 nvhost_gpu::SetClientData(const std::vector<u8>& input, std::vector<u8>& output) {
57 LOG_DEBUG(Service_NVDRV, "called"); 57 NGLOG_DEBUG(Service_NVDRV, "called");
58 IoctlClientData params{}; 58 IoctlClientData params{};
59 std::memcpy(&params, input.data(), input.size()); 59 std::memcpy(&params, input.data(), input.size());
60 user_data = params.data; 60 user_data = params.data;
@@ -63,7 +63,7 @@ u32 nvhost_gpu::SetClientData(const std::vector<u8>& input, std::vector<u8>& out
63} 63}
64 64
65u32 nvhost_gpu::GetClientData(const std::vector<u8>& input, std::vector<u8>& output) { 65u32 nvhost_gpu::GetClientData(const std::vector<u8>& input, std::vector<u8>& output) {
66 LOG_DEBUG(Service_NVDRV, "called"); 66 NGLOG_DEBUG(Service_NVDRV, "called");
67 IoctlClientData params{}; 67 IoctlClientData params{};
68 std::memcpy(&params, input.data(), input.size()); 68 std::memcpy(&params, input.data(), input.size());
69 params.data = user_data; 69 params.data = user_data;
@@ -73,8 +73,8 @@ u32 nvhost_gpu::GetClientData(const std::vector<u8>& input, std::vector<u8>& out
73 73
74u32 nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output) { 74u32 nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output) {
75 std::memcpy(&zcull_params, input.data(), input.size()); 75 std::memcpy(&zcull_params, input.data(), input.size());
76 LOG_DEBUG(Service_NVDRV, "called, gpu_va=%" PRIx64 ", mode=%x", zcull_params.gpu_va, 76 NGLOG_DEBUG(Service_NVDRV, "called, gpu_va={:X}, mode={:X}", zcull_params.gpu_va,
77 zcull_params.mode); 77 zcull_params.mode);
78 std::memcpy(output.data(), &zcull_params, output.size()); 78 std::memcpy(output.data(), &zcull_params, output.size());
79 return 0; 79 return 0;
80} 80}
@@ -82,15 +82,15 @@ u32 nvhost_gpu::ZCullBind(const std::vector<u8>& input, std::vector<u8>& output)
82u32 nvhost_gpu::SetErrorNotifier(const std::vector<u8>& input, std::vector<u8>& output) { 82u32 nvhost_gpu::SetErrorNotifier(const std::vector<u8>& input, std::vector<u8>& output) {
83 IoctlSetErrorNotifier params{}; 83 IoctlSetErrorNotifier params{};
84 std::memcpy(&params, input.data(), input.size()); 84 std::memcpy(&params, input.data(), input.size());
85 LOG_WARNING(Service_NVDRV, "(STUBBED) called, offset=%" PRIx64 ", size=%" PRIx64 ", mem=%x", 85 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, offset={:X}, size={:X}, mem={:X}",
86 params.offset, params.size, params.mem); 86 params.offset, params.size, params.mem);
87 std::memcpy(output.data(), &params, output.size()); 87 std::memcpy(output.data(), &params, output.size());
88 return 0; 88 return 0;
89} 89}
90 90
91u32 nvhost_gpu::SetChannelPriority(const std::vector<u8>& input, std::vector<u8>& output) { 91u32 nvhost_gpu::SetChannelPriority(const std::vector<u8>& input, std::vector<u8>& output) {
92 std::memcpy(&channel_priority, input.data(), input.size()); 92 std::memcpy(&channel_priority, input.data(), input.size());
93 LOG_DEBUG(Service_NVDRV, "(STUBBED) called, priority=%x", channel_priority); 93 NGLOG_DEBUG(Service_NVDRV, "(STUBBED) called, priority={:X}", channel_priority);
94 std::memcpy(output.data(), &channel_priority, output.size()); 94 std::memcpy(output.data(), &channel_priority, output.size());
95 return 0; 95 return 0;
96} 96}
@@ -98,10 +98,11 @@ u32 nvhost_gpu::SetChannelPriority(const std::vector<u8>& input, std::vector<u8>
98u32 nvhost_gpu::AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& output) { 98u32 nvhost_gpu::AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& output) {
99 IoctlAllocGpfifoEx2 params{}; 99 IoctlAllocGpfifoEx2 params{};
100 std::memcpy(&params, input.data(), input.size()); 100 std::memcpy(&params, input.data(), input.size());
101 LOG_WARNING(Service_NVDRV, 101 NGLOG_WARNING(Service_NVDRV,
102 "(STUBBED) called, num_entries=%x, flags=%x, unk0=%x, unk1=%x, unk2=%x, unk3=%x", 102 "(STUBBED) called, num_entries={:X}, flags={:X}, unk0={:X}, "
103 params.num_entries, params.flags, params.unk0, params.unk1, params.unk2, 103 "unk1={:X}, unk2={:X}, unk3={:X}",
104 params.unk3); 104 params.num_entries, params.flags, params.unk0, params.unk1, params.unk2,
105 params.unk3);
105 params.fence_out.id = 0; 106 params.fence_out.id = 0;
106 params.fence_out.value = 0; 107 params.fence_out.value = 0;
107 std::memcpy(output.data(), &params, output.size()); 108 std::memcpy(output.data(), &params, output.size());
@@ -111,8 +112,8 @@ u32 nvhost_gpu::AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& ou
111u32 nvhost_gpu::AllocateObjectContext(const std::vector<u8>& input, std::vector<u8>& output) { 112u32 nvhost_gpu::AllocateObjectContext(const std::vector<u8>& input, std::vector<u8>& output) {
112 IoctlAllocObjCtx params{}; 113 IoctlAllocObjCtx params{};
113 std::memcpy(&params, input.data(), input.size()); 114 std::memcpy(&params, input.data(), input.size());
114 LOG_WARNING(Service_NVDRV, "(STUBBED) called, class_num=%x, flags=%x", params.class_num, 115 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, class_num={:X}, flags={:X}", params.class_num,
115 params.flags); 116 params.flags);
116 params.obj_id = 0x0; 117 params.obj_id = 0x0;
117 std::memcpy(output.data(), &params, output.size()); 118 std::memcpy(output.data(), &params, output.size());
118 return 0; 119 return 0;
@@ -123,8 +124,8 @@ u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& outp
123 UNIMPLEMENTED(); 124 UNIMPLEMENTED();
124 IoctlSubmitGpfifo params{}; 125 IoctlSubmitGpfifo params{};
125 std::memcpy(&params, input.data(), sizeof(IoctlSubmitGpfifo)); 126 std::memcpy(&params, input.data(), sizeof(IoctlSubmitGpfifo));
126 LOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo=%" PRIx64 ", num_entries=%x, flags=%x", 127 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo={:X}, num_entries={:X}, flags={:X}",
127 params.gpfifo, params.num_entries, params.flags); 128 params.gpfifo, params.num_entries, params.flags);
128 129
129 auto entries = std::vector<IoctlGpfifoEntry>(); 130 auto entries = std::vector<IoctlGpfifoEntry>();
130 entries.resize(params.num_entries); 131 entries.resize(params.num_entries);
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp
index dcf079d91..11df8849d 100644
--- a/src/core/hle/service/nvdrv/devices/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp
@@ -49,7 +49,7 @@ u32 nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output) {
49 u32 handle = next_handle++; 49 u32 handle = next_handle++;
50 handles[handle] = std::move(object); 50 handles[handle] = std::move(object);
51 51
52 LOG_DEBUG(Service_NVDRV, "size=0x%08X", params.size); 52 NGLOG_DEBUG(Service_NVDRV, "size={:#010X}", params.size);
53 53
54 params.handle = handle; 54 params.handle = handle;
55 55
@@ -70,7 +70,7 @@ u32 nvmap::IocAlloc(const std::vector<u8>& input, std::vector<u8>& output) {
70 object->addr = params.addr; 70 object->addr = params.addr;
71 object->status = Object::Status::Allocated; 71 object->status = Object::Status::Allocated;
72 72
73 LOG_DEBUG(Service_NVDRV, "called, addr=0x%" PRIx64, params.addr); 73 NGLOG_DEBUG(Service_NVDRV, "called, addr={:X}", params.addr);
74 74
75 std::memcpy(output.data(), &params, sizeof(params)); 75 std::memcpy(output.data(), &params, sizeof(params));
76 return 0; 76 return 0;
@@ -80,7 +80,7 @@ u32 nvmap::IocGetId(const std::vector<u8>& input, std::vector<u8>& output) {
80 IocGetIdParams params; 80 IocGetIdParams params;
81 std::memcpy(&params, input.data(), sizeof(params)); 81 std::memcpy(&params, input.data(), sizeof(params));
82 82
83 LOG_WARNING(Service_NVDRV, "called"); 83 NGLOG_WARNING(Service_NVDRV, "called");
84 84
85 auto object = GetObject(params.handle); 85 auto object = GetObject(params.handle);
86 ASSERT(object); 86 ASSERT(object);
@@ -95,7 +95,7 @@ u32 nvmap::IocFromId(const std::vector<u8>& input, std::vector<u8>& output) {
95 IocFromIdParams params; 95 IocFromIdParams params;
96 std::memcpy(&params, input.data(), sizeof(params)); 96 std::memcpy(&params, input.data(), sizeof(params));
97 97
98 LOG_WARNING(Service_NVDRV, "(STUBBED) called"); 98 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called");
99 99
100 auto itr = std::find_if(handles.begin(), handles.end(), 100 auto itr = std::find_if(handles.begin(), handles.end(),
101 [&](const auto& entry) { return entry.second->id == params.id; }); 101 [&](const auto& entry) { return entry.second->id == params.id; });
@@ -114,7 +114,7 @@ u32 nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) {
114 IocParamParams params; 114 IocParamParams params;
115 std::memcpy(&params, input.data(), sizeof(params)); 115 std::memcpy(&params, input.data(), sizeof(params));
116 116
117 LOG_WARNING(Service_NVDRV, "(STUBBED) called type=%u", params.type); 117 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called type={}", params.type);
118 118
119 auto object = GetObject(params.handle); 119 auto object = GetObject(params.handle);
120 ASSERT(object); 120 ASSERT(object);
diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp
index d0d64a840..38b3a9a84 100644
--- a/src/core/hle/service/nvdrv/interface.cpp
+++ b/src/core/hle/service/nvdrv/interface.cpp
@@ -12,7 +12,7 @@
12namespace Service::Nvidia { 12namespace Service::Nvidia {
13 13
14void NVDRV::Open(Kernel::HLERequestContext& ctx) { 14void NVDRV::Open(Kernel::HLERequestContext& ctx) {
15 LOG_DEBUG(Service_NVDRV, "called"); 15 NGLOG_DEBUG(Service_NVDRV, "called");
16 16
17 const auto& buffer = ctx.ReadBuffer(); 17 const auto& buffer = ctx.ReadBuffer();
18 std::string device_name(buffer.begin(), buffer.end()); 18 std::string device_name(buffer.begin(), buffer.end());
@@ -25,7 +25,7 @@ void NVDRV::Open(Kernel::HLERequestContext& ctx) {
25} 25}
26 26
27void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) { 27void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) {
28 LOG_DEBUG(Service_NVDRV, "called"); 28 NGLOG_DEBUG(Service_NVDRV, "called");
29 29
30 IPC::RequestParser rp{ctx}; 30 IPC::RequestParser rp{ctx};
31 u32 fd = rp.Pop<u32>(); 31 u32 fd = rp.Pop<u32>();
@@ -41,7 +41,7 @@ void NVDRV::Ioctl(Kernel::HLERequestContext& ctx) {
41} 41}
42 42
43void NVDRV::Close(Kernel::HLERequestContext& ctx) { 43void NVDRV::Close(Kernel::HLERequestContext& ctx) {
44 LOG_DEBUG(Service_NVDRV, "called"); 44 NGLOG_DEBUG(Service_NVDRV, "called");
45 45
46 IPC::RequestParser rp{ctx}; 46 IPC::RequestParser rp{ctx};
47 u32 fd = rp.Pop<u32>(); 47 u32 fd = rp.Pop<u32>();
@@ -53,7 +53,7 @@ void NVDRV::Close(Kernel::HLERequestContext& ctx) {
53} 53}
54 54
55void NVDRV::Initialize(Kernel::HLERequestContext& ctx) { 55void NVDRV::Initialize(Kernel::HLERequestContext& ctx) {
56 LOG_WARNING(Service_NVDRV, "(STUBBED) called"); 56 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called");
57 IPC::ResponseBuilder rb{ctx, 3}; 57 IPC::ResponseBuilder rb{ctx, 3};
58 rb.Push(RESULT_SUCCESS); 58 rb.Push(RESULT_SUCCESS);
59 rb.Push<u32>(0); 59 rb.Push<u32>(0);
@@ -63,7 +63,7 @@ void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) {
63 IPC::RequestParser rp{ctx}; 63 IPC::RequestParser rp{ctx};
64 u32 fd = rp.Pop<u32>(); 64 u32 fd = rp.Pop<u32>();
65 u32 event_id = rp.Pop<u32>(); 65 u32 event_id = rp.Pop<u32>();
66 LOG_WARNING(Service_NVDRV, "(STUBBED) called, fd=%x, event_id=%x", fd, event_id); 66 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, fd={:X}, event_id={:X}", fd, event_id);
67 67
68 IPC::ResponseBuilder rb{ctx, 3, 1}; 68 IPC::ResponseBuilder rb{ctx, 3, 1};
69 rb.Push(RESULT_SUCCESS); 69 rb.Push(RESULT_SUCCESS);
@@ -75,14 +75,14 @@ void NVDRV::SetClientPID(Kernel::HLERequestContext& ctx) {
75 IPC::RequestParser rp{ctx}; 75 IPC::RequestParser rp{ctx};
76 pid = rp.Pop<u64>(); 76 pid = rp.Pop<u64>();
77 77
78 LOG_WARNING(Service_NVDRV, "(STUBBED) called, pid=0x%" PRIx64, pid); 78 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, pid={:#X}", pid);
79 IPC::ResponseBuilder rb{ctx, 3}; 79 IPC::ResponseBuilder rb{ctx, 3};
80 rb.Push(RESULT_SUCCESS); 80 rb.Push(RESULT_SUCCESS);
81 rb.Push<u32>(0); 81 rb.Push<u32>(0);
82} 82}
83 83
84void NVDRV::FinishInitialize(Kernel::HLERequestContext& ctx) { 84void NVDRV::FinishInitialize(Kernel::HLERequestContext& ctx) {
85 LOG_WARNING(Service_NVDRV, "(STUBBED) called"); 85 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called");
86 IPC::ResponseBuilder rb{ctx, 2}; 86 IPC::ResponseBuilder rb{ctx, 2};
87 rb.Push(RESULT_SUCCESS); 87 rb.Push(RESULT_SUCCESS);
88} 88}
diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp
index e4ff2e267..49e88b394 100644
--- a/src/core/hle/service/nvflinger/buffer_queue.cpp
+++ b/src/core/hle/service/nvflinger/buffer_queue.cpp
@@ -23,7 +23,7 @@ void BufferQueue::SetPreallocatedBuffer(u32 slot, IGBPBuffer& igbp_buffer) {
23 buffer.igbp_buffer = igbp_buffer; 23 buffer.igbp_buffer = igbp_buffer;
24 buffer.status = Buffer::Status::Free; 24 buffer.status = Buffer::Status::Free;
25 25
26 LOG_WARNING(Service, "Adding graphics buffer %u", slot); 26 NGLOG_WARNING(Service, "Adding graphics buffer {}", slot);
27 27
28 queue.emplace_back(buffer); 28 queue.emplace_back(buffer);
29 29
@@ -94,7 +94,7 @@ void BufferQueue::ReleaseBuffer(u32 slot) {
94} 94}
95 95
96u32 BufferQueue::Query(QueryType type) { 96u32 BufferQueue::Query(QueryType type) {
97 LOG_WARNING(Service, "(STUBBED) called type=%u", static_cast<u32>(type)); 97 NGLOG_WARNING(Service, "(STUBBED) called type={}", static_cast<u32>(type));
98 switch (type) { 98 switch (type) {
99 case QueryType::NativeWindowFormat: 99 case QueryType::NativeWindowFormat:
100 // TODO(Subv): Use an enum for this 100 // TODO(Subv): Use an enum for this
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index a99ebc8e6..3481e48d0 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -48,7 +48,7 @@ NVFlinger::~NVFlinger() {
48} 48}
49 49
50u64 NVFlinger::OpenDisplay(const std::string& name) { 50u64 NVFlinger::OpenDisplay(const std::string& name) {
51 LOG_WARNING(Service, "Opening display %s", name.c_str()); 51 NGLOG_WARNING(Service, "Opening display {}", name);
52 52
53 // TODO(Subv): Currently we only support the Default display. 53 // TODO(Subv): Currently we only support the Default display.
54 ASSERT(name == "Default"); 54 ASSERT(name == "Default");
diff --git a/src/core/hle/service/pctl/pctl_a.cpp b/src/core/hle/service/pctl/pctl_a.cpp
index 9fb4628ad..24a6cf310 100644
--- a/src/core/hle/service/pctl/pctl_a.cpp
+++ b/src/core/hle/service/pctl/pctl_a.cpp
@@ -113,7 +113,7 @@ void PCTL_A::CreateService(Kernel::HLERequestContext& ctx) {
113 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 113 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
114 rb.Push(RESULT_SUCCESS); 114 rb.Push(RESULT_SUCCESS);
115 rb.PushIpcInterface<IParentalControlService>(); 115 rb.PushIpcInterface<IParentalControlService>();
116 LOG_DEBUG(Service_PCTL, "called"); 116 NGLOG_DEBUG(Service_PCTL, "called");
117} 117}
118 118
119PCTL_A::PCTL_A() : ServiceFramework("pctl:a") { 119PCTL_A::PCTL_A() : ServiceFramework("pctl:a") {
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 08ce29677..5817819fe 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -120,7 +120,7 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext
120 } 120 }
121 buf.push_back('}'); 121 buf.push_back('}');
122 122
123 LOG_ERROR(Service, "unknown / unimplemented %s", fmt::to_string(buf).c_str()); 123 NGLOG_ERROR(Service, "unknown / unimplemented {}", fmt::to_string(buf));
124 UNIMPLEMENTED(); 124 UNIMPLEMENTED();
125} 125}
126 126
@@ -131,8 +131,8 @@ void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) {
131 return ReportUnimplementedFunction(ctx, info); 131 return ReportUnimplementedFunction(ctx, info);
132 } 132 }
133 133
134 LOG_TRACE( 134 NGLOG_TRACE(
135 Service, "%s", 135 Service, "{}",
136 MakeFunctionString(info->name, GetServiceName().c_str(), ctx.CommandBuffer()).c_str()); 136 MakeFunctionString(info->name, GetServiceName().c_str(), ctx.CommandBuffer()).c_str());
137 handler_invoker(this, info->handler_callback, ctx); 137 handler_invoker(this, info->handler_callback, ctx);
138} 138}
@@ -199,12 +199,12 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
199 VI::InstallInterfaces(*sm, nv_flinger); 199 VI::InstallInterfaces(*sm, nv_flinger);
200 Set::InstallInterfaces(*sm); 200 Set::InstallInterfaces(*sm);
201 201
202 LOG_DEBUG(Service, "initialized OK"); 202 NGLOG_DEBUG(Service, "initialized OK");
203} 203}
204 204
205/// Shutdown ServiceManager 205/// Shutdown ServiceManager
206void Shutdown() { 206void Shutdown() {
207 g_kernel_named_ports.clear(); 207 g_kernel_named_ports.clear();
208 LOG_DEBUG(Service, "shutdown OK"); 208 NGLOG_DEBUG(Service, "shutdown OK");
209} 209}
210} // namespace Service 210} // namespace Service
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp
index fc3e424d0..ece29aa70 100644
--- a/src/core/hle/service/set/set.cpp
+++ b/src/core/hle/service/set/set.cpp
@@ -22,7 +22,7 @@ void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) {
22 22
23 rb.Push(RESULT_SUCCESS); 23 rb.Push(RESULT_SUCCESS);
24 24
25 LOG_WARNING(Service_SET, "(STUBBED) called"); 25 NGLOG_WARNING(Service_SET, "(STUBBED) called");
26} 26}
27 27
28SET::SET() : ServiceFramework("set") { 28SET::SET() : ServiceFramework("set") {
diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cpp
index fa85277fe..762a664c5 100644
--- a/src/core/hle/service/set/set_sys.cpp
+++ b/src/core/hle/service/set/set_sys.cpp
@@ -16,7 +16,7 @@ void SET_SYS::GetColorSetId(Kernel::HLERequestContext& ctx) {
16 rb.Push(RESULT_SUCCESS); 16 rb.Push(RESULT_SUCCESS);
17 rb.Push<u32>(0); 17 rb.Push<u32>(0);
18 18
19 LOG_WARNING(Service_SET, "(STUBBED) called"); 19 NGLOG_WARNING(Service_SET, "(STUBBED) called");
20} 20}
21 21
22SET_SYS::SET_SYS() : ServiceFramework("set:sys") { 22SET_SYS::SET_SYS() : ServiceFramework("set:sys") {
diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp
index 13e31620d..fe5097cdc 100644
--- a/src/core/hle/service/sm/controller.cpp
+++ b/src/core/hle/service/sm/controller.cpp
@@ -17,7 +17,7 @@ void Controller::ConvertSessionToDomain(Kernel::HLERequestContext& ctx) {
17 rb.Push(RESULT_SUCCESS); 17 rb.Push(RESULT_SUCCESS);
18 rb.Push<u32>(1); // Converted sessions start with 1 request handler 18 rb.Push<u32>(1); // Converted sessions start with 1 request handler
19 19
20 LOG_DEBUG(Service, "called, server_session=%d", ctx.Session()->GetObjectId()); 20 NGLOG_DEBUG(Service, "called, server_session={}", ctx.Session()->GetObjectId());
21} 21}
22 22
23void Controller::DuplicateSession(Kernel::HLERequestContext& ctx) { 23void Controller::DuplicateSession(Kernel::HLERequestContext& ctx) {
@@ -29,11 +29,11 @@ void Controller::DuplicateSession(Kernel::HLERequestContext& ctx) {
29 Kernel::SharedPtr<Kernel::ClientSession> session{ctx.Session()->parent->client}; 29 Kernel::SharedPtr<Kernel::ClientSession> session{ctx.Session()->parent->client};
30 rb.PushMoveObjects(session); 30 rb.PushMoveObjects(session);
31 31
32 LOG_DEBUG(Service, "called, session=%u", session->GetObjectId()); 32 NGLOG_DEBUG(Service, "called, session={}", session->GetObjectId());
33} 33}
34 34
35void Controller::DuplicateSessionEx(Kernel::HLERequestContext& ctx) { 35void Controller::DuplicateSessionEx(Kernel::HLERequestContext& ctx) {
36 LOG_WARNING(Service, "(STUBBED) called, using DuplicateSession"); 36 NGLOG_WARNING(Service, "(STUBBED) called, using DuplicateSession");
37 37
38 DuplicateSession(ctx); 38 DuplicateSession(ctx);
39} 39}
@@ -43,7 +43,7 @@ void Controller::QueryPointerBufferSize(Kernel::HLERequestContext& ctx) {
43 rb.Push(RESULT_SUCCESS); 43 rb.Push(RESULT_SUCCESS);
44 rb.Push<u32>(0x500); 44 rb.Push<u32>(0x500);
45 45
46 LOG_WARNING(Service, "(STUBBED) called"); 46 NGLOG_WARNING(Service, "(STUBBED) called");
47} 47}
48 48
49Controller::Controller() : ServiceFramework("IpcController") { 49Controller::Controller() : ServiceFramework("IpcController") {
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index 4578fc05f..073277ade 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -86,7 +86,7 @@ SM::~SM() = default;
86void SM::Initialize(Kernel::HLERequestContext& ctx) { 86void SM::Initialize(Kernel::HLERequestContext& ctx) {
87 IPC::ResponseBuilder rb{ctx, 2}; 87 IPC::ResponseBuilder rb{ctx, 2};
88 rb.Push(RESULT_SUCCESS); 88 rb.Push(RESULT_SUCCESS);
89 LOG_DEBUG(Service_SM, "called"); 89 NGLOG_DEBUG(Service_SM, "called");
90} 90}
91 91
92void SM::GetService(Kernel::HLERequestContext& ctx) { 92void SM::GetService(Kernel::HLERequestContext& ctx) {
@@ -102,8 +102,8 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
102 if (client_port.Failed()) { 102 if (client_port.Failed()) {
103 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0); 103 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0);
104 rb.Push(client_port.Code()); 104 rb.Push(client_port.Code());
105 LOG_ERROR(Service_SM, "called service=%s -> error 0x%08X", name.c_str(), 105 NGLOG_ERROR(Service_SM, "called service={} -> error {:#010X}", name,
106 client_port.Code().raw); 106 client_port.Code().raw);
107 if (name.length() == 0) 107 if (name.length() == 0)
108 return; // LibNX Fix 108 return; // LibNX Fix
109 UNIMPLEMENTED(); 109 UNIMPLEMENTED();
@@ -113,8 +113,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
113 auto session = client_port.Unwrap()->Connect(); 113 auto session = client_port.Unwrap()->Connect();
114 ASSERT(session.Succeeded()); 114 ASSERT(session.Succeeded());
115 if (session.Succeeded()) { 115 if (session.Succeeded()) {
116 LOG_DEBUG(Service_SM, "called service=%s -> session=%u", name.c_str(), 116 NGLOG_DEBUG(Service_SM, "called service={} -> session={}", name, (*session)->GetObjectId());
117 (*session)->GetObjectId());
118 IPC::ResponseBuilder rb = 117 IPC::ResponseBuilder rb =
119 rp.MakeBuilder(2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles); 118 rp.MakeBuilder(2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles);
120 rb.Push(session.Code()); 119 rb.Push(session.Code());
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp
index f99809bed..ab909fdaa 100644
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -8,7 +8,7 @@
8namespace Service::Sockets { 8namespace Service::Sockets {
9 9
10void BSD::RegisterClient(Kernel::HLERequestContext& ctx) { 10void BSD::RegisterClient(Kernel::HLERequestContext& ctx) {
11 LOG_WARNING(Service, "(STUBBED) called"); 11 NGLOG_WARNING(Service, "(STUBBED) called");
12 12
13 IPC::ResponseBuilder rb{ctx, 3}; 13 IPC::ResponseBuilder rb{ctx, 3};
14 14
@@ -17,7 +17,7 @@ void BSD::RegisterClient(Kernel::HLERequestContext& ctx) {
17} 17}
18 18
19void BSD::StartMonitoring(Kernel::HLERequestContext& ctx) { 19void BSD::StartMonitoring(Kernel::HLERequestContext& ctx) {
20 LOG_WARNING(Service, "(STUBBED) called"); 20 NGLOG_WARNING(Service, "(STUBBED) called");
21 21
22 IPC::ResponseBuilder rb{ctx, 3}; 22 IPC::ResponseBuilder rb{ctx, 3};
23 23
@@ -32,7 +32,8 @@ void BSD::Socket(Kernel::HLERequestContext& ctx) {
32 u32 type = rp.Pop<u32>(); 32 u32 type = rp.Pop<u32>();
33 u32 protocol = rp.Pop<u32>(); 33 u32 protocol = rp.Pop<u32>();
34 34
35 LOG_WARNING(Service, "(STUBBED) called domain=%u type=%u protocol=%u", domain, type, protocol); 35 NGLOG_WARNING(Service, "(STUBBED) called domain={} type={} protocol={}", domain, type,
36 protocol);
36 37
37 u32 fd = next_fd++; 38 u32 fd = next_fd++;
38 39
@@ -44,7 +45,7 @@ void BSD::Socket(Kernel::HLERequestContext& ctx) {
44} 45}
45 46
46void BSD::Connect(Kernel::HLERequestContext& ctx) { 47void BSD::Connect(Kernel::HLERequestContext& ctx) {
47 LOG_WARNING(Service, "(STUBBED) called"); 48 NGLOG_WARNING(Service, "(STUBBED) called");
48 49
49 IPC::ResponseBuilder rb{ctx, 4}; 50 IPC::ResponseBuilder rb{ctx, 4};
50 51
@@ -54,7 +55,7 @@ void BSD::Connect(Kernel::HLERequestContext& ctx) {
54} 55}
55 56
56void BSD::SendTo(Kernel::HLERequestContext& ctx) { 57void BSD::SendTo(Kernel::HLERequestContext& ctx) {
57 LOG_WARNING(Service, "(STUBBED) called"); 58 NGLOG_WARNING(Service, "(STUBBED) called");
58 59
59 IPC::ResponseBuilder rb{ctx, 4}; 60 IPC::ResponseBuilder rb{ctx, 4};
60 61
@@ -64,7 +65,7 @@ void BSD::SendTo(Kernel::HLERequestContext& ctx) {
64} 65}
65 66
66void BSD::Close(Kernel::HLERequestContext& ctx) { 67void BSD::Close(Kernel::HLERequestContext& ctx) {
67 LOG_WARNING(Service, "(STUBBED) called"); 68 NGLOG_WARNING(Service, "(STUBBED) called");
68 69
69 IPC::ResponseBuilder rb{ctx, 4}; 70 IPC::ResponseBuilder rb{ctx, 4};
70 71
diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp
index d235c4cfd..f377e59f2 100644
--- a/src/core/hle/service/sockets/sfdnsres.cpp
+++ b/src/core/hle/service/sockets/sfdnsres.cpp
@@ -10,7 +10,7 @@ namespace Service::Sockets {
10void SFDNSRES::GetAddrInfo(Kernel::HLERequestContext& ctx) { 10void SFDNSRES::GetAddrInfo(Kernel::HLERequestContext& ctx) {
11 IPC::RequestParser rp{ctx}; 11 IPC::RequestParser rp{ctx};
12 12
13 LOG_WARNING(Service, "(STUBBED) called"); 13 NGLOG_WARNING(Service, "(STUBBED) called");
14 14
15 IPC::ResponseBuilder rb{ctx, 2}; 15 IPC::ResponseBuilder rb{ctx, 2};
16 16
diff --git a/src/core/hle/service/spl/module.cpp b/src/core/hle/service/spl/module.cpp
index 3f5a342a7..76ba97156 100644
--- a/src/core/hle/service/spl/module.cpp
+++ b/src/core/hle/service/spl/module.cpp
@@ -28,7 +28,7 @@ void Module::Interface::GetRandomBytes(Kernel::HLERequestContext& ctx) {
28 28
29 IPC::ResponseBuilder rb{ctx, 2}; 29 IPC::ResponseBuilder rb{ctx, 2};
30 rb.Push(RESULT_SUCCESS); 30 rb.Push(RESULT_SUCCESS);
31 LOG_DEBUG(Service_SPL, "called"); 31 NGLOG_DEBUG(Service_SPL, "called");
32} 32}
33 33
34void InstallInterfaces(SM::ServiceManager& service_manager) { 34void InstallInterfaces(SM::ServiceManager& service_manager) {
diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp
index 11d438728..c7788da5c 100644
--- a/src/core/hle/service/ssl/ssl.cpp
+++ b/src/core/hle/service/ssl/ssl.cpp
@@ -65,7 +65,7 @@ public:
65 65
66private: 66private:
67 void SetOption(Kernel::HLERequestContext& ctx) { 67 void SetOption(Kernel::HLERequestContext& ctx) {
68 LOG_WARNING(Service_SSL, "(STUBBED) called"); 68 NGLOG_WARNING(Service_SSL, "(STUBBED) called");
69 IPC::RequestParser rp{ctx}; 69 IPC::RequestParser rp{ctx};
70 70
71 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0); 71 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0);
@@ -73,7 +73,7 @@ private:
73 } 73 }
74 74
75 void CreateConnection(Kernel::HLERequestContext& ctx) { 75 void CreateConnection(Kernel::HLERequestContext& ctx) {
76 LOG_WARNING(Service_SSL, "(STUBBED) called"); 76 NGLOG_WARNING(Service_SSL, "(STUBBED) called");
77 77
78 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 78 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
79 rb.Push(RESULT_SUCCESS); 79 rb.Push(RESULT_SUCCESS);
@@ -82,7 +82,7 @@ private:
82}; 82};
83 83
84void SSL::CreateContext(Kernel::HLERequestContext& ctx) { 84void SSL::CreateContext(Kernel::HLERequestContext& ctx) {
85 LOG_WARNING(Service_SSL, "(STUBBED) called"); 85 NGLOG_WARNING(Service_SSL, "(STUBBED) called");
86 86
87 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 87 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
88 rb.Push(RESULT_SUCCESS); 88 rb.Push(RESULT_SUCCESS);
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index 2604ecc1c..278465358 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -32,14 +32,14 @@ private:
32 const s64 time_since_epoch{std::chrono::duration_cast<std::chrono::seconds>( 32 const s64 time_since_epoch{std::chrono::duration_cast<std::chrono::seconds>(
33 std::chrono::system_clock::now().time_since_epoch()) 33 std::chrono::system_clock::now().time_since_epoch())
34 .count()}; 34 .count()};
35 LOG_DEBUG(Service_Time, "called"); 35 NGLOG_DEBUG(Service_Time, "called");
36 IPC::ResponseBuilder rb{ctx, 4}; 36 IPC::ResponseBuilder rb{ctx, 4};
37 rb.Push(RESULT_SUCCESS); 37 rb.Push(RESULT_SUCCESS);
38 rb.Push<u64>(time_since_epoch); 38 rb.Push<u64>(time_since_epoch);
39 } 39 }
40 40
41 void GetSystemClockContext(Kernel::HLERequestContext& ctx) { 41 void GetSystemClockContext(Kernel::HLERequestContext& ctx) {
42 LOG_WARNING(Service_Time, "(STUBBED) called"); 42 NGLOG_WARNING(Service_Time, "(STUBBED) called");
43 SystemClockContext system_clock_ontext{}; 43 SystemClockContext system_clock_ontext{};
44 IPC::ResponseBuilder rb{ctx, (sizeof(SystemClockContext) / 4) + 2}; 44 IPC::ResponseBuilder rb{ctx, (sizeof(SystemClockContext) / 4) + 2};
45 rb.Push(RESULT_SUCCESS); 45 rb.Push(RESULT_SUCCESS);
@@ -58,7 +58,7 @@ public:
58 58
59private: 59private:
60 void GetCurrentTimePoint(Kernel::HLERequestContext& ctx) { 60 void GetCurrentTimePoint(Kernel::HLERequestContext& ctx) {
61 LOG_DEBUG(Service_Time, "called"); 61 NGLOG_DEBUG(Service_Time, "called");
62 SteadyClockTimePoint steady_clock_time_point{cyclesToMs(CoreTiming::GetTicks()) / 1000}; 62 SteadyClockTimePoint steady_clock_time_point{cyclesToMs(CoreTiming::GetTicks()) / 1000};
63 IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; 63 IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2};
64 rb.Push(RESULT_SUCCESS); 64 rb.Push(RESULT_SUCCESS);
@@ -86,7 +86,7 @@ public:
86 86
87private: 87private:
88 void GetDeviceLocationName(Kernel::HLERequestContext& ctx) { 88 void GetDeviceLocationName(Kernel::HLERequestContext& ctx) {
89 LOG_WARNING(Service_Time, "(STUBBED) called"); 89 NGLOG_WARNING(Service_Time, "(STUBBED) called");
90 LocationName location_name{}; 90 LocationName location_name{};
91 IPC::ResponseBuilder rb{ctx, (sizeof(LocationName) / 4) + 2}; 91 IPC::ResponseBuilder rb{ctx, (sizeof(LocationName) / 4) + 2};
92 rb.Push(RESULT_SUCCESS); 92 rb.Push(RESULT_SUCCESS);
@@ -94,14 +94,14 @@ private:
94 } 94 }
95 95
96 void GetTotalLocationNameCount(Kernel::HLERequestContext& ctx) { 96 void GetTotalLocationNameCount(Kernel::HLERequestContext& ctx) {
97 LOG_WARNING(Service_Time, "(STUBBED) called"); 97 NGLOG_WARNING(Service_Time, "(STUBBED) called");
98 IPC::ResponseBuilder rb{ctx, 3}; 98 IPC::ResponseBuilder rb{ctx, 3};
99 rb.Push(RESULT_SUCCESS); 99 rb.Push(RESULT_SUCCESS);
100 rb.Push<u32>(0); 100 rb.Push<u32>(0);
101 } 101 }
102 102
103 void LoadTimeZoneRule(Kernel::HLERequestContext& ctx) { 103 void LoadTimeZoneRule(Kernel::HLERequestContext& ctx) {
104 LOG_WARNING(Service_Time, "(STUBBED) called"); 104 NGLOG_WARNING(Service_Time, "(STUBBED) called");
105 IPC::ResponseBuilder rb{ctx, 2}; 105 IPC::ResponseBuilder rb{ctx, 2};
106 rb.Push(RESULT_SUCCESS); 106 rb.Push(RESULT_SUCCESS);
107 } 107 }
@@ -110,7 +110,7 @@ private:
110 IPC::RequestParser rp{ctx}; 110 IPC::RequestParser rp{ctx};
111 u64 posix_time = rp.Pop<u64>(); 111 u64 posix_time = rp.Pop<u64>();
112 112
113 LOG_WARNING(Service_Time, "(STUBBED) called, posix_time=0x%016lX", posix_time); 113 NGLOG_WARNING(Service_Time, "(STUBBED) called, posix_time={:#018X}", posix_time);
114 114
115 CalendarTime calendar_time{2018, 1, 1, 0, 0, 0}; 115 CalendarTime calendar_time{2018, 1, 1, 0, 0, 0};
116 CalendarAdditionalInfo additional_info{}; 116 CalendarAdditionalInfo additional_info{};
@@ -125,35 +125,35 @@ void Module::Interface::GetStandardUserSystemClock(Kernel::HLERequestContext& ct
125 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 125 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
126 rb.Push(RESULT_SUCCESS); 126 rb.Push(RESULT_SUCCESS);
127 rb.PushIpcInterface<ISystemClock>(); 127 rb.PushIpcInterface<ISystemClock>();
128 LOG_DEBUG(Service_Time, "called"); 128 NGLOG_DEBUG(Service_Time, "called");
129} 129}
130 130
131void Module::Interface::GetStandardNetworkSystemClock(Kernel::HLERequestContext& ctx) { 131void Module::Interface::GetStandardNetworkSystemClock(Kernel::HLERequestContext& ctx) {
132 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 132 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
133 rb.Push(RESULT_SUCCESS); 133 rb.Push(RESULT_SUCCESS);
134 rb.PushIpcInterface<ISystemClock>(); 134 rb.PushIpcInterface<ISystemClock>();
135 LOG_DEBUG(Service_Time, "called"); 135 NGLOG_DEBUG(Service_Time, "called");
136} 136}
137 137
138void Module::Interface::GetStandardSteadyClock(Kernel::HLERequestContext& ctx) { 138void Module::Interface::GetStandardSteadyClock(Kernel::HLERequestContext& ctx) {
139 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 139 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
140 rb.Push(RESULT_SUCCESS); 140 rb.Push(RESULT_SUCCESS);
141 rb.PushIpcInterface<ISteadyClock>(); 141 rb.PushIpcInterface<ISteadyClock>();
142 LOG_DEBUG(Service_Time, "called"); 142 NGLOG_DEBUG(Service_Time, "called");
143} 143}
144 144
145void Module::Interface::GetTimeZoneService(Kernel::HLERequestContext& ctx) { 145void Module::Interface::GetTimeZoneService(Kernel::HLERequestContext& ctx) {
146 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 146 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
147 rb.Push(RESULT_SUCCESS); 147 rb.Push(RESULT_SUCCESS);
148 rb.PushIpcInterface<ITimeZoneService>(); 148 rb.PushIpcInterface<ITimeZoneService>();
149 LOG_DEBUG(Service_Time, "called"); 149 NGLOG_DEBUG(Service_Time, "called");
150} 150}
151 151
152void Module::Interface::GetStandardLocalSystemClock(Kernel::HLERequestContext& ctx) { 152void Module::Interface::GetStandardLocalSystemClock(Kernel::HLERequestContext& ctx) {
153 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 153 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
154 rb.Push(RESULT_SUCCESS); 154 rb.Push(RESULT_SUCCESS);
155 rb.PushIpcInterface<ISystemClock>(); 155 rb.PushIpcInterface<ISystemClock>();
156 LOG_DEBUG(Service_Time, "called"); 156 NGLOG_DEBUG(Service_Time, "called");
157} 157}
158 158
159Module::Interface::Interface(std::shared_ptr<Module> time, const char* name) 159Module::Interface::Interface(std::shared_ptr<Module> time, const char* name)
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index 36ae2215f..45f3568d2 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -470,7 +470,7 @@ private:
470 u32 flags = rp.Pop<u32>(); 470 u32 flags = rp.Pop<u32>();
471 auto buffer_queue = nv_flinger->GetBufferQueue(id); 471 auto buffer_queue = nv_flinger->GetBufferQueue(id);
472 472
473 LOG_DEBUG(Service_VI, "called, transaction=%x", static_cast<u32>(transaction)); 473 NGLOG_DEBUG(Service_VI, "called, transaction={:X}", static_cast<u32>(transaction));
474 474
475 if (transaction == TransactionId::Connect) { 475 if (transaction == TransactionId::Connect) {
476 IGBPConnectRequestParcel request{ctx.ReadBuffer()}; 476 IGBPConnectRequestParcel request{ctx.ReadBuffer()};
@@ -532,7 +532,7 @@ private:
532 IGBPQueryResponseParcel response{value}; 532 IGBPQueryResponseParcel response{value};
533 ctx.WriteBuffer(response.Serialize()); 533 ctx.WriteBuffer(response.Serialize());
534 } else if (transaction == TransactionId::CancelBuffer) { 534 } else if (transaction == TransactionId::CancelBuffer) {
535 LOG_WARNING(Service_VI, "(STUBBED) called, transaction=CancelBuffer"); 535 NGLOG_WARNING(Service_VI, "(STUBBED) called, transaction=CancelBuffer");
536 } else { 536 } else {
537 ASSERT_MSG(false, "Unimplemented"); 537 ASSERT_MSG(false, "Unimplemented");
538 } 538 }
@@ -547,7 +547,8 @@ private:
547 s32 addval = rp.PopRaw<s32>(); 547 s32 addval = rp.PopRaw<s32>();
548 u32 type = rp.Pop<u32>(); 548 u32 type = rp.Pop<u32>();
549 549
550 LOG_WARNING(Service_VI, "(STUBBED) called id=%u, addval=%08X, type=%08X", id, addval, type); 550 NGLOG_WARNING(Service_VI, "(STUBBED) called id={}, addval={:08X}, type={:08X}", id, addval,
551 type);
551 IPC::ResponseBuilder rb{ctx, 2}; 552 IPC::ResponseBuilder rb{ctx, 2};
552 rb.Push(RESULT_SUCCESS); 553 rb.Push(RESULT_SUCCESS);
553 } 554 }
@@ -561,7 +562,7 @@ private:
561 562
562 // TODO(Subv): Find out what this actually is. 563 // TODO(Subv): Find out what this actually is.
563 564
564 LOG_WARNING(Service_VI, "(STUBBED) called id=%u, unknown=%08X", id, unknown); 565 NGLOG_WARNING(Service_VI, "(STUBBED) called id={}, unknown={:08X}", id, unknown);
565 IPC::ResponseBuilder rb{ctx, 2, 1}; 566 IPC::ResponseBuilder rb{ctx, 2, 1};
566 rb.Push(RESULT_SUCCESS); 567 rb.Push(RESULT_SUCCESS);
567 rb.PushCopyObjects(buffer_queue->GetNativeHandle()); 568 rb.PushCopyObjects(buffer_queue->GetNativeHandle());
@@ -624,7 +625,7 @@ public:
624 625
625private: 626private:
626 void SetLayerZ(Kernel::HLERequestContext& ctx) { 627 void SetLayerZ(Kernel::HLERequestContext& ctx) {
627 LOG_WARNING(Service_VI, "(STUBBED) called"); 628 NGLOG_WARNING(Service_VI, "(STUBBED) called");
628 IPC::RequestParser rp{ctx}; 629 IPC::RequestParser rp{ctx};
629 u64 layer_id = rp.Pop<u64>(); 630 u64 layer_id = rp.Pop<u64>();
630 u64 z_value = rp.Pop<u64>(); 631 u64 z_value = rp.Pop<u64>();
@@ -639,8 +640,8 @@ private:
639 bool visibility = rp.Pop<bool>(); 640 bool visibility = rp.Pop<bool>();
640 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0); 641 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0);
641 rb.Push(RESULT_SUCCESS); 642 rb.Push(RESULT_SUCCESS);
642 LOG_WARNING(Service_VI, "(STUBBED) called, layer_id=0x%x, visibility=%u", layer_id, 643 NGLOG_WARNING(Service_VI, "(STUBBED) called, layer_id={:#010X}, visibility={}", layer_id,
643 visibility); 644 visibility);
644 } 645 }
645}; 646};
646 647
@@ -722,7 +723,7 @@ public:
722 723
723private: 724private:
724 void CloseDisplay(Kernel::HLERequestContext& ctx) { 725 void CloseDisplay(Kernel::HLERequestContext& ctx) {
725 LOG_WARNING(Service_VI, "(STUBBED) called"); 726 NGLOG_WARNING(Service_VI, "(STUBBED) called");
726 IPC::RequestParser rp{ctx}; 727 IPC::RequestParser rp{ctx};
727 u64 display = rp.Pop<u64>(); 728 u64 display = rp.Pop<u64>();
728 729
@@ -731,7 +732,7 @@ private:
731 } 732 }
732 733
733 void CreateManagedLayer(Kernel::HLERequestContext& ctx) { 734 void CreateManagedLayer(Kernel::HLERequestContext& ctx) {
734 LOG_WARNING(Service_VI, "(STUBBED) called"); 735 NGLOG_WARNING(Service_VI, "(STUBBED) called");
735 IPC::RequestParser rp{ctx}; 736 IPC::RequestParser rp{ctx};
736 u32 unknown = rp.Pop<u32>(); 737 u32 unknown = rp.Pop<u32>();
737 rp.Skip(1, false); 738 rp.Skip(1, false);
@@ -746,7 +747,7 @@ private:
746 } 747 }
747 748
748 void AddToLayerStack(Kernel::HLERequestContext& ctx) { 749 void AddToLayerStack(Kernel::HLERequestContext& ctx) {
749 LOG_WARNING(Service_VI, "(STUBBED) called"); 750 NGLOG_WARNING(Service_VI, "(STUBBED) called");
750 IPC::RequestParser rp{ctx}; 751 IPC::RequestParser rp{ctx};
751 u32 stack = rp.Pop<u32>(); 752 u32 stack = rp.Pop<u32>();
752 u64 layer_id = rp.Pop<u64>(); 753 u64 layer_id = rp.Pop<u64>();
@@ -761,8 +762,8 @@ private:
761 bool visibility = rp.Pop<bool>(); 762 bool visibility = rp.Pop<bool>();
762 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0); 763 IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0);
763 rb.Push(RESULT_SUCCESS); 764 rb.Push(RESULT_SUCCESS);
764 LOG_WARNING(Service_VI, "(STUBBED) called, layer_id=0x%x, visibility=%u", layer_id, 765 NGLOG_WARNING(Service_VI, "(STUBBED) called, layer_id={:#X}, visibility={}", layer_id,
765 visibility); 766 visibility);
766 } 767 }
767 768
768 std::shared_ptr<NVFlinger::NVFlinger> nv_flinger; 769 std::shared_ptr<NVFlinger::NVFlinger> nv_flinger;
@@ -775,7 +776,7 @@ public:
775 776
776private: 777private:
777 void GetRelayService(Kernel::HLERequestContext& ctx) { 778 void GetRelayService(Kernel::HLERequestContext& ctx) {
778 LOG_WARNING(Service_VI, "(STUBBED) called"); 779 NGLOG_WARNING(Service_VI, "(STUBBED) called");
779 780
780 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 781 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
781 rb.Push(RESULT_SUCCESS); 782 rb.Push(RESULT_SUCCESS);
@@ -783,7 +784,7 @@ private:
783 } 784 }
784 785
785 void GetSystemDisplayService(Kernel::HLERequestContext& ctx) { 786 void GetSystemDisplayService(Kernel::HLERequestContext& ctx) {
786 LOG_WARNING(Service_VI, "(STUBBED) called"); 787 NGLOG_WARNING(Service_VI, "(STUBBED) called");
787 788
788 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 789 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
789 rb.Push(RESULT_SUCCESS); 790 rb.Push(RESULT_SUCCESS);
@@ -791,7 +792,7 @@ private:
791 } 792 }
792 793
793 void GetManagerDisplayService(Kernel::HLERequestContext& ctx) { 794 void GetManagerDisplayService(Kernel::HLERequestContext& ctx) {
794 LOG_WARNING(Service_VI, "(STUBBED) called"); 795 NGLOG_WARNING(Service_VI, "(STUBBED) called");
795 796
796 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 797 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
797 rb.Push(RESULT_SUCCESS); 798 rb.Push(RESULT_SUCCESS);
@@ -799,7 +800,7 @@ private:
799 } 800 }
800 801
801 void GetIndirectDisplayTransactionService(Kernel::HLERequestContext& ctx) { 802 void GetIndirectDisplayTransactionService(Kernel::HLERequestContext& ctx) {
802 LOG_WARNING(Service_VI, "(STUBBED) called"); 803 NGLOG_WARNING(Service_VI, "(STUBBED) called");
803 804
804 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 805 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
805 rb.Push(RESULT_SUCCESS); 806 rb.Push(RESULT_SUCCESS);
@@ -807,7 +808,7 @@ private:
807 } 808 }
808 809
809 void OpenDisplay(Kernel::HLERequestContext& ctx) { 810 void OpenDisplay(Kernel::HLERequestContext& ctx) {
810 LOG_WARNING(Service_VI, "(STUBBED) called"); 811 NGLOG_WARNING(Service_VI, "(STUBBED) called");
811 IPC::RequestParser rp{ctx}; 812 IPC::RequestParser rp{ctx};
812 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>(); 813 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
813 auto end = std::find(name_buf.begin(), name_buf.end(), '\0'); 814 auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
@@ -822,7 +823,7 @@ private:
822 } 823 }
823 824
824 void CloseDisplay(Kernel::HLERequestContext& ctx) { 825 void CloseDisplay(Kernel::HLERequestContext& ctx) {
825 LOG_WARNING(Service_VI, "(STUBBED) called"); 826 NGLOG_WARNING(Service_VI, "(STUBBED) called");
826 IPC::RequestParser rp{ctx}; 827 IPC::RequestParser rp{ctx};
827 u64 display_id = rp.Pop<u64>(); 828 u64 display_id = rp.Pop<u64>();
828 829
@@ -831,7 +832,7 @@ private:
831 } 832 }
832 833
833 void GetDisplayResolution(Kernel::HLERequestContext& ctx) { 834 void GetDisplayResolution(Kernel::HLERequestContext& ctx) {
834 LOG_WARNING(Service_VI, "(STUBBED) called"); 835 NGLOG_WARNING(Service_VI, "(STUBBED) called");
835 IPC::RequestParser rp{ctx}; 836 IPC::RequestParser rp{ctx};
836 u64 display_id = rp.Pop<u64>(); 837 u64 display_id = rp.Pop<u64>();
837 838
@@ -848,7 +849,7 @@ private:
848 } 849 }
849 850
850 void SetLayerScalingMode(Kernel::HLERequestContext& ctx) { 851 void SetLayerScalingMode(Kernel::HLERequestContext& ctx) {
851 LOG_WARNING(Service_VI, "(STUBBED) called"); 852 NGLOG_WARNING(Service_VI, "(STUBBED) called");
852 IPC::RequestParser rp{ctx}; 853 IPC::RequestParser rp{ctx};
853 u32 scaling_mode = rp.Pop<u32>(); 854 u32 scaling_mode = rp.Pop<u32>();
854 u64 unknown = rp.Pop<u64>(); 855 u64 unknown = rp.Pop<u64>();
@@ -864,11 +865,11 @@ private:
864 IPC::ResponseBuilder rb = rp.MakeBuilder(4, 0, 0); 865 IPC::ResponseBuilder rb = rp.MakeBuilder(4, 0, 0);
865 rb.Push(RESULT_SUCCESS); 866 rb.Push(RESULT_SUCCESS);
866 rb.Push<u64>(1); 867 rb.Push<u64>(1);
867 LOG_WARNING(Service_VI, "(STUBBED) called"); 868 NGLOG_WARNING(Service_VI, "(STUBBED) called");
868 } 869 }
869 870
870 void OpenLayer(Kernel::HLERequestContext& ctx) { 871 void OpenLayer(Kernel::HLERequestContext& ctx) {
871 LOG_DEBUG(Service_VI, "called"); 872 NGLOG_DEBUG(Service_VI, "called");
872 IPC::RequestParser rp{ctx}; 873 IPC::RequestParser rp{ctx};
873 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>(); 874 auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
874 auto end = std::find(name_buf.begin(), name_buf.end(), '\0'); 875 auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
@@ -888,7 +889,7 @@ private:
888 } 889 }
889 890
890 void CreateStrayLayer(Kernel::HLERequestContext& ctx) { 891 void CreateStrayLayer(Kernel::HLERequestContext& ctx) {
891 LOG_DEBUG(Service_VI, "called"); 892 NGLOG_DEBUG(Service_VI, "called");
892 893
893 IPC::RequestParser rp{ctx}; 894 IPC::RequestParser rp{ctx};
894 u32 flags = rp.Pop<u32>(); 895 u32 flags = rp.Pop<u32>();
@@ -908,7 +909,7 @@ private:
908 } 909 }
909 910
910 void DestroyStrayLayer(Kernel::HLERequestContext& ctx) { 911 void DestroyStrayLayer(Kernel::HLERequestContext& ctx) {
911 LOG_WARNING(Service_VI, "(STUBBED) called"); 912 NGLOG_WARNING(Service_VI, "(STUBBED) called");
912 913
913 IPC::RequestParser rp{ctx}; 914 IPC::RequestParser rp{ctx};
914 u64 layer_id = rp.Pop<u64>(); 915 u64 layer_id = rp.Pop<u64>();
@@ -918,7 +919,7 @@ private:
918 } 919 }
919 920
920 void GetDisplayVsyncEvent(Kernel::HLERequestContext& ctx) { 921 void GetDisplayVsyncEvent(Kernel::HLERequestContext& ctx) {
921 LOG_WARNING(Service_VI, "(STUBBED) called"); 922 NGLOG_WARNING(Service_VI, "(STUBBED) called");
922 IPC::RequestParser rp{ctx}; 923 IPC::RequestParser rp{ctx};
923 u64 display_id = rp.Pop<u64>(); 924 u64 display_id = rp.Pop<u64>();
924 925
@@ -967,7 +968,7 @@ Module::Interface::Interface(std::shared_ptr<Module> module, const char* name,
967 : ServiceFramework(name), module(std::move(module)), nv_flinger(std::move(nv_flinger)) {} 968 : ServiceFramework(name), module(std::move(module)), nv_flinger(std::move(nv_flinger)) {}
968 969
969void Module::Interface::GetDisplayService(Kernel::HLERequestContext& ctx) { 970void Module::Interface::GetDisplayService(Kernel::HLERequestContext& ctx) {
970 LOG_WARNING(Service_VI, "(STUBBED) called"); 971 NGLOG_WARNING(Service_VI, "(STUBBED) called");
971 972
972 IPC::ResponseBuilder rb{ctx, 2, 0, 1}; 973 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
973 rb.Push(RESULT_SUCCESS); 974 rb.Push(RESULT_SUCCESS);