From eb0f771409742bf8810fa1279e0f12b0ed2d9cb0 Mon Sep 17 00:00:00 2001 From: profi200 Date: Fri, 26 Dec 2014 02:46:38 +0100 Subject: [PATCH] Replaced spaces in cfgu.c. --- examples/get_system_language/source/main.c | 5 +- libctru/source/services/cfgu.c | 90 +++++++++++----------- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/examples/get_system_language/source/main.c b/examples/get_system_language/source/main.c index 20494fa..940ef35 100644 --- a/examples/get_system_language/source/main.c +++ b/examples/get_system_language/source/main.c @@ -11,6 +11,7 @@ int main(int argc, char** argv) u8 language = 0; + Result res; // Init console for text output consoleInit(GFX_BOTTOM, NULL); @@ -18,7 +19,7 @@ int main(int argc, char** argv) // Read the language field from the config savegame. // See here for more block IDs: // http://3dbrew.org/wiki/Config_Savegame#Configuration_blocks - CFGU_GetConfigInfoBlk2(1, 0xA0002, &language); + res = CFGU_GetConfigInfoBlk2(1, 0xA0002, &language); // Main loop @@ -26,7 +27,7 @@ int main(int argc, char** argv) { hidScanInput(); - // Print language code + // Print return value and language code printf("\x1b[0;0HLanguage code: %d", (int)language); u32 kDown = hidKeysDown(); diff --git a/libctru/source/services/cfgu.c b/libctru/source/services/cfgu.c index 6ff7752..01e74db 100644 --- a/libctru/source/services/cfgu.c +++ b/libctru/source/services/cfgu.c @@ -8,101 +8,101 @@ static Handle CFGU_handle = 0; Result initCfgu() { - return srvGetServiceHandle(&CFGU_handle, "cfg:u"); + return srvGetServiceHandle(&CFGU_handle, "cfg:u"); } Result exitCfgu() { - Result ret = svcCloseHandle(CFGU_handle); - CFGU_handle = 0; + Result ret = svcCloseHandle(CFGU_handle); + CFGU_handle = 0; - return ret; + return ret; } Result CFGU_GetRegionCanadaUSA(u8* value) { - Result ret = 0; - u32 *cmdbuf = getThreadCommandBuffer(); + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x00040000; + cmdbuf[0] = 0x00040000; - if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; + if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; - *value = (u8)cmdbuf[2]; + *value = (u8)cmdbuf[2]; - return (Result)cmdbuf[1]; + return (Result)cmdbuf[1]; } Result CFGU_GetSystemModel(u8* model) { - Result ret = 0; - u32 *cmdbuf = getThreadCommandBuffer(); + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x00050000; + cmdbuf[0] = 0x00050000; - if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; + if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; - *model = (u8)cmdbuf[2]; + *model = (u8)cmdbuf[2]; - return (Result)cmdbuf[1]; + return (Result)cmdbuf[1]; } Result CFGU_GetModelNintendo2DS(u8* value) { - Result ret = 0; - u32 *cmdbuf = getThreadCommandBuffer(); + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x00060000; + cmdbuf[0] = 0x00060000; - if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; + if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; - *value = (u8)cmdbuf[2]; + *value = (u8)cmdbuf[2]; - return (Result)cmdbuf[1]; + return (Result)cmdbuf[1]; } Result CFGU_GetCountryCodeString(u16 code, u16* string) { - Result ret = 0; - u32 *cmdbuf = getThreadCommandBuffer(); + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x00090040; - cmdbuf[1] = (u32)code; + cmdbuf[0] = 0x00090040; + cmdbuf[1] = (u32)code; - if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; + if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; - *string = (u16)cmdbuf[2]; + *string = (u16)cmdbuf[2]; - return (Result)cmdbuf[1]; + return (Result)cmdbuf[1]; } Result CFGU_GetCountryCodeID(u16 string, u16* code) { - Result ret = 0; - u32 *cmdbuf = getThreadCommandBuffer(); + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x000A0040; - cmdbuf[1] = (u32)string; + cmdbuf[0] = 0x000A0040; + cmdbuf[1] = (u32)string; - if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; + if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; - *code = (u16)cmdbuf[2]; + *code = (u16)cmdbuf[2]; - return (Result)cmdbuf[1]; + return (Result)cmdbuf[1]; } Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData) { - Result ret = 0; - u32 *cmdbuf = getThreadCommandBuffer(); + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x00010082; - cmdbuf[1] = size; - cmdbuf[2] = blkID; - cmdbuf[3] = (size<<4)|12; - cmdbuf[4] = (u32)outData; + cmdbuf[0] = 0x00010082; + cmdbuf[1] = size; + cmdbuf[2] = blkID; + cmdbuf[3] = (size<<4)|12; + cmdbuf[4] = (u32)outData; - if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; + if((ret = svcSendSyncRequest(CFGU_handle))!=0)return ret; - return (Result)cmdbuf[1]; + return (Result)cmdbuf[1]; }