diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index b6e6f115e..5eb602843 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include "core/hle/kernel/handle_table.h" | 29 | #include "core/hle/kernel/handle_table.h" |
| 30 | #include "core/hle/kernel/k_resource_limit.h" | 30 | #include "core/hle/kernel/k_resource_limit.h" |
| 31 | #include "core/hle/kernel/k_scheduler.h" | 31 | #include "core/hle/kernel/k_scheduler.h" |
| 32 | #include "core/hle/kernel/k_shared_memory.h" | ||
| 32 | #include "core/hle/kernel/k_thread.h" | 33 | #include "core/hle/kernel/k_thread.h" |
| 33 | #include "core/hle/kernel/kernel.h" | 34 | #include "core/hle/kernel/kernel.h" |
| 34 | #include "core/hle/kernel/memory/memory_layout.h" | 35 | #include "core/hle/kernel/memory/memory_layout.h" |
| @@ -37,7 +38,6 @@ | |||
| 37 | #include "core/hle/kernel/physical_core.h" | 38 | #include "core/hle/kernel/physical_core.h" |
| 38 | #include "core/hle/kernel/process.h" | 39 | #include "core/hle/kernel/process.h" |
| 39 | #include "core/hle/kernel/service_thread.h" | 40 | #include "core/hle/kernel/service_thread.h" |
| 40 | #include "core/hle/kernel/shared_memory.h" | ||
| 41 | #include "core/hle/kernel/svc_results.h" | 41 | #include "core/hle/kernel/svc_results.h" |
| 42 | #include "core/hle/kernel/time_manager.h" | 42 | #include "core/hle/kernel/time_manager.h" |
| 43 | #include "core/hle/lock.h" | 43 | #include "core/hle/lock.h" |
| @@ -288,19 +288,19 @@ struct KernelCore::Impl { | |||
| 288 | layout.System().StartAddress(), | 288 | layout.System().StartAddress(), |
| 289 | layout.System().EndAddress()); | 289 | layout.System().EndAddress()); |
| 290 | 290 | ||
| 291 | hid_shared_mem = Kernel::SharedMemory::Create( | 291 | hid_shared_mem = Kernel::KSharedMemory::Create( |
| 292 | system.Kernel(), system.DeviceMemory(), nullptr, | 292 | system.Kernel(), system.DeviceMemory(), nullptr, |
| 293 | {hid_addr, hid_size / Memory::PageSize}, Memory::MemoryPermission::None, | 293 | {hid_addr, hid_size / Memory::PageSize}, Memory::MemoryPermission::None, |
| 294 | Memory::MemoryPermission::Read, hid_addr, hid_size, "HID:SharedMemory"); | 294 | Memory::MemoryPermission::Read, hid_addr, hid_size, "HID:SharedMemory"); |
| 295 | font_shared_mem = Kernel::SharedMemory::Create( | 295 | font_shared_mem = Kernel::KSharedMemory::Create( |
| 296 | system.Kernel(), system.DeviceMemory(), nullptr, | 296 | system.Kernel(), system.DeviceMemory(), nullptr, |
| 297 | {font_pa, font_size / Memory::PageSize}, Memory::MemoryPermission::None, | 297 | {font_pa, font_size / Memory::PageSize}, Memory::MemoryPermission::None, |
| 298 | Memory::MemoryPermission::Read, font_pa, font_size, "Font:SharedMemory"); | 298 | Memory::MemoryPermission::Read, font_pa, font_size, "Font:SharedMemory"); |
| 299 | irs_shared_mem = Kernel::SharedMemory::Create( | 299 | irs_shared_mem = Kernel::KSharedMemory::Create( |
| 300 | system.Kernel(), system.DeviceMemory(), nullptr, | 300 | system.Kernel(), system.DeviceMemory(), nullptr, |
| 301 | {irs_addr, irs_size / Memory::PageSize}, Memory::MemoryPermission::None, | 301 | {irs_addr, irs_size / Memory::PageSize}, Memory::MemoryPermission::None, |
| 302 | Memory::MemoryPermission::Read, irs_addr, irs_size, "IRS:SharedMemory"); | 302 | Memory::MemoryPermission::Read, irs_addr, irs_size, "IRS:SharedMemory"); |
| 303 | time_shared_mem = Kernel::SharedMemory::Create( | 303 | time_shared_mem = Kernel::KSharedMemory::Create( |
| 304 | system.Kernel(), system.DeviceMemory(), nullptr, | 304 | system.Kernel(), system.DeviceMemory(), nullptr, |
| 305 | {time_addr, time_size / Memory::PageSize}, Memory::MemoryPermission::None, | 305 | {time_addr, time_size / Memory::PageSize}, Memory::MemoryPermission::None, |
| 306 | Memory::MemoryPermission::Read, time_addr, time_size, "Time:SharedMemory"); | 306 | Memory::MemoryPermission::Read, time_addr, time_size, "Time:SharedMemory"); |
| @@ -352,10 +352,10 @@ struct KernelCore::Impl { | |||
| 352 | std::unique_ptr<Memory::SlabHeap<Memory::Page>> user_slab_heap_pages; | 352 | std::unique_ptr<Memory::SlabHeap<Memory::Page>> user_slab_heap_pages; |
| 353 | 353 | ||
| 354 | // Shared memory for services | 354 | // Shared memory for services |
| 355 | std::shared_ptr<Kernel::SharedMemory> hid_shared_mem; | 355 | std::shared_ptr<Kernel::KSharedMemory> hid_shared_mem; |
| 356 | std::shared_ptr<Kernel::SharedMemory> font_shared_mem; | 356 | std::shared_ptr<Kernel::KSharedMemory> font_shared_mem; |
| 357 | std::shared_ptr<Kernel::SharedMemory> irs_shared_mem; | 357 | std::shared_ptr<Kernel::KSharedMemory> irs_shared_mem; |
| 358 | std::shared_ptr<Kernel::SharedMemory> time_shared_mem; | 358 | std::shared_ptr<Kernel::KSharedMemory> time_shared_mem; |
| 359 | 359 | ||
| 360 | // Threads used for services | 360 | // Threads used for services |
| 361 | std::unordered_set<std::shared_ptr<Kernel::ServiceThread>> service_threads; | 361 | std::unordered_set<std::shared_ptr<Kernel::ServiceThread>> service_threads; |
| @@ -589,35 +589,35 @@ const Memory::SlabHeap<Memory::Page>& KernelCore::GetUserSlabHeapPages() const { | |||
| 589 | return *impl->user_slab_heap_pages; | 589 | return *impl->user_slab_heap_pages; |
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | Kernel::SharedMemory& KernelCore::GetHidSharedMem() { | 592 | Kernel::KSharedMemory& KernelCore::GetHidSharedMem() { |
| 593 | return *impl->hid_shared_mem; | 593 | return *impl->hid_shared_mem; |
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | const Kernel::SharedMemory& KernelCore::GetHidSharedMem() const { | 596 | const Kernel::KSharedMemory& KernelCore::GetHidSharedMem() const { |
| 597 | return *impl->hid_shared_mem; | 597 | return *impl->hid_shared_mem; |
| 598 | } | 598 | } |
| 599 | 599 | ||
| 600 | Kernel::SharedMemory& KernelCore::GetFontSharedMem() { | 600 | Kernel::KSharedMemory& KernelCore::GetFontSharedMem() { |
| 601 | return *impl->font_shared_mem; | 601 | return *impl->font_shared_mem; |
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | const Kernel::SharedMemory& KernelCore::GetFontSharedMem() const { | 604 | const Kernel::KSharedMemory& KernelCore::GetFontSharedMem() const { |
| 605 | return *impl->font_shared_mem; | 605 | return *impl->font_shared_mem; |
| 606 | } | 606 | } |
| 607 | 607 | ||
| 608 | Kernel::SharedMemory& KernelCore::GetIrsSharedMem() { | 608 | Kernel::KSharedMemory& KernelCore::GetIrsSharedMem() { |
| 609 | return *impl->irs_shared_mem; | 609 | return *impl->irs_shared_mem; |
| 610 | } | 610 | } |
| 611 | 611 | ||
| 612 | const Kernel::SharedMemory& KernelCore::GetIrsSharedMem() const { | 612 | const Kernel::KSharedMemory& KernelCore::GetIrsSharedMem() const { |
| 613 | return *impl->irs_shared_mem; | 613 | return *impl->irs_shared_mem; |
| 614 | } | 614 | } |
| 615 | 615 | ||
| 616 | Kernel::SharedMemory& KernelCore::GetTimeSharedMem() { | 616 | Kernel::KSharedMemory& KernelCore::GetTimeSharedMem() { |
| 617 | return *impl->time_shared_mem; | 617 | return *impl->time_shared_mem; |
| 618 | } | 618 | } |
| 619 | 619 | ||
| 620 | const Kernel::SharedMemory& KernelCore::GetTimeSharedMem() const { | 620 | const Kernel::KSharedMemory& KernelCore::GetTimeSharedMem() const { |
| 621 | return *impl->time_shared_mem; | 621 | return *impl->time_shared_mem; |
| 622 | } | 622 | } |
| 623 | 623 | ||