diff options
| author | 2018-07-30 10:06:34 -0700 | |
|---|---|---|
| committer | 2018-07-30 10:06:34 -0700 | |
| commit | 2c4bb11015ebd6443a40fdce3d877949e97a30a6 (patch) | |
| tree | d11c5eb0a7b9fb4608dafd8aaca2f3fe46cfbf72 /src | |
| parent | Add some HID commands (#843) (diff) | |
| parent | service/btm: Add basic implementation of GetCoreImpl() (diff) | |
| download | yuzu-2c4bb11015ebd6443a40fdce3d877949e97a30a6.tar.gz yuzu-2c4bb11015ebd6443a40fdce3d877949e97a30a6.tar.xz yuzu-2c4bb11015ebd6443a40fdce3d877949e97a30a6.zip | |
Merge pull request #856 from lioncash/btm
service: Add btm services
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/logging/backend.cpp | 1 | ||||
| -rw-r--r-- | src/common/logging/log.h | 1 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/hle/service/btm/btm.cpp | 121 | ||||
| -rw-r--r-- | src/core/hle/service/btm/btm.h | 15 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 2 |
6 files changed, 142 insertions, 0 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 38cc85e23..c663b6358 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp | |||
| @@ -169,6 +169,7 @@ void FileBackend::Write(const Entry& entry) { | |||
| 169 | SUB(Service, AOC) \ | 169 | SUB(Service, AOC) \ |
| 170 | SUB(Service, APM) \ | 170 | SUB(Service, APM) \ |
| 171 | SUB(Service, BCAT) \ | 171 | SUB(Service, BCAT) \ |
| 172 | SUB(Service, BTM) \ | ||
| 172 | SUB(Service, Fatal) \ | 173 | SUB(Service, Fatal) \ |
| 173 | SUB(Service, Friend) \ | 174 | SUB(Service, Friend) \ |
| 174 | SUB(Service, FS) \ | 175 | SUB(Service, FS) \ |
diff --git a/src/common/logging/log.h b/src/common/logging/log.h index db4a80d0a..e7fd986d5 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h | |||
| @@ -56,6 +56,7 @@ enum class Class : ClassType { | |||
| 56 | Service_APM, ///< The APM (Performance) service | 56 | Service_APM, ///< The APM (Performance) service |
| 57 | Service_Audio, ///< The Audio (Audio control) service | 57 | Service_Audio, ///< The Audio (Audio control) service |
| 58 | Service_BCAT, ///< The BCAT service | 58 | Service_BCAT, ///< The BCAT service |
| 59 | Service_BTM, ///< The BTM service | ||
| 59 | Service_Fatal, ///< The Fatal service | 60 | Service_Fatal, ///< The Fatal service |
| 60 | Service_Friend, ///< The friend service | 61 | Service_Friend, ///< The friend service |
| 61 | Service_FS, ///< The FS (Filesystem) service | 62 | Service_FS, ///< The FS (Filesystem) service |
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f1e7e2593..2b9e3a6ce 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -142,6 +142,8 @@ add_library(core STATIC | |||
| 142 | hle/service/bcat/module.h | 142 | hle/service/bcat/module.h |
| 143 | hle/service/btdrv/btdrv.cpp | 143 | hle/service/btdrv/btdrv.cpp |
| 144 | hle/service/btdrv/btdrv.h | 144 | hle/service/btdrv/btdrv.h |
| 145 | hle/service/btm/btm.cpp | ||
| 146 | hle/service/btm/btm.h | ||
| 145 | hle/service/erpt/erpt.cpp | 147 | hle/service/erpt/erpt.cpp |
| 146 | hle/service/erpt/erpt.h | 148 | hle/service/erpt/erpt.h |
| 147 | hle/service/es/es.cpp | 149 | hle/service/es/es.cpp |
diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp new file mode 100644 index 000000000..b949bfabd --- /dev/null +++ b/src/core/hle/service/btm/btm.cpp | |||
| @@ -0,0 +1,121 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include <memory> | ||
| 6 | |||
| 7 | #include "common/logging/log.h" | ||
| 8 | #include "core/hle/ipc_helpers.h" | ||
| 9 | #include "core/hle/kernel/hle_ipc.h" | ||
| 10 | #include "core/hle/service/btm/btm.h" | ||
| 11 | #include "core/hle/service/service.h" | ||
| 12 | #include "core/hle/service/sm/sm.h" | ||
| 13 | |||
| 14 | namespace Service::BTM { | ||
| 15 | |||
| 16 | class BTM final : public ServiceFramework<BTM> { | ||
| 17 | public: | ||
| 18 | explicit BTM() : ServiceFramework{"btm"} { | ||
| 19 | // clang-format off | ||
| 20 | static const FunctionInfo functions[] = { | ||
| 21 | {0, nullptr, "Unknown1"}, | ||
| 22 | {1, nullptr, "Unknown2"}, | ||
| 23 | {2, nullptr, "RegisterSystemEventForConnectedDeviceConditionImpl"}, | ||
| 24 | {3, nullptr, "Unknown3"}, | ||
| 25 | {4, nullptr, "Unknown4"}, | ||
| 26 | {5, nullptr, "Unknown5"}, | ||
| 27 | {6, nullptr, "Unknown6"}, | ||
| 28 | {7, nullptr, "Unknown7"}, | ||
| 29 | {8, nullptr, "RegisterSystemEventForRegisteredDeviceInfoImpl"}, | ||
| 30 | {9, nullptr, "Unknown8"}, | ||
| 31 | {10, nullptr, "Unknown9"}, | ||
| 32 | {11, nullptr, "Unknown10"}, | ||
| 33 | {12, nullptr, "Unknown11"}, | ||
| 34 | {13, nullptr, "Unknown12"}, | ||
| 35 | {14, nullptr, "EnableRadioImpl"}, | ||
| 36 | {15, nullptr, "DisableRadioImpl"}, | ||
| 37 | {16, nullptr, "Unknown13"}, | ||
| 38 | {17, nullptr, "Unknown14"}, | ||
| 39 | {18, nullptr, "Unknown15"}, | ||
| 40 | {19, nullptr, "Unknown16"}, | ||
| 41 | {20, nullptr, "Unknown17"}, | ||
| 42 | {21, nullptr, "Unknown18"}, | ||
| 43 | }; | ||
| 44 | // clang-format on | ||
| 45 | |||
| 46 | RegisterHandlers(functions); | ||
| 47 | } | ||
| 48 | }; | ||
| 49 | |||
| 50 | class BTM_DBG final : public ServiceFramework<BTM_DBG> { | ||
| 51 | public: | ||
| 52 | explicit BTM_DBG() : ServiceFramework{"btm:dbg"} { | ||
| 53 | // clang-format off | ||
| 54 | static const FunctionInfo functions[] = { | ||
| 55 | {0, nullptr, "RegisterSystemEventForDiscoveryImpl"}, | ||
| 56 | {1, nullptr, "Unknown1"}, | ||
| 57 | {2, nullptr, "Unknown2"}, | ||
| 58 | {3, nullptr, "Unknown3"}, | ||
| 59 | {4, nullptr, "Unknown4"}, | ||
| 60 | {5, nullptr, "Unknown5"}, | ||
| 61 | {6, nullptr, "Unknown6"}, | ||
| 62 | {7, nullptr, "Unknown7"}, | ||
| 63 | {8, nullptr, "Unknown8"}, | ||
| 64 | }; | ||
| 65 | // clang-format on | ||
| 66 | |||
| 67 | RegisterHandlers(functions); | ||
| 68 | } | ||
| 69 | }; | ||
| 70 | |||
| 71 | class IBtmSystemCore final : public ServiceFramework<IBtmSystemCore> { | ||
| 72 | public: | ||
| 73 | explicit IBtmSystemCore() : ServiceFramework{"IBtmSystemCore"} { | ||
| 74 | // clang-format off | ||
| 75 | static const FunctionInfo functions[] = { | ||
| 76 | {0, nullptr, "StartGamepadPairingImpl"}, | ||
| 77 | {1, nullptr, "CancelGamepadPairingImpl"}, | ||
| 78 | {2, nullptr, "ClearGamepadPairingDatabaseImpl"}, | ||
| 79 | {3, nullptr, "GetPairedGamepadCountImpl"}, | ||
| 80 | {4, nullptr, "EnableRadioImpl"}, | ||
| 81 | {5, nullptr, "DisableRadioImpl"}, | ||
| 82 | {6, nullptr, "GetRadioOnOffImpl"}, | ||
| 83 | {7, nullptr, "AcquireRadioEventImpl"}, | ||
| 84 | {8, nullptr, "AcquireGamepadPairingEventImpl"}, | ||
| 85 | {9, nullptr, "IsGamepadPairingStartedImpl"}, | ||
| 86 | }; | ||
| 87 | // clang-format on | ||
| 88 | |||
| 89 | RegisterHandlers(functions); | ||
| 90 | } | ||
| 91 | }; | ||
| 92 | |||
| 93 | class BTM_SYS final : public ServiceFramework<BTM_SYS> { | ||
| 94 | public: | ||
| 95 | explicit BTM_SYS() : ServiceFramework{"btm:sys"} { | ||
| 96 | // clang-format off | ||
| 97 | static const FunctionInfo functions[] = { | ||
| 98 | {0, &BTM_SYS::GetCoreImpl, "GetCoreImpl"}, | ||
| 99 | }; | ||
| 100 | // clang-format on | ||
| 101 | |||
| 102 | RegisterHandlers(functions); | ||
| 103 | } | ||
| 104 | |||
| 105 | private: | ||
| 106 | void GetCoreImpl(Kernel::HLERequestContext& ctx) { | ||
| 107 | IPC::ResponseBuilder rb{ctx, 2, 0, 1}; | ||
| 108 | rb.Push(RESULT_SUCCESS); | ||
| 109 | rb.PushIpcInterface<IBtmSystemCore>(); | ||
| 110 | |||
| 111 | LOG_DEBUG(Service_BTM, "called"); | ||
| 112 | } | ||
| 113 | }; | ||
| 114 | |||
| 115 | void InstallInterfaces(SM::ServiceManager& sm) { | ||
| 116 | std::make_shared<BTM>()->InstallAsService(sm); | ||
| 117 | std::make_shared<BTM_DBG>()->InstallAsService(sm); | ||
| 118 | std::make_shared<BTM_SYS>()->InstallAsService(sm); | ||
| 119 | } | ||
| 120 | |||
| 121 | } // namespace Service::BTM | ||
diff --git a/src/core/hle/service/btm/btm.h b/src/core/hle/service/btm/btm.h new file mode 100644 index 000000000..e6425a7e3 --- /dev/null +++ b/src/core/hle/service/btm/btm.h | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | namespace Service::SM { | ||
| 8 | class ServiceManager; | ||
| 9 | } | ||
| 10 | |||
| 11 | namespace Service::BTM { | ||
| 12 | |||
| 13 | void InstallInterfaces(SM::ServiceManager& sm); | ||
| 14 | |||
| 15 | } // namespace Service::BTM | ||
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 5180a0c93..61a81f564 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include "core/hle/service/audio/audio.h" | 22 | #include "core/hle/service/audio/audio.h" |
| 23 | #include "core/hle/service/bcat/bcat.h" | 23 | #include "core/hle/service/bcat/bcat.h" |
| 24 | #include "core/hle/service/btdrv/btdrv.h" | 24 | #include "core/hle/service/btdrv/btdrv.h" |
| 25 | #include "core/hle/service/btm/btm.h" | ||
| 25 | #include "core/hle/service/erpt/erpt.h" | 26 | #include "core/hle/service/erpt/erpt.h" |
| 26 | #include "core/hle/service/es/es.h" | 27 | #include "core/hle/service/es/es.h" |
| 27 | #include "core/hle/service/eupld/eupld.h" | 28 | #include "core/hle/service/eupld/eupld.h" |
| @@ -201,6 +202,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) { | |||
| 201 | Audio::InstallInterfaces(*sm); | 202 | Audio::InstallInterfaces(*sm); |
| 202 | BCAT::InstallInterfaces(*sm); | 203 | BCAT::InstallInterfaces(*sm); |
| 203 | BtDrv::InstallInterfaces(*sm); | 204 | BtDrv::InstallInterfaces(*sm); |
| 205 | BTM::InstallInterfaces(*sm); | ||
| 204 | ERPT::InstallInterfaces(*sm); | 206 | ERPT::InstallInterfaces(*sm); |
| 205 | ES::InstallInterfaces(*sm); | 207 | ES::InstallInterfaces(*sm); |
| 206 | EUPLD::InstallInterfaces(*sm); | 208 | EUPLD::InstallInterfaces(*sm); |