OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 06:11:05 +00:00
Code Issues Projects Releases Wiki Activity

Made g_stub_service a SharedPtr.

Browse Source
This commit is contained in:
Kevin Hartman 2015-02-21 13:36:19 -08:00
parent e1008c862d
commit 06a89ca9b1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ namespace Service {
std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_kernel_named_ports; std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_kernel_named_ports;
std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services; std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services;
Interface g_stub_service; Kernel::SharedPtr<Interface> g_stub_service;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Module interface // Module interface
@ -73,6 +73,8 @@ static void AddService(Interface* interface) {
/// Initialize ServiceManager /// Initialize ServiceManager
void Init() { void Init() {
g_stub_service = new Interface;
AddNamedPort(new SRV::Interface); AddNamedPort(new SRV::Interface);
AddNamedPort(new ERR_F::Interface); AddNamedPort(new ERR_F::Interface);

2
src/core/hle/service/service.h
View File

@ -120,6 +120,6 @@ extern std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_kernel_na
/// Map of services registered with the "srv:" service, retrieved using GetServiceHandle. /// Map of services registered with the "srv:" service, retrieved using GetServiceHandle.
extern std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services; extern std::unordered_map<std::string, Kernel::SharedPtr<Interface>> g_srv_services;
/// Returned to callers when the requested service is not yet implemented /// Returned to callers when the requested service is not yet implemented
extern Interface g_stub_service; extern Kernel::SharedPtr<Interface> g_stub_service;
} // namespace } // namespace

2
src/core/hle/service/srv.cpp
View File

@ -47,7 +47,7 @@ static void GetServiceHandle(Service::Interface* self) {
UNIMPLEMENTED(); UNIMPLEMENTED();
// Return the stubbed (empty) service so that applications can continue // Return the stubbed (empty) service so that applications can continue
cmd_buff[3] = Kernel::g_handle_table.Create(&Service::g_stub_service).MoveFrom(); cmd_buff[3] = Kernel::g_handle_table.Create(Service::g_stub_service).MoveFrom();
} }
cmd_buff[1] = res.raw; cmd_buff[1] = res.raw;