1 files changed, 34 insertions, 40 deletions

diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 81d8a3a63b..b252a2efa5 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -50,61 +50,55 @@ class NVGEM_C final : public ServiceFramework<NVGEM_C> {
 public:
     explicit NVGEM_C(Core::System& system_)
         : ServiceFramework{system_, "nvgem:c"}
-    {}
-
-    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key, functions);
+    {
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Initialize"},
+            {1, nullptr, "GetEventHandle"},
+            {2, nullptr, "ControlNotification"},
+            {3, nullptr, "SetNotificationPerm"},
+            {4, nullptr, "SetCoreDumpPerm"},
+            {5, nullptr, "GetAruid"},
+            {6, nullptr, "Reset"},
+            {7, nullptr, "GetAruid2"},
+        };
+        RegisterHandlers(functions);
     }
-    static constexpr auto functions = CreateStaticMap(
-        FunctionInfo{0, nullptr, "Initialize"},
-        FunctionInfo{1, nullptr, "GetEventHandle"},
-        FunctionInfo{2, nullptr, "ControlNotification"},
-        FunctionInfo{3, nullptr, "SetNotificationPerm"},
-        FunctionInfo{4, nullptr, "SetCoreDumpPerm"},
-        FunctionInfo{5, nullptr, "GetAruid"},
-        FunctionInfo{6, nullptr, "Reset"},
-        FunctionInfo{7, nullptr, "GetAruid2"}
-    );
 };
 
 class NVGEM_CD final : public ServiceFramework<NVGEM_CD> {
 public:
     explicit NVGEM_CD(Core::System& system_)
         : ServiceFramework{system_, "nvgem:cd"}
-    {}
-
-    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key, functions);
+    {
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Initialize"},
+            {1, nullptr, "GetAruid"},
+            {2, nullptr, "ReadNextBlock"},
+            {3, nullptr, "GetNextBlockSize"},
+            {4, nullptr, "ReadNextBlock2"},
+        };
+        RegisterHandlers(functions);
     }
-    static constexpr auto functions = CreateStaticMap(
-        FunctionInfo{0, nullptr, "Initialize"},
-        FunctionInfo{1, nullptr, "GetAruid"},
-        FunctionInfo{2, nullptr, "ReadNextBlock"},
-        FunctionInfo{3, nullptr, "GetNextBlockSize"},
-        FunctionInfo{4, nullptr, "ReadNextBlock2"}
-    );
 };
 
 class NVDBG_D final : public ServiceFramework<NVDBG_D> {
 public:
     explicit NVDBG_D(Core::System& system_)
         : ServiceFramework{system_, "nvdbg:d"}
-    {}
-
-    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
-        return HandlerTableGenerateWithFind(key, functions);
+    {
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Open"},
+            {1, nullptr, "Ioctl"},
+            {2, nullptr, "Close"},
+            {4, nullptr, "QueryEvent"},
+            {9, nullptr, "DumpStatus"},
+            {10, nullptr, "InitializeDevtools"},
+            {11, nullptr, "Ioctl2"},
+            {12, nullptr, "Ioctl3"},
+            {13, nullptr, "SetConfiguration"},
+        };
+        RegisterHandlers(functions);
     }
-    static constexpr auto functions = CreateStaticMap(
-        FunctionInfo{0, nullptr, "Open"},
-        FunctionInfo{1, nullptr, "Ioctl"},
-        FunctionInfo{2, nullptr, "Close"},
-        FunctionInfo{4, nullptr, "QueryEvent"},
-        FunctionInfo{9, nullptr, "DumpStatus"},
-        FunctionInfo{10, nullptr, "InitializeDevtools"},
-        FunctionInfo{11, nullptr, "Ioctl2"},
-        FunctionInfo{12, nullptr, "Ioctl3"},
-        FunctionInfo{13, nullptr, "SetConfiguration"}
-    );
 };
 
 void LoopProcess(Core::System& system) {