Skip to content

Commit be91fab

Browse files
author
N3xoX1
committed
OS: Add in nifm code
1 parent a5ac666 commit be91fab

17 files changed

Lines changed: 2772 additions & 6 deletions

src/nxemu-os/core/core.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222
#include "core/hle/service/filesystem/filesystem.h"
2323
#include "core/hle/service/glue/glue_manager.h"
2424
#include "core/hle/service/services.h"
25+
#include "core/internal_network/network.h"
2526
#include "core/perf_stats.h"
2627
#include "yuzu_hid_core/hid_core.h"
2728
#include "yuzu_input_common/main.h"
29+
#include "network/network.h"
2830
#include <nxemu-module-spec/system_loader.h>
2931

3032
MICROPROFILE_DEFINE(ARM_CPU0, "ARM", "CPU 0", MP_RGB(255, 64, 64));
@@ -36,7 +38,7 @@ namespace Core {
3638

3739
struct System::Impl {
3840
explicit Impl(System & system, ISwitchSystem & switchSystem_)
39-
: kernel{system}, hid_core{}, cpu_manager{system},
41+
: kernel{system}, hid_core{}, cpu_manager{system}, room_network{},
4042
applet_manager{system}, frontend_applets{system}, switchSystem(switchSystem_),
4143
input_subsystem{std::make_shared<InputCommon::InputSubsystem>()},
4244
fs_controller(switchSystem_.Systemloader().FileSystemController())
@@ -168,6 +170,7 @@ struct System::Impl {
168170
IFileSystemController & fs_controller;
169171
std::unique_ptr<Core::DeviceMemory> device_memory;
170172
Core::HID::HIDCore hid_core;
173+
Network::RoomNetwork room_network;
171174
std::shared_ptr<InputCommon::InputSubsystem> input_subsystem;
172175

173176
CpuManager cpu_manager;
@@ -482,6 +485,14 @@ const Core::Debugger& System::GetDebugger() const {
482485
return *ptr;
483486
}
484487

488+
Network::RoomNetwork& System::GetRoomNetwork() {
489+
return impl->room_network;
490+
}
491+
492+
const Network::RoomNetwork& System::GetRoomNetwork() const {
493+
return impl->room_network;
494+
}
495+
485496
void System::RunServer(std::unique_ptr<Service::ServerManager>&& server_manager) {
486497
return impl->kernel.RunServer(std::move(server_manager));
487498
}

0 commit comments

Comments
 (0)