octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3887 from NarcolepticK/gsp_lcd-migrate-framework 

service/gsp: Migrate gsp_lcd to ServiceFramework
This commit is contained in:
Weiyi Wang 2018-06-28 18:04:04 +03:00 committed by GitHub
parent 80f6510355 d25cfbc4cc
commit 1619b124b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/gsp/gsp.cpp
View File

@ -27,8 +27,9 @@ void SignalInterrupt(InterruptId interrupt_id) {
void InstallInterfaces(SM::ServiceManager& service_manager) { void InstallInterfaces(SM::ServiceManager& service_manager) {
auto gpu = std::make_shared<GSP_GPU>(); auto gpu = std::make_shared<GSP_GPU>();
gpu->InstallAsService(service_manager); gpu->InstallAsService(service_manager);
gsp_gpu = gpu; gsp_gpu = gpu;
std::make_shared<GSP_LCD>()->InstallAsService(service_manager);
} }
} // namespace GSP } // namespace GSP

1
src/core/hle/service/gsp/gsp.h
View File

@ -9,6 +9,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/result.h" #include "core/hle/result.h"
#include "core/hle/service/gsp/gsp_gpu.h" #include "core/hle/service/gsp/gsp_gpu.h"
#include "core/hle/service/gsp/gsp_lcd.h"
namespace Service { namespace Service {
namespace GSP { namespace GSP {

30
src/core/hle/service/gsp/gsp_lcd.cpp
View File

@ -2,28 +2,26 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/gsp/gsp_lcd.h" #include "core/hle/service/gsp/gsp_lcd.h"
namespace Service { namespace Service {
namespace GSP { namespace GSP {
const Interface::FunctionInfo FunctionTable[] = { GSP_LCD::GSP_LCD() : ServiceFramework("gsp::Lcd") {
// clang-format off static const FunctionInfo functions[] = {
{0x000A0080, nullptr, "SetBrightnessRaw"}, {0x000A0080, nullptr, "SetBrightnessRaw"},
{0x000B0080, nullptr, "SetBrightness"}, {0x000B0080, nullptr, "SetBrightness"},
{0x000F0000, nullptr, "PowerOnAllBacklights"}, {0x000F0000, nullptr, "PowerOnAllBacklights"},
{0x00100000, nullptr, "PowerOffAllBacklights"}, {0x00100000, nullptr, "PowerOffAllBacklights"},
{0x00110040, nullptr, "PowerOnBacklight"}, {0x00110040, nullptr, "PowerOnBacklight"},
{0x00120040, nullptr, "PowerOffBacklight"}, {0x00120040, nullptr, "PowerOffBacklight"},
{0x00130040, nullptr, "SetLedForceOff"}, {0x00130040, nullptr, "SetLedForceOff"},
{0x00140000, nullptr, "GetVendor"}, {0x00140000, nullptr, "GetVendor"},
{0x00150040, nullptr, "GetBrightness"}, {0x00150040, nullptr, "GetBrightness"},
// clang-format on };
RegisterHandlers(functions);
}; };
GSP_LCD::GSP_LCD() {
Register(FunctionTable);
}
} // namespace GSP } // namespace GSP
} // namespace Service } // namespace Service

7
src/core/hle/service/gsp/gsp_lcd.h
View File

@ -9,13 +9,10 @@
namespace Service { namespace Service {
namespace GSP { namespace GSP {
class GSP_LCD final : public Interface { class GSP_LCD final : public ServiceFramework<GSP_LCD> {
public: public:
GSP_LCD(); GSP_LCD();
~GSP_LCD() = default;
std::string GetPortName() const override {
return "gsp::Lcd";
}
}; };
} // namespace GSP } // namespace GSP

1
src/core/hle/service/service.cpp
View File

@ -258,7 +258,6 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
AddService(new CSND::CSND_SND); AddService(new CSND::CSND_SND);
AddService(new DSP_DSP::Interface); AddService(new DSP_DSP::Interface);
AddService(new GSP::GSP_LCD);
AddService(new HTTP::HTTP_C); AddService(new HTTP::HTTP_C);
AddService(new PM::PM_APP); AddService(new PM::PM_APP);
AddService(new SOC::SOC_U); AddService(new SOC::SOC_U);