hle: kernel: Rename SharedMemory to KSharedMemory.
This commit is contained in:
parent
51e8b2733c
commit
0d62f30b00
13 changed files with 54 additions and 54 deletions
|
@ -175,6 +175,8 @@ add_library(core STATIC
|
||||||
hle/kernel/k_scoped_lock.h
|
hle/kernel/k_scoped_lock.h
|
||||||
hle/kernel/k_scoped_resource_reservation.h
|
hle/kernel/k_scoped_resource_reservation.h
|
||||||
hle/kernel/k_scoped_scheduler_lock_and_sleep.h
|
hle/kernel/k_scoped_scheduler_lock_and_sleep.h
|
||||||
|
hle/kernel/k_shared_memory.cpp
|
||||||
|
hle/kernel/k_shared_memory.h
|
||||||
hle/kernel/k_synchronization_object.cpp
|
hle/kernel/k_synchronization_object.cpp
|
||||||
hle/kernel/k_synchronization_object.h
|
hle/kernel/k_synchronization_object.h
|
||||||
hle/kernel/k_thread.cpp
|
hle/kernel/k_thread.cpp
|
||||||
|
@ -218,8 +220,6 @@ add_library(core STATIC
|
||||||
hle/kernel/service_thread.h
|
hle/kernel/service_thread.h
|
||||||
hle/kernel/session.cpp
|
hle/kernel/session.cpp
|
||||||
hle/kernel/session.h
|
hle/kernel/session.h
|
||||||
hle/kernel/shared_memory.cpp
|
|
||||||
hle/kernel/shared_memory.h
|
|
||||||
hle/kernel/svc.cpp
|
hle/kernel/svc.cpp
|
||||||
hle/kernel/svc.h
|
hle/kernel/svc.h
|
||||||
hle/kernel/svc_common.h
|
hle/kernel/svc_common.h
|
||||||
|
|
|
@ -5,20 +5,20 @@
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/hle/kernel/k_scoped_resource_reservation.h"
|
#include "core/hle/kernel/k_scoped_resource_reservation.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
#include "core/hle/kernel/memory/page_table.h"
|
#include "core/hle/kernel/memory/page_table.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
|
|
||||||
SharedMemory::SharedMemory(KernelCore& kernel, Core::DeviceMemory& device_memory)
|
KSharedMemory::KSharedMemory(KernelCore& kernel, Core::DeviceMemory& device_memory)
|
||||||
: Object{kernel}, device_memory{device_memory} {}
|
: Object{kernel}, device_memory{device_memory} {}
|
||||||
|
|
||||||
SharedMemory::~SharedMemory() {
|
KSharedMemory::~KSharedMemory() {
|
||||||
kernel.GetSystemResourceLimit()->Release(LimitableResource::PhysicalMemory, size);
|
kernel.GetSystemResourceLimit()->Release(LimitableResource::PhysicalMemory, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<SharedMemory> SharedMemory::Create(
|
std::shared_ptr<KSharedMemory> KSharedMemory::Create(
|
||||||
KernelCore& kernel, Core::DeviceMemory& device_memory, Process* owner_process,
|
KernelCore& kernel, Core::DeviceMemory& device_memory, Process* owner_process,
|
||||||
Memory::PageLinkedList&& page_list, Memory::MemoryPermission owner_permission,
|
Memory::PageLinkedList&& page_list, Memory::MemoryPermission owner_permission,
|
||||||
Memory::MemoryPermission user_permission, PAddr physical_address, std::size_t size,
|
Memory::MemoryPermission user_permission, PAddr physical_address, std::size_t size,
|
||||||
|
@ -29,8 +29,8 @@ std::shared_ptr<SharedMemory> SharedMemory::Create(
|
||||||
size);
|
size);
|
||||||
ASSERT(memory_reservation.Succeeded());
|
ASSERT(memory_reservation.Succeeded());
|
||||||
|
|
||||||
std::shared_ptr<SharedMemory> shared_memory{
|
std::shared_ptr<KSharedMemory> shared_memory{
|
||||||
std::make_shared<SharedMemory>(kernel, device_memory)};
|
std::make_shared<KSharedMemory>(kernel, device_memory)};
|
||||||
|
|
||||||
shared_memory->owner_process = owner_process;
|
shared_memory->owner_process = owner_process;
|
||||||
shared_memory->page_list = std::move(page_list);
|
shared_memory->page_list = std::move(page_list);
|
||||||
|
@ -44,8 +44,8 @@ std::shared_ptr<SharedMemory> SharedMemory::Create(
|
||||||
return shared_memory;
|
return shared_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode SharedMemory::Map(Process& target_process, VAddr address, std::size_t size,
|
ResultCode KSharedMemory::Map(Process& target_process, VAddr address, std::size_t size,
|
||||||
Memory::MemoryPermission permissions) {
|
Memory::MemoryPermission permissions) {
|
||||||
const u64 page_count{(size + Memory::PageSize - 1) / Memory::PageSize};
|
const u64 page_count{(size + Memory::PageSize - 1) / Memory::PageSize};
|
||||||
|
|
||||||
if (page_list.GetNumPages() != page_count) {
|
if (page_list.GetNumPages() != page_count) {
|
|
@ -19,12 +19,12 @@ namespace Kernel {
|
||||||
|
|
||||||
class KernelCore;
|
class KernelCore;
|
||||||
|
|
||||||
class SharedMemory final : public Object {
|
class KSharedMemory final : public Object {
|
||||||
public:
|
public:
|
||||||
explicit SharedMemory(KernelCore& kernel, Core::DeviceMemory& device_memory);
|
explicit KSharedMemory(KernelCore& kernel, Core::DeviceMemory& device_memory);
|
||||||
~SharedMemory() override;
|
~KSharedMemory() override;
|
||||||
|
|
||||||
static std::shared_ptr<SharedMemory> Create(
|
static std::shared_ptr<KSharedMemory> Create(
|
||||||
KernelCore& kernel, Core::DeviceMemory& device_memory, Process* owner_process,
|
KernelCore& kernel, Core::DeviceMemory& device_memory, Process* owner_process,
|
||||||
Memory::PageLinkedList&& page_list, Memory::MemoryPermission owner_permission,
|
Memory::PageLinkedList&& page_list, Memory::MemoryPermission owner_permission,
|
||||||
Memory::MemoryPermission user_permission, PAddr physical_address, std::size_t size,
|
Memory::MemoryPermission user_permission, PAddr physical_address, std::size_t size,
|
|
@ -29,6 +29,7 @@
|
||||||
#include "core/hle/kernel/handle_table.h"
|
#include "core/hle/kernel/handle_table.h"
|
||||||
#include "core/hle/kernel/k_resource_limit.h"
|
#include "core/hle/kernel/k_resource_limit.h"
|
||||||
#include "core/hle/kernel/k_scheduler.h"
|
#include "core/hle/kernel/k_scheduler.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/k_thread.h"
|
#include "core/hle/kernel/k_thread.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
#include "core/hle/kernel/memory/memory_layout.h"
|
#include "core/hle/kernel/memory/memory_layout.h"
|
||||||
|
@ -37,7 +38,6 @@
|
||||||
#include "core/hle/kernel/physical_core.h"
|
#include "core/hle/kernel/physical_core.h"
|
||||||
#include "core/hle/kernel/process.h"
|
#include "core/hle/kernel/process.h"
|
||||||
#include "core/hle/kernel/service_thread.h"
|
#include "core/hle/kernel/service_thread.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
#include "core/hle/kernel/svc_results.h"
|
#include "core/hle/kernel/svc_results.h"
|
||||||
#include "core/hle/kernel/time_manager.h"
|
#include "core/hle/kernel/time_manager.h"
|
||||||
#include "core/hle/lock.h"
|
#include "core/hle/lock.h"
|
||||||
|
@ -288,19 +288,19 @@ struct KernelCore::Impl {
|
||||||
layout.System().StartAddress(),
|
layout.System().StartAddress(),
|
||||||
layout.System().EndAddress());
|
layout.System().EndAddress());
|
||||||
|
|
||||||
hid_shared_mem = Kernel::SharedMemory::Create(
|
hid_shared_mem = Kernel::KSharedMemory::Create(
|
||||||
system.Kernel(), system.DeviceMemory(), nullptr,
|
system.Kernel(), system.DeviceMemory(), nullptr,
|
||||||
{hid_addr, hid_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
{hid_addr, hid_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
||||||
Memory::MemoryPermission::Read, hid_addr, hid_size, "HID:SharedMemory");
|
Memory::MemoryPermission::Read, hid_addr, hid_size, "HID:SharedMemory");
|
||||||
font_shared_mem = Kernel::SharedMemory::Create(
|
font_shared_mem = Kernel::KSharedMemory::Create(
|
||||||
system.Kernel(), system.DeviceMemory(), nullptr,
|
system.Kernel(), system.DeviceMemory(), nullptr,
|
||||||
{font_pa, font_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
{font_pa, font_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
||||||
Memory::MemoryPermission::Read, font_pa, font_size, "Font:SharedMemory");
|
Memory::MemoryPermission::Read, font_pa, font_size, "Font:SharedMemory");
|
||||||
irs_shared_mem = Kernel::SharedMemory::Create(
|
irs_shared_mem = Kernel::KSharedMemory::Create(
|
||||||
system.Kernel(), system.DeviceMemory(), nullptr,
|
system.Kernel(), system.DeviceMemory(), nullptr,
|
||||||
{irs_addr, irs_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
{irs_addr, irs_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
||||||
Memory::MemoryPermission::Read, irs_addr, irs_size, "IRS:SharedMemory");
|
Memory::MemoryPermission::Read, irs_addr, irs_size, "IRS:SharedMemory");
|
||||||
time_shared_mem = Kernel::SharedMemory::Create(
|
time_shared_mem = Kernel::KSharedMemory::Create(
|
||||||
system.Kernel(), system.DeviceMemory(), nullptr,
|
system.Kernel(), system.DeviceMemory(), nullptr,
|
||||||
{time_addr, time_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
{time_addr, time_size / Memory::PageSize}, Memory::MemoryPermission::None,
|
||||||
Memory::MemoryPermission::Read, time_addr, time_size, "Time:SharedMemory");
|
Memory::MemoryPermission::Read, time_addr, time_size, "Time:SharedMemory");
|
||||||
|
@ -352,10 +352,10 @@ struct KernelCore::Impl {
|
||||||
std::unique_ptr<Memory::SlabHeap<Memory::Page>> user_slab_heap_pages;
|
std::unique_ptr<Memory::SlabHeap<Memory::Page>> user_slab_heap_pages;
|
||||||
|
|
||||||
// Shared memory for services
|
// Shared memory for services
|
||||||
std::shared_ptr<Kernel::SharedMemory> hid_shared_mem;
|
std::shared_ptr<Kernel::KSharedMemory> hid_shared_mem;
|
||||||
std::shared_ptr<Kernel::SharedMemory> font_shared_mem;
|
std::shared_ptr<Kernel::KSharedMemory> font_shared_mem;
|
||||||
std::shared_ptr<Kernel::SharedMemory> irs_shared_mem;
|
std::shared_ptr<Kernel::KSharedMemory> irs_shared_mem;
|
||||||
std::shared_ptr<Kernel::SharedMemory> time_shared_mem;
|
std::shared_ptr<Kernel::KSharedMemory> time_shared_mem;
|
||||||
|
|
||||||
// Threads used for services
|
// Threads used for services
|
||||||
std::unordered_set<std::shared_ptr<Kernel::ServiceThread>> service_threads;
|
std::unordered_set<std::shared_ptr<Kernel::ServiceThread>> service_threads;
|
||||||
|
@ -589,35 +589,35 @@ const Memory::SlabHeap<Memory::Page>& KernelCore::GetUserSlabHeapPages() const {
|
||||||
return *impl->user_slab_heap_pages;
|
return *impl->user_slab_heap_pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::SharedMemory& KernelCore::GetHidSharedMem() {
|
Kernel::KSharedMemory& KernelCore::GetHidSharedMem() {
|
||||||
return *impl->hid_shared_mem;
|
return *impl->hid_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Kernel::SharedMemory& KernelCore::GetHidSharedMem() const {
|
const Kernel::KSharedMemory& KernelCore::GetHidSharedMem() const {
|
||||||
return *impl->hid_shared_mem;
|
return *impl->hid_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::SharedMemory& KernelCore::GetFontSharedMem() {
|
Kernel::KSharedMemory& KernelCore::GetFontSharedMem() {
|
||||||
return *impl->font_shared_mem;
|
return *impl->font_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Kernel::SharedMemory& KernelCore::GetFontSharedMem() const {
|
const Kernel::KSharedMemory& KernelCore::GetFontSharedMem() const {
|
||||||
return *impl->font_shared_mem;
|
return *impl->font_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::SharedMemory& KernelCore::GetIrsSharedMem() {
|
Kernel::KSharedMemory& KernelCore::GetIrsSharedMem() {
|
||||||
return *impl->irs_shared_mem;
|
return *impl->irs_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Kernel::SharedMemory& KernelCore::GetIrsSharedMem() const {
|
const Kernel::KSharedMemory& KernelCore::GetIrsSharedMem() const {
|
||||||
return *impl->irs_shared_mem;
|
return *impl->irs_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::SharedMemory& KernelCore::GetTimeSharedMem() {
|
Kernel::KSharedMemory& KernelCore::GetTimeSharedMem() {
|
||||||
return *impl->time_shared_mem;
|
return *impl->time_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Kernel::SharedMemory& KernelCore::GetTimeSharedMem() const {
|
const Kernel::KSharedMemory& KernelCore::GetTimeSharedMem() const {
|
||||||
return *impl->time_shared_mem;
|
return *impl->time_shared_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ class PhysicalCore;
|
||||||
class Process;
|
class Process;
|
||||||
class KResourceLimit;
|
class KResourceLimit;
|
||||||
class KScheduler;
|
class KScheduler;
|
||||||
class SharedMemory;
|
class KSharedMemory;
|
||||||
class ServiceThread;
|
class ServiceThread;
|
||||||
class Synchronization;
|
class Synchronization;
|
||||||
class KThread;
|
class KThread;
|
||||||
|
@ -190,28 +190,28 @@ public:
|
||||||
const Memory::SlabHeap<Memory::Page>& GetUserSlabHeapPages() const;
|
const Memory::SlabHeap<Memory::Page>& GetUserSlabHeapPages() const;
|
||||||
|
|
||||||
/// Gets the shared memory object for HID services.
|
/// Gets the shared memory object for HID services.
|
||||||
Kernel::SharedMemory& GetHidSharedMem();
|
Kernel::KSharedMemory& GetHidSharedMem();
|
||||||
|
|
||||||
/// Gets the shared memory object for HID services.
|
/// Gets the shared memory object for HID services.
|
||||||
const Kernel::SharedMemory& GetHidSharedMem() const;
|
const Kernel::KSharedMemory& GetHidSharedMem() const;
|
||||||
|
|
||||||
/// Gets the shared memory object for font services.
|
/// Gets the shared memory object for font services.
|
||||||
Kernel::SharedMemory& GetFontSharedMem();
|
Kernel::KSharedMemory& GetFontSharedMem();
|
||||||
|
|
||||||
/// Gets the shared memory object for font services.
|
/// Gets the shared memory object for font services.
|
||||||
const Kernel::SharedMemory& GetFontSharedMem() const;
|
const Kernel::KSharedMemory& GetFontSharedMem() const;
|
||||||
|
|
||||||
/// Gets the shared memory object for IRS services.
|
/// Gets the shared memory object for IRS services.
|
||||||
Kernel::SharedMemory& GetIrsSharedMem();
|
Kernel::KSharedMemory& GetIrsSharedMem();
|
||||||
|
|
||||||
/// Gets the shared memory object for IRS services.
|
/// Gets the shared memory object for IRS services.
|
||||||
const Kernel::SharedMemory& GetIrsSharedMem() const;
|
const Kernel::KSharedMemory& GetIrsSharedMem() const;
|
||||||
|
|
||||||
/// Gets the shared memory object for Time services.
|
/// Gets the shared memory object for Time services.
|
||||||
Kernel::SharedMemory& GetTimeSharedMem();
|
Kernel::KSharedMemory& GetTimeSharedMem();
|
||||||
|
|
||||||
/// Gets the shared memory object for Time services.
|
/// Gets the shared memory object for Time services.
|
||||||
const Kernel::SharedMemory& GetTimeSharedMem() const;
|
const Kernel::KSharedMemory& GetTimeSharedMem() const;
|
||||||
|
|
||||||
/// Suspend/unsuspend the OS.
|
/// Suspend/unsuspend the OS.
|
||||||
void Suspend(bool in_suspention);
|
void Suspend(bool in_suspention);
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#include "core/hle/kernel/k_scheduler.h"
|
#include "core/hle/kernel/k_scheduler.h"
|
||||||
#include "core/hle/kernel/k_scoped_resource_reservation.h"
|
#include "core/hle/kernel/k_scoped_resource_reservation.h"
|
||||||
#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
|
#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/k_synchronization_object.h"
|
#include "core/hle/kernel/k_synchronization_object.h"
|
||||||
#include "core/hle/kernel/k_thread.h"
|
#include "core/hle/kernel/k_thread.h"
|
||||||
#include "core/hle/kernel/k_writable_event.h"
|
#include "core/hle/kernel/k_writable_event.h"
|
||||||
|
@ -41,7 +42,6 @@
|
||||||
#include "core/hle/kernel/memory/page_table.h"
|
#include "core/hle/kernel/memory/page_table.h"
|
||||||
#include "core/hle/kernel/physical_core.h"
|
#include "core/hle/kernel/physical_core.h"
|
||||||
#include "core/hle/kernel/process.h"
|
#include "core/hle/kernel/process.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
#include "core/hle/kernel/svc.h"
|
#include "core/hle/kernel/svc.h"
|
||||||
#include "core/hle/kernel/svc_results.h"
|
#include "core/hle/kernel/svc_results.h"
|
||||||
#include "core/hle/kernel/svc_types.h"
|
#include "core/hle/kernel/svc_types.h"
|
||||||
|
@ -1267,7 +1267,7 @@ static ResultCode MapSharedMemory(Core::System& system, Handle shared_memory_han
|
||||||
return ResultInvalidMemoryRange;
|
return ResultInvalidMemoryRange;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto shared_memory{current_process->GetHandleTable().Get<SharedMemory>(shared_memory_handle)};
|
auto shared_memory{current_process->GetHandleTable().Get<KSharedMemory>(shared_memory_handle)};
|
||||||
if (!shared_memory) {
|
if (!shared_memory) {
|
||||||
LOG_ERROR(Kernel_SVC, "Shared memory does not exist, shared_memory_handle=0x{:08X}",
|
LOG_ERROR(Kernel_SVC, "Shared memory does not exist, shared_memory_handle=0x{:08X}",
|
||||||
shared_memory_handle);
|
shared_memory_handle);
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
#include "core/hle/kernel/client_port.h"
|
#include "core/hle/kernel/client_port.h"
|
||||||
#include "core/hle/kernel/client_session.h"
|
#include "core/hle/kernel/client_session.h"
|
||||||
#include "core/hle/kernel/k_readable_event.h"
|
#include "core/hle/kernel/k_readable_event.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/k_writable_event.h"
|
#include "core/hle/kernel/k_writable_event.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
#include "core/hle/service/hid/errors.h"
|
#include "core/hle/service/hid/errors.h"
|
||||||
#include "core/hle/service/hid/hid.h"
|
#include "core/hle/service/hid/hid.h"
|
||||||
#include "core/hle/service/hid/irs.h"
|
#include "core/hle/service/hid/irs.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@ struct EventType;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
class SharedMemory;
|
class KSharedMemory;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Service::SM {
|
namespace Service::SM {
|
||||||
|
@ -69,7 +69,7 @@ private:
|
||||||
void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
||||||
void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
|
||||||
|
|
||||||
std::shared_ptr<Kernel::SharedMemory> shared_mem;
|
std::shared_ptr<Kernel::KSharedMemory> shared_mem;
|
||||||
|
|
||||||
std::shared_ptr<Core::Timing::EventType> pad_update_event;
|
std::shared_ptr<Core::Timing::EventType> pad_update_event;
|
||||||
std::shared_ptr<Core::Timing::EventType> motion_update_event;
|
std::shared_ptr<Core::Timing::EventType> motion_update_event;
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
#include "core/hle/service/hid/irs.h"
|
#include "core/hle/service/hid/irs.h"
|
||||||
|
|
||||||
namespace Service::HID {
|
namespace Service::HID {
|
||||||
|
|
|
@ -12,7 +12,7 @@ class System;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Kernel {
|
namespace Kernel {
|
||||||
class SharedMemory;
|
class KSharedMemory;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Service::HID {
|
namespace Service::HID {
|
||||||
|
@ -42,7 +42,7 @@ private:
|
||||||
void StopImageProcessorAsync(Kernel::HLERequestContext& ctx);
|
void StopImageProcessorAsync(Kernel::HLERequestContext& ctx);
|
||||||
void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx);
|
void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx);
|
||||||
|
|
||||||
std::shared_ptr<Kernel::SharedMemory> shared_mem;
|
std::shared_ptr<Kernel::KSharedMemory> shared_mem;
|
||||||
const u32 device_handle{0xABCD};
|
const u32 device_handle{0xABCD};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,9 @@
|
||||||
#include "core/file_sys/romfs.h"
|
#include "core/file_sys/romfs.h"
|
||||||
#include "core/file_sys/system_archive/system_archive.h"
|
#include "core/file_sys/system_archive/system_archive.h"
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
#include "core/hle/kernel/physical_memory.h"
|
#include "core/hle/kernel/physical_memory.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
#include "core/hle/service/filesystem/filesystem.h"
|
#include "core/hle/service/filesystem/filesystem.h"
|
||||||
#include "core/hle/service/ns/pl_u.h"
|
#include "core/hle/service/ns/pl_u.h"
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ struct PL_U::Impl {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Handle to shared memory region designated for a shared font
|
/// Handle to shared memory region designated for a shared font
|
||||||
std::shared_ptr<Kernel::SharedMemory> shared_font_mem;
|
std::shared_ptr<Kernel::KSharedMemory> shared_font_mem;
|
||||||
|
|
||||||
/// Backing memory for the shared font data
|
/// Backing memory for the shared font data
|
||||||
std::shared_ptr<Kernel::PhysicalMemory> shared_font;
|
std::shared_ptr<Kernel::PhysicalMemory> shared_font;
|
||||||
|
|
|
@ -22,7 +22,7 @@ SharedMemory::SharedMemory(Core::System& system) : system(system) {
|
||||||
|
|
||||||
SharedMemory::~SharedMemory() = default;
|
SharedMemory::~SharedMemory() = default;
|
||||||
|
|
||||||
std::shared_ptr<Kernel::SharedMemory> SharedMemory::GetSharedMemoryHolder() const {
|
std::shared_ptr<Kernel::KSharedMemory> SharedMemory::GetSharedMemoryHolder() const {
|
||||||
return shared_memory_holder;
|
return shared_memory_holder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/uuid.h"
|
#include "common/uuid.h"
|
||||||
|
#include "core/hle/kernel/k_shared_memory.h"
|
||||||
#include "core/hle/kernel/k_thread.h"
|
#include "core/hle/kernel/k_thread.h"
|
||||||
#include "core/hle/kernel/shared_memory.h"
|
|
||||||
#include "core/hle/service/time/clock_types.h"
|
#include "core/hle/service/time/clock_types.h"
|
||||||
|
|
||||||
namespace Service::Time {
|
namespace Service::Time {
|
||||||
|
@ -18,7 +18,7 @@ public:
|
||||||
~SharedMemory();
|
~SharedMemory();
|
||||||
|
|
||||||
// Return the shared memory handle
|
// Return the shared memory handle
|
||||||
std::shared_ptr<Kernel::SharedMemory> GetSharedMemoryHolder() const;
|
std::shared_ptr<Kernel::KSharedMemory> GetSharedMemoryHolder() const;
|
||||||
|
|
||||||
// TODO(ogniK): We have to properly simulate memory barriers, how are we going to do this?
|
// TODO(ogniK): We have to properly simulate memory barriers, how are we going to do this?
|
||||||
template <typename T, std::size_t Offset>
|
template <typename T, std::size_t Offset>
|
||||||
|
@ -63,7 +63,7 @@ public:
|
||||||
void SetAutomaticCorrectionEnabled(bool is_enabled);
|
void SetAutomaticCorrectionEnabled(bool is_enabled);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::shared_ptr<Kernel::SharedMemory> shared_memory_holder;
|
std::shared_ptr<Kernel::KSharedMemory> shared_memory_holder;
|
||||||
Core::System& system;
|
Core::System& system;
|
||||||
Format shared_memory_format{};
|
Format shared_memory_format{};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue