mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 12:20:41 +02:00
Merge pull request #2314 from mailwl/account
Service/ACT: move ACT services to folder
This commit is contained in:
commit
bdb6956879
@ -53,8 +53,9 @@ set(SRCS
|
||||
hle/kernel/timer.cpp
|
||||
hle/kernel/vm_manager.cpp
|
||||
hle/service/ac_u.cpp
|
||||
hle/service/act_a.cpp
|
||||
hle/service/act_u.cpp
|
||||
hle/service/act/act.cpp
|
||||
hle/service/act/act_a.cpp
|
||||
hle/service/act/act_u.cpp
|
||||
hle/service/am/am.cpp
|
||||
hle/service/am/am_app.cpp
|
||||
hle/service/am/am_net.cpp
|
||||
@ -218,8 +219,9 @@ set(HEADERS
|
||||
hle/kernel/vm_manager.h
|
||||
hle/result.h
|
||||
hle/service/ac_u.h
|
||||
hle/service/act_a.h
|
||||
hle/service/act_u.h
|
||||
hle/service/act/act.h
|
||||
hle/service/act/act_a.h
|
||||
hle/service/act/act_u.h
|
||||
hle/service/am/am.h
|
||||
hle/service/am/am_app.h
|
||||
hle/service/am/am_net.h
|
||||
|
18
src/core/hle/service/act/act.cpp
Normal file
18
src/core/hle/service/act/act.cpp
Normal file
@ -0,0 +1,18 @@
|
||||
// Copyright 2016 Citra Emulator Project
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "core/hle/service/act/act.h"
|
||||
#include "core/hle/service/act/act_a.h"
|
||||
#include "core/hle/service/act/act_u.h"
|
||||
|
||||
namespace Service {
|
||||
namespace ACT {
|
||||
|
||||
void Init() {
|
||||
AddService(new ACT_A);
|
||||
AddService(new ACT_U);
|
||||
}
|
||||
|
||||
} // namespace ACT
|
||||
} // namespace Service
|
14
src/core/hle/service/act/act.h
Normal file
14
src/core/hle/service/act/act.h
Normal file
@ -0,0 +1,14 @@
|
||||
// Copyright 2016 Citra Emulator Project
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace Service {
|
||||
namespace ACT {
|
||||
|
||||
/// Initialize AM service
|
||||
void Init();
|
||||
|
||||
} // namespace ACT
|
||||
} // namespace Service
|
@ -2,7 +2,8 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "core/hle/service/act_a.h"
|
||||
#include "core/hle/service/act/act.h"
|
||||
#include "core/hle/service/act/act_a.h"
|
||||
|
||||
namespace Service {
|
||||
namespace ACT {
|
@ -2,7 +2,8 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "core/hle/service/act_u.h"
|
||||
#include "core/hle/service/act/act.h"
|
||||
#include "core/hle/service/act/act_u.h"
|
||||
|
||||
namespace Service {
|
||||
namespace ACT {
|
@ -9,8 +9,7 @@
|
||||
|
||||
#include "core/hle/kernel/server_port.h"
|
||||
#include "core/hle/service/ac_u.h"
|
||||
#include "core/hle/service/act_a.h"
|
||||
#include "core/hle/service/act_u.h"
|
||||
#include "core/hle/service/act/act.h"
|
||||
#include "core/hle/service/am/am.h"
|
||||
#include "core/hle/service/apt/apt.h"
|
||||
#include "core/hle/service/boss/boss.h"
|
||||
@ -139,6 +138,7 @@ void Init() {
|
||||
AddNamedPort(new ERR::ERR_F);
|
||||
|
||||
FS::ArchiveInit();
|
||||
ACT::Init();
|
||||
AM::Init();
|
||||
APT::Init();
|
||||
BOSS::Init();
|
||||
@ -158,8 +158,6 @@ void Init() {
|
||||
QTM::Init();
|
||||
|
||||
AddService(new AC::AC_U);
|
||||
AddService(new ACT::ACT_A);
|
||||
AddService(new ACT::ACT_U);
|
||||
AddService(new CSND::CSND_SND);
|
||||
AddService(new DSP_DSP::Interface);
|
||||
AddService(new GSP::GSP_GPU);
|
||||
|
Loading…
Reference in New Issue
Block a user