Simplified reading the system language by adding a wrapper. Print only once in the...

diff --git a/examples/get_system_language/source/main.c b/examples/get_system_language/source/main.c
index 1a5d4c02d43c6a4e8743a1d20c69c0d620f84e26..d0fa8150390083d99c56e6bc7fd834799e014900 100644 (file)
--- a/examples/get_system_language/source/main.c
+++ b/examples/get_system_language/source/main.c
@@ -17,9 +17,11 @@ int main(int argc, char** argv)
        consoleInit(GFX_BOTTOM, NULL);
 
        // Read the language field from the config savegame.
-       // See here for more block IDs:
-       // http://3dbrew.org/wiki/Config_Savegame#Configuration_blocks
-       res = CFGU_GetConfigInfoBlk2(1, 0xA0002, &language);
+       res = CFGU_GetSystemLanguage(&language);
+
+       // Print return value and language code
+       printf("       Result: 0x%x\n", (int)res);
+       printf("Language code: %d", (int)language);
 
 
        // Main loop
@@ -27,10 +29,6 @@ int main(int argc, char** argv)
        {
                hidScanInput();
 
-               // Print return value and language code
-               printf("\x1b[0;0Hresult: 0x%x", (int)res);
-               printf("\x1b[1;0HLanguage code: %d", (int)language);
-
                u32 kDown = hidKeysDown();
                if (kDown & KEY_START)
                        break; // break in order to return to hbmenu

diff --git a/libctru/include/3ds/services/cfgu.h b/libctru/include/3ds/services/cfgu.h
index 8ff7db4c53e697837aa3a2c40f32cfc4d40f79dc..10c4178d4a5f02889fa49c2329ce8b737745212b 100644 (file)
--- a/libctru/include/3ds/services/cfgu.h
+++ b/libctru/include/3ds/services/cfgu.h
@@ -9,3 +9,4 @@ Result CFGU_GetModelNintendo2DS(u8* value);
 Result CFGU_GetCountryCodeString(u16 code, u16* string);
 Result CFGU_GetCountryCodeID(u16 string, u16* code);
 Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData);
+Result CFGU_GetSystemLanguage(u8* language);

diff --git a/libctru/source/services/cfgu.c b/libctru/source/services/cfgu.c
index 01e74db6207ea5085921b9e40c883f337055e020..e5e25565b09527333fc7fb955a4d9efc417191d8 100644 (file)
--- a/libctru/source/services/cfgu.c
+++ b/libctru/source/services/cfgu.c
@@ -91,6 +91,8 @@ Result CFGU_GetCountryCodeID(u16 string, u16* code)
        return (Result)cmdbuf[1];
 }
 
+// See here for block IDs:
+// http://3dbrew.org/wiki/Config_Savegame#Configuration_blocks
 Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData)
 {
        Result ret = 0;
@@ -106,3 +108,8 @@ Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData)
 
        return (Result)cmdbuf[1];
 }
+
+Result CFGU_GetSystemLanguage(u8* language)
+{
+       return CFGU_GetConfigInfoBlk2(1, 0xA0002, language);
+}