From 00d0c94f2d3700cbcea9fc92b7b375509468a439 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 1 Oct 2021 01:02:48 -0700 Subject: [PATCH] os: amend io region api --- .../libstratosphere/include/stratosphere/os/os_io_region.hpp | 4 ++-- .../include/stratosphere/os/os_io_region_api.hpp | 2 +- libraries/libstratosphere/source/os/os_io_region.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/os/os_io_region.hpp b/libraries/libstratosphere/include/stratosphere/os/os_io_region.hpp index bb95e1c00..0f3b00f1a 100644 --- a/libraries/libstratosphere/include/stratosphere/os/os_io_region.hpp +++ b/libraries/libstratosphere/include/stratosphere/os/os_io_region.hpp @@ -51,8 +51,8 @@ namespace ams::os { DestroyIoRegion(std::addressof(m_io_region)); } - void Attach(size_t size, Handle handle, bool managed) { - AttachIoRegion(std::addressof(m_io_region), size, handle, managed); + void AttachHandle(size_t size, Handle handle, bool managed) { + AttachIoRegionHandle(std::addressof(m_io_region), size, handle, managed); } Handle GetHandle() const { diff --git a/libraries/libstratosphere/include/stratosphere/os/os_io_region_api.hpp b/libraries/libstratosphere/include/stratosphere/os/os_io_region_api.hpp index 3a780dbd5..6433a65a5 100644 --- a/libraries/libstratosphere/include/stratosphere/os/os_io_region_api.hpp +++ b/libraries/libstratosphere/include/stratosphere/os/os_io_region_api.hpp @@ -24,7 +24,7 @@ namespace ams::os { Result CreateIoRegion(IoRegionType *io_region, Handle io_pool_handle, uintptr_t address, size_t size, MemoryMapping mapping, MemoryPermission permission); - void AttachIoRegion(IoRegionType *io_region, size_t size, Handle handle, bool managed); + void AttachIoRegionHandle(IoRegionType *io_region, size_t size, Handle handle, bool managed); void DestroyIoRegion(IoRegionType *io_region); diff --git a/libraries/libstratosphere/source/os/os_io_region.cpp b/libraries/libstratosphere/source/os/os_io_region.cpp index f60645334..cfd4b5d51 100644 --- a/libraries/libstratosphere/source/os/os_io_region.cpp +++ b/libraries/libstratosphere/source/os/os_io_region.cpp @@ -59,7 +59,7 @@ namespace ams::os { return ResultSuccess(); } - void AttachIoRegion(IoRegionType *io_region, size_t size, Handle handle, bool managed) { + void AttachIoRegionHandle(IoRegionType *io_region, size_t size, Handle handle, bool managed) { /* Check pre-conditions. */ AMS_ASSERT(io_region != nullptr); AMS_ASSERT(util::IsAligned(size, os::MemoryPageSize));