diff options
| -rw-r--r-- | src/common/logging/backend.cpp | 1 | ||||
| -rw-r--r-- | src/common/logging/log.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/nifm/nifm.cpp | 10 | ||||
| -rw-r--r-- | src/core/hle/service/nifm/nifm_a.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nifm/nifm_s.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nifm/nifm_u.cpp | 4 |
6 files changed, 13 insertions, 11 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 7d7291612..c1f0311ce 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -40,6 +40,7 @@ namespace Log { | |||
| 40 | SUB(Service, CFG) \ | 40 | SUB(Service, CFG) \ |
| 41 | SUB(Service, DSP) \ | 41 | SUB(Service, DSP) \ |
| 42 | SUB(Service, HID) \ | 42 | SUB(Service, HID) \ |
| 43 | SUB(Service, NIFM) \ | ||
| 43 | SUB(Service, NVDRV) \ | 44 | SUB(Service, NVDRV) \ |
| 44 | SUB(Service, Audio) \ | 45 | SUB(Service, Audio) \ |
| 45 | SUB(Service, VI) \ | 46 | SUB(Service, VI) \ |
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 76cee71cb..bf1fe9bbc 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h | |||
| @@ -57,6 +57,7 @@ enum class Class : ClassType { | |||
| 57 | Service_CFG, ///< The CFG (Configuration) service | 57 | Service_CFG, ///< The CFG (Configuration) service |
| 58 | Service_DSP, ///< The DSP (DSP control) service | 58 | Service_DSP, ///< The DSP (DSP control) service |
| 59 | Service_HID, ///< The HID (Human interface device) service | 59 | Service_HID, ///< The HID (Human interface device) service |
| 60 | Service_NIFM, ///< The NIFM (Network interface) service | ||
| 60 | Service_NVDRV, ///< The NVDRV (Nvidia driver) service | 61 | Service_NVDRV, ///< The NVDRV (Nvidia driver) service |
| 61 | Service_Audio, ///< The Audio (Audio control) service | 62 | Service_Audio, ///< The Audio (Audio control) service |
| 62 | Service_VI, ///< The VI (Video interface) service | 63 | Service_VI, ///< The VI (Video interface) service |
diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index f91571eb4..290a2ee74 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp | |||
| @@ -112,7 +112,7 @@ IGeneralService::IGeneralService() : ServiceFramework("IGeneralService") { | |||
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | void IGeneralService::GetClientId(Kernel::HLERequestContext& ctx) { | 114 | void IGeneralService::GetClientId(Kernel::HLERequestContext& ctx) { |
| 115 | LOG_WARNING(Service, "(STUBBED) called"); | 115 | LOG_WARNING(Service_NIFM, "(STUBBED) called"); |
| 116 | IPC::ResponseBuilder rb{ctx, 4}; | 116 | IPC::ResponseBuilder rb{ctx, 4}; |
| 117 | rb.Push(RESULT_SUCCESS); | 117 | rb.Push(RESULT_SUCCESS); |
| 118 | rb.Push<u64>(0); | 118 | rb.Push<u64>(0); |
| @@ -124,7 +124,7 @@ void IGeneralService::CreateScanRequest(Kernel::HLERequestContext& ctx) { | |||
| 124 | rb.Push(RESULT_SUCCESS); | 124 | rb.Push(RESULT_SUCCESS); |
| 125 | rb.PushIpcInterface<IScanRequest>(); | 125 | rb.PushIpcInterface<IScanRequest>(); |
| 126 | 126 | ||
| 127 | LOG_DEBUG(Service, "called"); | 127 | LOG_DEBUG(Service_NIFM, "called"); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) { | 130 | void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) { |
| @@ -133,11 +133,11 @@ void IGeneralService::CreateRequest(Kernel::HLERequestContext& ctx) { | |||
| 133 | rb.Push(RESULT_SUCCESS); | 133 | rb.Push(RESULT_SUCCESS); |
| 134 | rb.PushIpcInterface<IRequest>(); | 134 | rb.PushIpcInterface<IRequest>(); |
| 135 | 135 | ||
| 136 | LOG_DEBUG(Service, "called"); | 136 | LOG_DEBUG(Service_NIFM, "called"); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | void IGeneralService::RemoveNetworkProfile(Kernel::HLERequestContext& ctx) { | 139 | void IGeneralService::RemoveNetworkProfile(Kernel::HLERequestContext& ctx) { |
| 140 | LOG_WARNING(Service, "(STUBBED) called"); | 140 | LOG_WARNING(Service_NIFM, "(STUBBED) called"); |
| 141 | IPC::ResponseBuilder rb{ctx, 2}; | 141 | IPC::ResponseBuilder rb{ctx, 2}; |
| 142 | rb.Push(RESULT_SUCCESS); | 142 | rb.Push(RESULT_SUCCESS); |
| 143 | } | 143 | } |
| @@ -148,7 +148,7 @@ void IGeneralService::CreateTemporaryNetworkProfile(Kernel::HLERequestContext& c | |||
| 148 | rb.Push(RESULT_SUCCESS); | 148 | rb.Push(RESULT_SUCCESS); |
| 149 | rb.PushIpcInterface<INetworkProfile>(); | 149 | rb.PushIpcInterface<INetworkProfile>(); |
| 150 | 150 | ||
| 151 | LOG_DEBUG(Service, "called"); | 151 | LOG_DEBUG(Service_NIFM, "called"); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | void InstallInterfaces(SM::ServiceManager& service_manager) { | 154 | void InstallInterfaces(SM::ServiceManager& service_manager) { |
diff --git a/src/core/hle/service/nifm/nifm_a.cpp b/src/core/hle/service/nifm/nifm_a.cpp index 3835a87bf..ee61d8ff4 100644 --- a/src/core/hle/service/nifm/nifm_a.cpp +++ b/src/core/hle/service/nifm/nifm_a.cpp | |||
| @@ -14,14 +14,14 @@ void NIFM_A::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) { | |||
| 14 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 14 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 15 | rb.Push(RESULT_SUCCESS); | 15 | rb.Push(RESULT_SUCCESS); |
| 16 | rb.PushIpcInterface<IGeneralService>(); | 16 | rb.PushIpcInterface<IGeneralService>(); |
| 17 | LOG_DEBUG(Service, "called"); | 17 | LOG_DEBUG(Service_NIFM, "called"); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | void NIFM_A::CreateGeneralService(Kernel::HLERequestContext& ctx) { | 20 | void NIFM_A::CreateGeneralService(Kernel::HLERequestContext& ctx) { |
| 21 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 21 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 22 | rb.Push(RESULT_SUCCESS); | 22 | rb.Push(RESULT_SUCCESS); |
| 23 | rb.PushIpcInterface<IGeneralService>(); | 23 | rb.PushIpcInterface<IGeneralService>(); |
| 24 | LOG_DEBUG(Service, "called"); | 24 | LOG_DEBUG(Service_NIFM, "called"); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | NIFM_A::NIFM_A() : ServiceFramework("nifm:a") { | 27 | NIFM_A::NIFM_A() : ServiceFramework("nifm:a") { |
diff --git a/src/core/hle/service/nifm/nifm_s.cpp b/src/core/hle/service/nifm/nifm_s.cpp index cbb42891c..c38b2a4c7 100644 --- a/src/core/hle/service/nifm/nifm_s.cpp +++ b/src/core/hle/service/nifm/nifm_s.cpp | |||
| @@ -14,14 +14,14 @@ void NIFM_S::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) { | |||
| 14 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 14 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 15 | rb.Push(RESULT_SUCCESS); | 15 | rb.Push(RESULT_SUCCESS); |
| 16 | rb.PushIpcInterface<IGeneralService>(); | 16 | rb.PushIpcInterface<IGeneralService>(); |
| 17 | LOG_DEBUG(Service, "called"); | 17 | LOG_DEBUG(Service_NIFM, "called"); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | void NIFM_S::CreateGeneralService(Kernel::HLERequestContext& ctx) { | 20 | void NIFM_S::CreateGeneralService(Kernel::HLERequestContext& ctx) { |
| 21 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 21 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 22 | rb.Push(RESULT_SUCCESS); | 22 | rb.Push(RESULT_SUCCESS); |
| 23 | rb.PushIpcInterface<IGeneralService>(); | 23 | rb.PushIpcInterface<IGeneralService>(); |
| 24 | LOG_DEBUG(Service, "called"); | 24 | LOG_DEBUG(Service_NIFM, "called"); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | NIFM_S::NIFM_S() : ServiceFramework("nifm:s") { | 27 | NIFM_S::NIFM_S() : ServiceFramework("nifm:s") { |
diff --git a/src/core/hle/service/nifm/nifm_u.cpp b/src/core/hle/service/nifm/nifm_u.cpp index c6de14744..a5895c13c 100644 --- a/src/core/hle/service/nifm/nifm_u.cpp +++ b/src/core/hle/service/nifm/nifm_u.cpp | |||
| @@ -14,14 +14,14 @@ void NIFM_U::CreateGeneralServiceOld(Kernel::HLERequestContext& ctx) { | |||
| 14 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 14 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 15 | rb.Push(RESULT_SUCCESS); | 15 | rb.Push(RESULT_SUCCESS); |
| 16 | rb.PushIpcInterface<IGeneralService>(); | 16 | rb.PushIpcInterface<IGeneralService>(); |
| 17 | LOG_DEBUG(Service, "called"); | 17 | LOG_DEBUG(Service_NIFM, "called"); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | void NIFM_U::CreateGeneralService(Kernel::HLERequestContext& ctx) { | 20 | void NIFM_U::CreateGeneralService(Kernel::HLERequestContext& ctx) { |
| 21 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | 21 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; |
| 22 | rb.Push(RESULT_SUCCESS); | 22 | rb.Push(RESULT_SUCCESS); |
| 23 | rb.PushIpcInterface<IGeneralService>(); | 23 | rb.PushIpcInterface<IGeneralService>(); |
| 24 | LOG_DEBUG(Service, "called"); | 24 | LOG_DEBUG(Service_NIFM, "called"); |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | NIFM_U::NIFM_U() : ServiceFramework("nifm:u") { | 27 | NIFM_U::NIFM_U() : ServiceFramework("nifm:u") { |