From 3113d633fc4f833d42418ec5396f49181863cdae Mon Sep 17 00:00:00 2001 From: fincs Date: Mon, 12 Nov 2018 18:02:02 +0100 Subject: [PATCH] Rename nvMapFree to nvMapClose for consistency reasons --- nx/include/switch/nvidia/map.h | 2 +- nx/source/display/gfx.c | 4 ++-- nx/source/nvidia/map.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nx/include/switch/nvidia/map.h b/nx/include/switch/nvidia/map.h index cf3c3cfc..52823b40 100644 --- a/nx/include/switch/nvidia/map.h +++ b/nx/include/switch/nvidia/map.h @@ -16,7 +16,7 @@ u32 nvMapGetFd(void); void nvMapExit(void); Result nvMapCreate(NvMap* m, void* cpu_addr, u32 size, u32 align, NvKind kind, bool is_cpu_cacheable); -void nvMapFree(NvMap* m); +void nvMapClose(NvMap* m); static inline u32 nvMapGetHandle(NvMap* m) { diff --git a/nx/source/display/gfx.c b/nx/source/display/gfx.c index 123f697e..17339d37 100644 --- a/nx/source/display/gfx.c +++ b/nx/source/display/gfx.c @@ -280,7 +280,7 @@ Result gfxInitDefault(void) { if (g_gfx_ProducerSlotsRequested & BIT(i)) bqDetachBuffer(&g_gfxBinderSession, i); } bqDisconnect(&g_gfxBinderSession, NATIVE_WINDOW_API_CPU); - nvMapFree(&g_nvmap_obj); + nvMapClose(&g_nvmap_obj); nvMapExit(); nvFenceExit(); nvExit(); @@ -325,7 +325,7 @@ void gfxExit(void) if (g_gfx_ProducerSlotsRequested & BIT(i)) bqDetachBuffer(&g_gfxBinderSession, i); } bqDisconnect(&g_gfxBinderSession, NATIVE_WINDOW_API_CPU); - nvMapFree(&g_nvmap_obj); + nvMapClose(&g_nvmap_obj); nvMapExit(); nvFenceExit(); nvExit(); diff --git a/nx/source/nvidia/map.c b/nx/source/nvidia/map.c index b371ed78..60877594 100644 --- a/nx/source/nvidia/map.c +++ b/nx/source/nvidia/map.c @@ -77,12 +77,12 @@ Result nvMapCreate(NvMap* m, void* cpu_addr, u32 size, u32 align, NvKind kind, b rc = nvioctlNvmap_GetId(g_nvmap_fd, m->handle, &m->id); if (R_FAILED(rc)) - nvMapFree(m); + nvMapClose(m); return rc; } -void nvMapFree(NvMap* m) +void nvMapClose(NvMap* m) { if (!m->has_init) return;