From 1ce8cb148c14df0a7e13688690afa490cac48c17 Mon Sep 17 00:00:00 2001
From: Ryan Loebs <obsidianx@gmail.com>
Date: Mon, 28 Mar 2016 23:32:25 -0700
Subject: [PATCH] Add common methods to all cfg:* ports

---
 src/core/hle/service/cfg/cfg_i.cpp | 12 ++++++++++++
 src/core/hle/service/cfg/cfg_s.cpp |  8 ++++++++
 src/core/hle/service/cfg/cfg_u.cpp |  1 +
 3 files changed, 21 insertions(+)

diff --git a/src/core/hle/service/cfg/cfg_i.cpp b/src/core/hle/service/cfg/cfg_i.cpp
index 0559a07b2..b18060f6d 100644
--- a/src/core/hle/service/cfg/cfg_i.cpp
+++ b/src/core/hle/service/cfg/cfg_i.cpp
@@ -9,6 +9,18 @@ namespace Service {
 namespace CFG {
 
 const Interface::FunctionInfo FunctionTable[] = {
+    // cfg common
+    {0x00010082, GetConfigInfoBlk2,                    "GetConfigInfoBlk2"},
+    {0x00020000, SecureInfoGetRegion,                  "SecureInfoGetRegion"},
+    {0x00030040, GenHashConsoleUnique,                 "GenHashConsoleUnique"},
+    {0x00040000, GetRegionCanadaUSA,                   "GetRegionCanadaUSA"},
+    {0x00050000, GetSystemModel,                       "GetSystemModel"},
+    {0x00060000, GetModelNintendo2DS,                  "GetModelNintendo2DS"},
+    {0x00070040, nullptr,                              "WriteToFirstByteCfgSavegame"},
+    {0x00080080, nullptr,                              "GoThroughTable"},
+    {0x00090040, GetCountryCodeString,                 "GetCountryCodeString"},
+    {0x000A0040, GetCountryCodeID,                     "GetCountryCodeID"},
+    // cfg:i
     {0x04010082, GetConfigInfoBlk8,                    "GetConfigInfoBlk8"},
     {0x04020082, nullptr,                              "SetConfigInfoBlk4"},
     {0x04030000, UpdateConfigNANDSavegame,             "UpdateConfigNANDSavegame"},
diff --git a/src/core/hle/service/cfg/cfg_s.cpp b/src/core/hle/service/cfg/cfg_s.cpp
index b03d290e5..e001f7687 100644
--- a/src/core/hle/service/cfg/cfg_s.cpp
+++ b/src/core/hle/service/cfg/cfg_s.cpp
@@ -9,10 +9,18 @@ namespace Service {
 namespace CFG {
 
 const Interface::FunctionInfo FunctionTable[] = {
+    // cfg common
     {0x00010082, GetConfigInfoBlk2,                    "GetConfigInfoBlk2"},
     {0x00020000, SecureInfoGetRegion,                  "SecureInfoGetRegion"},
     {0x00030040, GenHashConsoleUnique,                 "GenHashConsoleUnique"},
+    {0x00040000, GetRegionCanadaUSA,                   "GetRegionCanadaUSA"},
     {0x00050000, GetSystemModel,                       "GetSystemModel"},
+    {0x00060000, GetModelNintendo2DS,                  "GetModelNintendo2DS"},
+    {0x00070040, nullptr,                              "WriteToFirstByteCfgSavegame"},
+    {0x00080080, nullptr,                              "GoThroughTable"},
+    {0x00090040, GetCountryCodeString,                 "GetCountryCodeString"},
+    {0x000A0040, GetCountryCodeID,                     "GetCountryCodeID"},
+    // cfg:s
     {0x04010082, GetConfigInfoBlk8,                    "GetConfigInfoBlk8"},
     {0x04020082, nullptr,                              "SetConfigInfoBlk4"},
     {0x04030000, UpdateConfigNANDSavegame,             "UpdateConfigNANDSavegame"},
diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp
index 89ae96c9e..606f7b2eb 100644
--- a/src/core/hle/service/cfg/cfg_u.cpp
+++ b/src/core/hle/service/cfg/cfg_u.cpp
@@ -9,6 +9,7 @@ namespace Service {
 namespace CFG {
 
 const Interface::FunctionInfo FunctionTable[] = {
+    // cfg common
     {0x00010082, GetConfigInfoBlk2,     "GetConfigInfoBlk2"},
     {0x00020000, SecureInfoGetRegion,   "SecureInfoGetRegion"},
     {0x00030040, GenHashConsoleUnique,  "GenHashConsoleUnique"},