summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-02-13 19:07:37 -0800
committerGravatar GitHub2017-02-13 19:07:37 -0800
commita0dfe090b912dc6f39196c5f06e9ee820a530a17 (patch)
treeece5577de9028fa539aa89e8419419b548c6f58d /src
parentMerge pull request #2562 from yuriks/pica-refactor3 (diff)
parentapplied the change suggested by @wwylele (diff)
downloadyuzu-a0dfe090b912dc6f39196c5f06e9ee820a530a17.tar.gz
yuzu-a0dfe090b912dc6f39196c5f06e9ee820a530a17.tar.xz
yuzu-a0dfe090b912dc6f39196c5f06e9ee820a530a17.zip
Merge pull request #2542 from jfmherokiller/httpsvclog
added http service enum to the log.h file
Diffstat (limited to 'src')
-rw-r--r--src/common/logging/backend.cpp1
-rw-r--r--src/common/logging/log.h1
-rw-r--r--src/core/hle/service/ir/ir_u.cpp2
-rw-r--r--src/core/hle/service/nim/nim.cpp2
4 files changed, 4 insertions, 2 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 2ef3e6b05..0f0354821 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -55,6 +55,7 @@ namespace Log {
55 SUB(Service, DSP) \ 55 SUB(Service, DSP) \
56 SUB(Service, DLP) \ 56 SUB(Service, DLP) \
57 SUB(Service, HID) \ 57 SUB(Service, HID) \
58 SUB(Service, HTTP) \
58 SUB(Service, SOC) \ 59 SUB(Service, SOC) \
59 SUB(Service, IR) \ 60 SUB(Service, IR) \
60 SUB(Service, Y2R) \ 61 SUB(Service, Y2R) \
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 4330ef879..f0ec922d2 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -72,6 +72,7 @@ enum class Class : ClassType {
72 Service_DSP, ///< The DSP (DSP control) service 72 Service_DSP, ///< The DSP (DSP control) service
73 Service_DLP, ///< The DLP (Download Play) service 73 Service_DLP, ///< The DLP (Download Play) service
74 Service_HID, ///< The HID (Human interface device) service 74 Service_HID, ///< The HID (Human interface device) service
75 Service_HTTP, ///< The HTTP service
75 Service_SOC, ///< The SOC (Socket) service 76 Service_SOC, ///< The SOC (Socket) service
76 Service_IR, ///< The IR service 77 Service_IR, ///< The IR service
77 Service_Y2R, ///< The Y2R (YUV to RGB conversion) service 78 Service_Y2R, ///< The Y2R (YUV to RGB conversion) service
diff --git a/src/core/hle/service/ir/ir_u.cpp b/src/core/hle/service/ir/ir_u.cpp
index 429615f31..ce00d5732 100644
--- a/src/core/hle/service/ir/ir_u.cpp
+++ b/src/core/hle/service/ir/ir_u.cpp
@@ -27,7 +27,7 @@ const Interface::FunctionInfo FunctionTable[] = {
27 {0x00100000, nullptr, "GetErrorStatus"}, 27 {0x00100000, nullptr, "GetErrorStatus"},
28 {0x00110040, nullptr, "SetSleepModeActive"}, 28 {0x00110040, nullptr, "SetSleepModeActive"},
29 {0x00120040, nullptr, "SetSleepModeState"}, 29 {0x00120040, nullptr, "SetSleepModeState"},
30 // clang-format off 30 // clang-format on
31}; 31};
32 32
33IR_U_Interface::IR_U_Interface() { 33IR_U_Interface::IR_U_Interface() {
diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp
index 0be94322c..63c334cb2 100644
--- a/src/core/hle/service/nim/nim.cpp
+++ b/src/core/hle/service/nim/nim.cpp
@@ -19,7 +19,7 @@ void CheckSysUpdateAvailable(Service::Interface* self) {
19 cmd_buff[1] = RESULT_SUCCESS.raw; 19 cmd_buff[1] = RESULT_SUCCESS.raw;
20 cmd_buff[2] = 0; // No update available 20 cmd_buff[2] = 0; // No update available
21 21
22 LOG_WARNING(Service_NWM, "(STUBBED) called"); 22 LOG_WARNING(Service_NIM, "(STUBBED) called");
23} 23}
24 24
25void Init() { 25void Init() {