mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 03:59:10 +01:00
Merge pull request #9109 from lioncash/session
k_session_request: Add missing override
This commit is contained in:
commit
aa9e9052a6
1 changed files with 15 additions and 16 deletions
|
@ -3,6 +3,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <array>
|
||||
|
||||
#include "core/hle/kernel/k_auto_object.h"
|
||||
#include "core/hle/kernel/k_event.h"
|
||||
#include "core/hle/kernel/k_memory_block.h"
|
||||
|
@ -52,8 +54,7 @@ public:
|
|||
};
|
||||
|
||||
public:
|
||||
explicit SessionMappings(KernelCore& kernel_)
|
||||
: kernel(kernel_), m_mappings(nullptr), m_num_send(), m_num_recv(), m_num_exch() {}
|
||||
explicit SessionMappings(KernelCore& kernel_) : kernel(kernel_) {}
|
||||
|
||||
void Initialize() {}
|
||||
void Finalize();
|
||||
|
@ -149,17 +150,15 @@ public:
|
|||
|
||||
private:
|
||||
KernelCore& kernel;
|
||||
Mapping m_static_mappings[NumStaticMappings];
|
||||
Mapping* m_mappings;
|
||||
u8 m_num_send;
|
||||
u8 m_num_recv;
|
||||
u8 m_num_exch;
|
||||
std::array<Mapping, NumStaticMappings> m_static_mappings;
|
||||
Mapping* m_mappings{};
|
||||
u8 m_num_send{};
|
||||
u8 m_num_recv{};
|
||||
u8 m_num_exch{};
|
||||
};
|
||||
|
||||
public:
|
||||
explicit KSessionRequest(KernelCore& kernel_)
|
||||
: KAutoObject(kernel_), m_mappings(kernel_), m_thread(nullptr), m_server(nullptr),
|
||||
m_event(nullptr) {}
|
||||
explicit KSessionRequest(KernelCore& kernel_) : KAutoObject(kernel_), m_mappings(kernel_) {}
|
||||
|
||||
static KSessionRequest* Create(KernelCore& kernel) {
|
||||
KSessionRequest* req = KSessionRequest::Allocate(kernel);
|
||||
|
@ -281,7 +280,7 @@ public:
|
|||
|
||||
private:
|
||||
// NOTE: This is public and virtual in Nintendo's kernel.
|
||||
void Finalize() {
|
||||
void Finalize() override {
|
||||
m_mappings.Finalize();
|
||||
|
||||
if (m_thread) {
|
||||
|
@ -297,11 +296,11 @@ private:
|
|||
|
||||
private:
|
||||
SessionMappings m_mappings;
|
||||
KThread* m_thread;
|
||||
KProcess* m_server;
|
||||
KEvent* m_event;
|
||||
uintptr_t m_address;
|
||||
size_t m_size;
|
||||
KThread* m_thread{};
|
||||
KProcess* m_server{};
|
||||
KEvent* m_event{};
|
||||
uintptr_t m_address{};
|
||||
size_t m_size{};
|
||||
};
|
||||
|
||||
} // namespace Kernel
|
||||
|
|
Loading…
Reference in a new issue