diff options
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/ac_u.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/apt_u.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/apt_u.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/boss_u.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/err_f.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/err_f.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/fs_user.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid_user.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/mic_u.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/service.h | 14 |
11 files changed, 21 insertions, 21 deletions
diff --git a/src/core/hle/service/ac_u.h b/src/core/hle/service/ac_u.h index 3c5958d27..8509a793e 100644 --- a/src/core/hle/service/ac_u.h +++ b/src/core/hle/service/ac_u.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 10 | // Namespace AC_U | 10 | // Namespace AC_U |
| 11 | 11 | ||
| 12 | // socket service "ac:u" | 12 | // socket service "ac:u" |
| 13 | 13 | ||
| 14 | namespace AC_U { | 14 | namespace AC_U { |
| 15 | 15 | ||
diff --git a/src/core/hle/service/apt_u.cpp b/src/core/hle/service/apt_u.cpp index 4f41ec5f4..4bb05ce40 100644 --- a/src/core/hle/service/apt_u.cpp +++ b/src/core/hle/service/apt_u.cpp | |||
| @@ -27,7 +27,7 @@ enum class SignalType : u32 { | |||
| 27 | 27 | ||
| 28 | void Initialize(Service::Interface* self) { | 28 | void Initialize(Service::Interface* self) { |
| 29 | u32* cmd_buff = Service::GetCommandBuffer(); | 29 | u32* cmd_buff = Service::GetCommandBuffer(); |
| 30 | 30 | ||
| 31 | cmd_buff[3] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Menu"); // APT menu event handle | 31 | cmd_buff[3] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Menu"); // APT menu event handle |
| 32 | cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Pause"); // APT pause event handle | 32 | cmd_buff[4] = Kernel::CreateEvent(RESETTYPE_ONESHOT, "APT_U:Pause"); // APT pause event handle |
| 33 | 33 | ||
| @@ -168,7 +168,7 @@ void AppletUtility(Service::Interface* self) { | |||
| 168 | cmd_buff[1] = 0; // No error | 168 | cmd_buff[1] = 0; // No error |
| 169 | 169 | ||
| 170 | WARN_LOG(KERNEL, "(STUBBED) called unk=0x%08X, buffer1_size=0x%08x, buffer2_size=0x%08x, " | 170 | WARN_LOG(KERNEL, "(STUBBED) called unk=0x%08X, buffer1_size=0x%08x, buffer2_size=0x%08x, " |
| 171 | "buffer1_addr=0x%08x, buffer2_addr=0x%08x", unk, buffer1_size, buffer2_size, | 171 | "buffer1_addr=0x%08x, buffer2_addr=0x%08x", unk, buffer1_size, buffer2_size, |
| 172 | buffer1_addr, buffer2_addr); | 172 | buffer1_addr, buffer2_addr); |
| 173 | } | 173 | } |
| 174 | 174 | ||
diff --git a/src/core/hle/service/apt_u.h b/src/core/hle/service/apt_u.h index 5af39e085..306730400 100644 --- a/src/core/hle/service/apt_u.h +++ b/src/core/hle/service/apt_u.h | |||
| @@ -13,8 +13,8 @@ namespace APT_U { | |||
| 13 | 13 | ||
| 14 | // Application and title launching service. These services handle signaling for home/power button as | 14 | // Application and title launching service. These services handle signaling for home/power button as |
| 15 | // well. Only one session for either APT service can be open at a time, normally processes close the | 15 | // well. Only one session for either APT service can be open at a time, normally processes close the |
| 16 | // service handle immediately once finished using the service. The commands for APT:U and APT:S are | 16 | // service handle immediately once finished using the service. The commands for APT:U and APT:S are |
| 17 | // exactly the same, however certain commands are only accessible with APT:S(NS module will call | 17 | // exactly the same, however certain commands are only accessible with APT:S(NS module will call |
| 18 | // svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services. | 18 | // svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services. |
| 19 | 19 | ||
| 20 | /// Interface to "APT:U" service | 20 | /// Interface to "APT:U" service |
diff --git a/src/core/hle/service/boss_u.cpp b/src/core/hle/service/boss_u.cpp index d398edc68..b2ff4a756 100644 --- a/src/core/hle/service/boss_u.cpp +++ b/src/core/hle/service/boss_u.cpp | |||
| @@ -21,8 +21,8 @@ namespace BOSS_U { | |||
| 21 | Interface::Interface() { | 21 | Interface::Interface() { |
| 22 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); | 22 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | Interface::~Interface() { | 25 | Interface::~Interface() { |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | } // namespace | 28 | } // namespace |
diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp index 917b2f8ca..785c351e9 100644 --- a/src/core/hle/service/err_f.cpp +++ b/src/core/hle/service/err_f.cpp | |||
| @@ -20,8 +20,8 @@ namespace ERR_F { | |||
| 20 | Interface::Interface() { | 20 | Interface::Interface() { |
| 21 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); | 21 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | Interface::~Interface() { | 24 | Interface::~Interface() { |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | } // namespace | 27 | } // namespace |
diff --git a/src/core/hle/service/err_f.h b/src/core/hle/service/err_f.h index 5da663267..8b636b96c 100644 --- a/src/core/hle/service/err_f.h +++ b/src/core/hle/service/err_f.h | |||
| @@ -23,5 +23,5 @@ namespace ERR_F { | |||
| 23 | return "err:f"; | 23 | return "err:f"; |
| 24 | } | 24 | } |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | } // namespace | 27 | } // namespace |
diff --git a/src/core/hle/service/fs_user.cpp b/src/core/hle/service/fs_user.cpp index 06d3f5656..dadc89ef8 100644 --- a/src/core/hle/service/fs_user.cpp +++ b/src/core/hle/service/fs_user.cpp | |||
| @@ -269,7 +269,7 @@ static void IsSdmcDetected(Service::Interface* self) { | |||
| 269 | 269 | ||
| 270 | cmd_buff[1] = 0; | 270 | cmd_buff[1] = 0; |
| 271 | cmd_buff[2] = Settings::values.use_virtual_sd ? 1 : 0; | 271 | cmd_buff[2] = Settings::values.use_virtual_sd ? 1 : 0; |
| 272 | 272 | ||
| 273 | DEBUG_LOG(KERNEL, "called"); | 273 | DEBUG_LOG(KERNEL, "called"); |
| 274 | } | 274 | } |
| 275 | 275 | ||
diff --git a/src/core/hle/service/hid_user.h b/src/core/hle/service/hid_user.h index 9f6c4d5ed..5ed97085d 100644 --- a/src/core/hle/service/hid_user.h +++ b/src/core/hle/service/hid_user.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | namespace HID_User { | 16 | namespace HID_User { |
| 17 | 17 | ||
| 18 | /** | 18 | /** |
| 19 | * Structure of a Pad controller state. | 19 | * Structure of a Pad controller state. |
| 20 | */ | 20 | */ |
| 21 | struct PadState { | 21 | struct PadState { |
diff --git a/src/core/hle/service/mic_u.cpp b/src/core/hle/service/mic_u.cpp index 58051f133..d6f30e9ae 100644 --- a/src/core/hle/service/mic_u.cpp +++ b/src/core/hle/service/mic_u.cpp | |||
| @@ -27,7 +27,7 @@ const Interface::FunctionInfo FunctionTable[] = { | |||
| 27 | {0x000D0040, nullptr, "SetClamp"}, | 27 | {0x000D0040, nullptr, "SetClamp"}, |
| 28 | {0x000E0000, nullptr, "GetClamp"}, | 28 | {0x000E0000, nullptr, "GetClamp"}, |
| 29 | {0x000F0040, nullptr, "unknown_input1"}, | 29 | {0x000F0040, nullptr, "unknown_input1"}, |
| 30 | {0x00100040, nullptr, "unknown_input2"}, | 30 | {0x00100040, nullptr, "unknown_input2"}, |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 33 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index ba7299170..5906e2060 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -75,7 +75,7 @@ Interface* Manager::FetchFromPortName(const std::string& port_name) { | |||
| 75 | /// Initialize ServiceManager | 75 | /// Initialize ServiceManager |
| 76 | void Init() { | 76 | void Init() { |
| 77 | g_manager = new Manager; | 77 | g_manager = new Manager; |
| 78 | 78 | ||
| 79 | g_manager->AddService(new SRV::Interface); | 79 | g_manager->AddService(new SRV::Interface); |
| 80 | g_manager->AddService(new AC_U::Interface); | 80 | g_manager->AddService(new AC_U::Interface); |
| 81 | g_manager->AddService(new APT_U::Interface); | 81 | g_manager->AddService(new APT_U::Interface); |
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 2f5a866c9..55aa84e83 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h | |||
| @@ -38,7 +38,7 @@ class Manager; | |||
| 38 | class Interface : public Kernel::Object { | 38 | class Interface : public Kernel::Object { |
| 39 | friend class Manager; | 39 | friend class Manager; |
| 40 | public: | 40 | public: |
| 41 | 41 | ||
| 42 | std::string GetName() const override { return GetPortName(); } | 42 | std::string GetName() const override { return GetPortName(); } |
| 43 | std::string GetTypeName() const override { return GetPortName(); } | 43 | std::string GetTypeName() const override { return GetPortName(); } |
| 44 | 44 | ||
| @@ -76,7 +76,7 @@ public: | |||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | * Synchronize kernel object | 79 | * Synchronize kernel object |
| 80 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | 80 | * @param wait Boolean wait set if current thread should wait as a result of sync operation |
| 81 | * @return Result of operation, 0 on success, otherwise error code | 81 | * @return Result of operation, 0 on success, otherwise error code |
| 82 | */ | 82 | */ |
| @@ -85,23 +85,23 @@ public: | |||
| 85 | auto itr = m_functions.find(cmd_buff[0]); | 85 | auto itr = m_functions.find(cmd_buff[0]); |
| 86 | 86 | ||
| 87 | if (itr == m_functions.end()) { | 87 | if (itr == m_functions.end()) { |
| 88 | ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X", | 88 | ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X", |
| 89 | GetPortName().c_str(), cmd_buff[0]); | 89 | GetPortName().c_str(), cmd_buff[0]); |
| 90 | 90 | ||
| 91 | // TODO(bunnei): Hack - ignore error | 91 | // TODO(bunnei): Hack - ignore error |
| 92 | u32* cmd_buff = Service::GetCommandBuffer(); | 92 | u32* cmd_buff = Service::GetCommandBuffer(); |
| 93 | cmd_buff[1] = 0; | 93 | cmd_buff[1] = 0; |
| 94 | return 0; | 94 | return 0; |
| 95 | } | 95 | } |
| 96 | if (itr->second.func == nullptr) { | 96 | if (itr->second.func == nullptr) { |
| 97 | ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s", | 97 | ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s", |
| 98 | GetPortName().c_str(), itr->second.name.c_str()); | 98 | GetPortName().c_str(), itr->second.name.c_str()); |
| 99 | 99 | ||
| 100 | // TODO(bunnei): Hack - ignore error | 100 | // TODO(bunnei): Hack - ignore error |
| 101 | u32* cmd_buff = Service::GetCommandBuffer(); | 101 | u32* cmd_buff = Service::GetCommandBuffer(); |
| 102 | cmd_buff[1] = 0; | 102 | cmd_buff[1] = 0; |
| 103 | return 0; | 103 | return 0; |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | itr->second.func(this); | 106 | itr->second.func(this); |
| 107 | 107 | ||