Просмотр исходного кода

logger: Add NIFM service logging category.

bunnei 8 лет назад
Родитель
Сommit
485c6541cf

+ 1 - 0
src/common/logging/backend.cpp

@@ -40,6 +40,7 @@ namespace Log {
     SUB(Service, CFG)                                                                              \
     SUB(Service, CFG)                                                                              \
     SUB(Service, DSP)                                                                              \
     SUB(Service, DSP)                                                                              \
     SUB(Service, HID)                                                                              \
     SUB(Service, HID)                                                                              \
+    SUB(Service, NIFM)                                                                             \
     SUB(Service, NVDRV)                                                                            \
     SUB(Service, NVDRV)                                                                            \
     SUB(Service, Audio)                                                                            \
     SUB(Service, Audio)                                                                            \
     SUB(Service, VI)                                                                               \
     SUB(Service, VI)                                                                               \

+ 1 - 0
src/common/logging/log.h

@@ -57,6 +57,7 @@ enum class Class : ClassType {
     Service_CFG,       ///< The CFG (Configuration) service
     Service_CFG,       ///< The CFG (Configuration) service
     Service_DSP,       ///< The DSP (DSP control) service
     Service_DSP,       ///< The DSP (DSP control) service
     Service_HID,       ///< The HID (Human interface device) service
     Service_HID,       ///< The HID (Human interface device) service
+    Service_NIFM,      ///< The NIFM (Network interface) service
     Service_NVDRV,     ///< The NVDRV (Nvidia driver) service
     Service_NVDRV,     ///< The NVDRV (Nvidia driver) service
     Service_Audio,     ///< The Audio (Audio control) service
     Service_Audio,     ///< The Audio (Audio control) service
     Service_VI,        ///< The VI (Video interface) service
     Service_VI,        ///< The VI (Video interface) service

+ 5 - 5
src/core/hle/service/nifm/nifm.cpp

@@ -112,7 +112,7 @@ IGeneralService::IGeneralService() : ServiceFramework("IGeneralService") {
 }
 }
 
 
 void IGeneralService::GetClientId(Kernel::HLERequestContext& ctx) {
 void IGeneralService::GetClientId(Kernel::HLERequestContext& ctx) {
-    LOG_WARNING(Service, "(STUBBED) called");
+    LOG_WARNING(Service_NIFM, "(STUBBED) called");
     IPC::ResponseBuilder rb{ctx, 4};
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.Push<u64>(0);
     rb.Push<u64>(0);
@@ -124,7 +124,7 @@ void IGeneralService::CreateScanRequest(Kernel::HLERequestContext& ctx) {
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IScanRequest>();
     rb.PushIpcInterface<IScanRequest>();
 
 
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) {
 void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) {
@@ -133,11 +133,11 @@ void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) {
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IRequest>();
     rb.PushIpcInterface<IRequest>();
 
 
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 void IGeneralService::RemoveNetworkProfile(Kernel::HLERequestContext& ctx) {
 void IGeneralService::RemoveNetworkProfile(Kernel::HLERequestContext& ctx) {
-    LOG_WARNING(Service, "(STUBBED) called");
+    LOG_WARNING(Service_NIFM, "(STUBBED) called");
     IPC::ResponseBuilder rb{ctx, 2};
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
 }
 }
@@ -148,7 +148,7 @@ void IGeneralService::CreateTemporaryNetworkProfile(Kernel::HLERequestContext& c
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<INetworkProfile>();
     rb.PushIpcInterface<INetworkProfile>();
 
 
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 void InstallInterfaces(SM::ServiceManager& service_manager) {
 void InstallInterfaces(SM::ServiceManager& service_manager) {

+ 2 - 2
src/core/hle/service/nifm/nifm_a.cpp

@@ -14,14 +14,14 @@ void NIFM_A::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IGeneralService>();
     rb.PushIpcInterface<IGeneralService>();
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 void NIFM_A::CreateGeneralService(Kernel::HLERequestContext& ctx) {
 void NIFM_A::CreateGeneralService(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IGeneralService>();
     rb.PushIpcInterface<IGeneralService>();
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 NIFM_A::NIFM_A() : ServiceFramework("nifm:a") {
 NIFM_A::NIFM_A() : ServiceFramework("nifm:a") {

+ 2 - 2
src/core/hle/service/nifm/nifm_s.cpp

@@ -14,14 +14,14 @@ void NIFM_S::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IGeneralService>();
     rb.PushIpcInterface<IGeneralService>();
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 void NIFM_S::CreateGeneralService(Kernel::HLERequestContext& ctx) {
 void NIFM_S::CreateGeneralService(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IGeneralService>();
     rb.PushIpcInterface<IGeneralService>();
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 NIFM_S::NIFM_S() : ServiceFramework("nifm:s") {
 NIFM_S::NIFM_S() : ServiceFramework("nifm:s") {

+ 2 - 2
src/core/hle/service/nifm/nifm_u.cpp

@@ -14,14 +14,14 @@ void NIFM_U::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IGeneralService>();
     rb.PushIpcInterface<IGeneralService>();
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 void NIFM_U::CreateGeneralService(Kernel::HLERequestContext& ctx) {
 void NIFM_U::CreateGeneralService(Kernel::HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     IPC::ResponseBuilder rb{ctx, 2, 0, 1};
     rb.Push(RESULT_SUCCESS);
     rb.Push(RESULT_SUCCESS);
     rb.PushIpcInterface<IGeneralService>();
     rb.PushIpcInterface<IGeneralService>();
-    LOG_DEBUG(Service, "called");
+    LOG_DEBUG(Service_NIFM, "called");
 }
 }
 
 
 NIFM_U::NIFM_U() : ServiceFramework("nifm:u") {
 NIFM_U::NIFM_U() : ServiceFramework("nifm:u") {