From 412c84d5f9510fb8cd3b882acbfc8d2084fc97ee Mon Sep 17 00:00:00 2001
From: fincs <fincs.alt1@gmail.com>
Date: Mon, 12 Nov 2018 18:06:44 +0100
Subject: [PATCH] Rename NvInfo to NvGpu

---
 nx/include/switch.h                |  6 +++---
 nx/include/switch/nvidia/gpu.h     |  9 +++++++++
 nx/include/switch/nvidia/info.h    |  9 ---------
 nx/source/nvidia/{info.c => gpu.c} | 17 +++++++++--------
 4 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 nx/include/switch/nvidia/gpu.h
 delete mode 100644 nx/include/switch/nvidia/info.h
 rename nx/source/nvidia/{info.c => gpu.c} (79%)

diff --git a/nx/include/switch.h b/nx/include/switch.h
index 0bf0408c..c622730b 100644
--- a/nx/include/switch.h
+++ b/nx/include/switch.h
@@ -89,12 +89,12 @@ extern "C" {
 #include "switch/display/native_window.h"
 
 #include "switch/nvidia/ioctl.h"
-#include "switch/nvidia/map.h"
 #include "switch/nvidia/graphic_buffer.h"
+#include "switch/nvidia/fence.h"
+#include "switch/nvidia/map.h"
 #include "switch/nvidia/address_space.h"
 #include "switch/nvidia/channel.h"
-#include "switch/nvidia/info.h"
-#include "switch/nvidia/fence.h"
+#include "switch/nvidia/gpu.h"
 #include "switch/nvidia/gpu_channel.h"
 
 #include "switch/audio/driver.h"
diff --git a/nx/include/switch/nvidia/gpu.h b/nx/include/switch/nvidia/gpu.h
new file mode 100644
index 00000000..06fbe513
--- /dev/null
+++ b/nx/include/switch/nvidia/gpu.h
@@ -0,0 +1,9 @@
+#pragma once
+#include "types.h"
+#include "ioctl.h"
+
+Result nvGpuInit(void);
+void nvGpuExit(void);
+
+const nvioctl_gpu_characteristics* nvGpuGetCharacteristics(void);
+u32 nvGpuGetZcullCtxSize(void);
diff --git a/nx/include/switch/nvidia/info.h b/nx/include/switch/nvidia/info.h
deleted file mode 100644
index 5cea05a7..00000000
--- a/nx/include/switch/nvidia/info.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-#include "types.h"
-#include "ioctl.h"
-
-Result nvInfoInit(void);
-void nvInfoExit(void);
-
-const nvioctl_gpu_characteristics* nvInfoGetGpuCharacteristics(void);
-u32 nvInfoGetZcullCtxSize(void);
diff --git a/nx/source/nvidia/info.c b/nx/source/nvidia/gpu.c
similarity index 79%
rename from nx/source/nvidia/info.c
rename to nx/source/nvidia/gpu.c
index cc77ae3b..76f9b1ff 100644
--- a/nx/source/nvidia/info.c
+++ b/nx/source/nvidia/gpu.c
@@ -5,7 +5,7 @@
 #include "kernel/svc.h"
 #include "services/nv.h"
 #include "nvidia/ioctl.h"
-#include "nvidia/info.h"
+#include "nvidia/gpu.h"
 
 static u32 g_ctrlgpu_fd = -1;
 static u64 g_refCnt;
@@ -13,7 +13,7 @@ static u64 g_refCnt;
 static nvioctl_gpu_characteristics g_gpu_characteristics;
 static u32 g_zcull_ctx_size;
 
-Result nvInfoInit(void)
+Result nvGpuInit(void)
 {
     Result rc;
 
@@ -32,15 +32,14 @@ Result nvInfoInit(void)
         rc = nvioctlNvhostCtrlGpu_ZCullGetCtxSize(g_ctrlgpu_fd, &g_zcull_ctx_size);
 
     if (R_FAILED(rc))
-        nvInfoExit();
+        nvGpuExit();
 
     return rc;
 }
 
-void nvInfoExit(void)
+void nvGpuExit(void)
 {
-    if (atomicDecrement64(&g_refCnt) == 0)
-    {
+    if (atomicDecrement64(&g_refCnt) == 0) {
         if (g_ctrlgpu_fd != -1)
             nvClose(g_ctrlgpu_fd);
 
@@ -48,10 +47,12 @@ void nvInfoExit(void)
     }
 }
 
-const nvioctl_gpu_characteristics* nvInfoGetGpuCharacteristics(void) {
+const nvioctl_gpu_characteristics* nvGpuGetCharacteristics(void)
+{
     return &g_gpu_characteristics;
 }
 
-u32 nvInfoGetZcullCtxSize(void) {
+u32 nvGpuGetZcullCtxSize(void)
+{
     return g_zcull_ctx_size;
 }