summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/logging/log.h2
-rw-r--r--src/core/hle/service/cecd/cecd.cpp9
-rw-r--r--src/core/hle/service/cecd/cecd.h18
-rw-r--r--src/core/hle/service/cecd/cecd_u.cpp1
4 files changed, 29 insertions, 1 deletions
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index b8eede3b8..521362317 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -62,7 +62,7 @@ enum class Class : ClassType {
62 Service_NIM, ///< The NIM (Network interface manager) service 62 Service_NIM, ///< The NIM (Network interface manager) service
63 Service_NWM, ///< The NWM (Network wlan manager) service 63 Service_NWM, ///< The NWM (Network wlan manager) service
64 Service_CAM, ///< The CAM (Camera) service 64 Service_CAM, ///< The CAM (Camera) service
65 Service_CECD, ///< The CECD service 65 Service_CECD, ///< The CECD (StreetPass) service
66 Service_CFG, ///< The CFG (Configuration) service 66 Service_CFG, ///< The CFG (Configuration) service
67 Service_DSP, ///< The DSP (DSP control) service 67 Service_DSP, ///< The DSP (DSP control) service
68 Service_DLP, ///< The DLP (Download Play) service 68 Service_DLP, ///< The DLP (Download Play) service
diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp
index e6e36e7ec..50c03495e 100644
--- a/src/core/hle/service/cecd/cecd.cpp
+++ b/src/core/hle/service/cecd/cecd.cpp
@@ -16,6 +16,15 @@ namespace CECD {
16static Kernel::SharedPtr<Kernel::Event> cecinfo_event; 16static Kernel::SharedPtr<Kernel::Event> cecinfo_event;
17static Kernel::SharedPtr<Kernel::Event> change_state_event; 17static Kernel::SharedPtr<Kernel::Event> change_state_event;
18 18
19void GetCecStateAbbreviated(Service::Interface* self) {
20 u32* cmd_buff = Kernel::GetCommandBuffer();
21
22 cmd_buff[1] = RESULT_SUCCESS.raw; // No error
23 cmd_buff[2] = static_cast<u32>(CecStateAbbreviated::CEC_STATE_ABBREV_IDLE);
24
25 LOG_WARNING(Service_CECD, "(STUBBED) called");
26}
27
19void GetCecInfoEventHandle(Service::Interface* self) { 28void GetCecInfoEventHandle(Service::Interface* self) {
20 u32* cmd_buff = Kernel::GetCommandBuffer(); 29 u32* cmd_buff = Kernel::GetCommandBuffer();
21 30
diff --git a/src/core/hle/service/cecd/cecd.h b/src/core/hle/service/cecd/cecd.h
index 89a8d67bb..435611363 100644
--- a/src/core/hle/service/cecd/cecd.h
+++ b/src/core/hle/service/cecd/cecd.h
@@ -10,6 +10,24 @@ class Interface;
10 10
11namespace CECD { 11namespace CECD {
12 12
13enum class CecStateAbbreviated {
14 CEC_STATE_ABBREV_IDLE = 1, ///< Corresponds to CEC_STATE_IDLE
15 CEC_STATE_ABBREV_NOT_LOCAL = 2, ///< Corresponds to CEC_STATEs *FINISH*, *POST, and OVER_BOSS
16 CEC_STATE_ABBREV_SCANNING = 3, ///< Corresponds to CEC_STATE_SCANNING
17 CEC_STATE_ABBREV_WLREADY = 4, ///< Corresponds to CEC_STATE_WIRELESS_READY when some unknown bool is true
18 CEC_STATE_ABBREV_OTHER = 5, ///< Corresponds to CEC_STATEs besides *FINISH*, *POST, and OVER_BOSS and those listed here
19};
20
21/**
22 * GetCecStateAbbreviated service function
23 * Inputs:
24 * 0: 0x000E0000
25 * Outputs:
26 * 1: ResultCode
27 * 2: CecStateAbbreviated
28 */
29void GetCecStateAbbreviated(Service::Interface* self);
30
13/** 31/**
14 * GetCecInfoEventHandle service function 32 * GetCecInfoEventHandle service function
15 * Inputs: 33 * Inputs:
diff --git a/src/core/hle/service/cecd/cecd_u.cpp b/src/core/hle/service/cecd/cecd_u.cpp
index ace1c73c0..be6d4d8f6 100644
--- a/src/core/hle/service/cecd/cecd_u.cpp
+++ b/src/core/hle/service/cecd/cecd_u.cpp
@@ -9,6 +9,7 @@ namespace Service {
9namespace CECD { 9namespace CECD {
10 10
11static const Interface::FunctionInfo FunctionTable[] = { 11static const Interface::FunctionInfo FunctionTable[] = {
12 {0x000E0000, GetCecStateAbbreviated, "GetCecStateAbbreviated"},
12 {0x000F0000, GetCecInfoEventHandle, "GetCecInfoEventHandle"}, 13 {0x000F0000, GetCecInfoEventHandle, "GetCecInfoEventHandle"},
13 {0x00100000, GetChangeStateEventHandle, "GetChangeStateEventHandle"}, 14 {0x00100000, GetChangeStateEventHandle, "GetChangeStateEventHandle"},
14 {0x00120104, nullptr, "ReadSavedData"}, 15 {0x00120104, nullptr, "ReadSavedData"},