Rename nvMapFree to nvMapClose for consistency reasons

This commit is contained in:
fincs 2018-11-12 18:02:02 +01:00 committed by fincs
parent a9cbd9116a
commit c5f8275978
3 changed files with 5 additions and 5 deletions

View File

@ -16,7 +16,7 @@ u32 nvMapGetFd(void);
void nvMapExit(void); void nvMapExit(void);
Result nvMapCreate(NvMap* m, void* cpu_addr, u32 size, u32 align, NvKind kind, bool is_cpu_cacheable); 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) static inline u32 nvMapGetHandle(NvMap* m)
{ {

View File

@ -280,7 +280,7 @@ Result gfxInitDefault(void) {
if (g_gfx_ProducerSlotsRequested & BIT(i)) bqDetachBuffer(&g_gfxBinderSession, i); if (g_gfx_ProducerSlotsRequested & BIT(i)) bqDetachBuffer(&g_gfxBinderSession, i);
} }
bqDisconnect(&g_gfxBinderSession, NATIVE_WINDOW_API_CPU); bqDisconnect(&g_gfxBinderSession, NATIVE_WINDOW_API_CPU);
nvMapFree(&g_nvmap_obj); nvMapClose(&g_nvmap_obj);
nvMapExit(); nvMapExit();
nvFenceExit(); nvFenceExit();
nvExit(); nvExit();
@ -325,7 +325,7 @@ void gfxExit(void)
if (g_gfx_ProducerSlotsRequested & BIT(i)) bqDetachBuffer(&g_gfxBinderSession, i); if (g_gfx_ProducerSlotsRequested & BIT(i)) bqDetachBuffer(&g_gfxBinderSession, i);
} }
bqDisconnect(&g_gfxBinderSession, NATIVE_WINDOW_API_CPU); bqDisconnect(&g_gfxBinderSession, NATIVE_WINDOW_API_CPU);
nvMapFree(&g_nvmap_obj); nvMapClose(&g_nvmap_obj);
nvMapExit(); nvMapExit();
nvFenceExit(); nvFenceExit();
nvExit(); nvExit();

View File

@ -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); rc = nvioctlNvmap_GetId(g_nvmap_fd, m->handle, &m->id);
if (R_FAILED(rc)) if (R_FAILED(rc))
nvMapFree(m); nvMapClose(m);
return rc; return rc;
} }
void nvMapFree(NvMap* m) void nvMapClose(NvMap* m)
{ {
if (!m->has_init) if (!m->has_init)
return; return;