From 54f2afcb19d0b09e6048c67105721c959b89b547 Mon Sep 17 00:00:00 2001 From: profi200 Date: Fri, 26 Dec 2014 02:31:59 +0100 Subject: [PATCH 1/5] Added CFGU_GetConfigInfoBlk2() and an example. --- examples/get_system_language/Makefile | 175 +++++++++++++++++++++ examples/get_system_language/README.md | 4 + examples/get_system_language/source/main.c | 46 ++++++ libctru/include/3ds/services/cfgu.h | 1 + libctru/source/services/cfgu.c | 16 ++ 5 files changed, 242 insertions(+) create mode 100644 examples/get_system_language/Makefile create mode 100644 examples/get_system_language/README.md create mode 100644 examples/get_system_language/source/main.c diff --git a/examples/get_system_language/Makefile b/examples/get_system_language/Makefile new file mode 100644 index 0000000..1ed1097 --- /dev/null +++ b/examples/get_system_language/Makefile @@ -0,0 +1,175 @@ +#--------------------------------------------------------------------------------- +.SUFFIXES: +#--------------------------------------------------------------------------------- + +ifeq ($(strip $(DEVKITARM)),) +$(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitARM") +endif + +TOPDIR ?= $(CURDIR) +include $(DEVKITARM)/3ds_rules + +#--------------------------------------------------------------------------------- +# TARGET is the name of the output +# BUILD is the directory where object files & intermediate files will be placed +# SOURCES is a list of directories containing source code +# DATA is a list of directories containing data files +# INCLUDES is a list of directories containing header files +# +# NO_SMDH: if set to anything, no SMDH file is generated. +# APP_TITLE is the name of the app stored in the SMDH file (Optional) +# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional) +# APP_AUTHOR is the author of the app stored in the SMDH file (Optional) +# ICON is the filename of the icon (.png), relative to the project folder. +# If not set, it attempts to use one of the following (in this order): +# - .png +# - icon.png +# - /default_icon.png +#--------------------------------------------------------------------------------- +TARGET := $(notdir $(CURDIR)) +BUILD := build +SOURCES := source +DATA := data +INCLUDES := include + +#--------------------------------------------------------------------------------- +# options for code generation +#--------------------------------------------------------------------------------- +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=softfp + +CFLAGS := -g -Wall -O2 -mword-relocations \ + -fomit-frame-pointer -ffast-math \ + $(ARCH) + +CFLAGS += $(INCLUDE) -DARM11 -D_3DS + +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 + +ASFLAGS := -g $(ARCH) +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) + +LIBS := -lctru -lm + +#--------------------------------------------------------------------------------- +# list of directories containing libraries, this must be the top level containing +# include and lib +#--------------------------------------------------------------------------------- +LIBDIRS := $(CTRULIB) + + +#--------------------------------------------------------------------------------- +# no real need to edit anything past this point unless you need to add additional +# rules for different file extensions +#--------------------------------------------------------------------------------- +ifneq ($(BUILD),$(notdir $(CURDIR))) +#--------------------------------------------------------------------------------- + +export OUTPUT := $(CURDIR)/$(TARGET) +export TOPDIR := $(CURDIR) + +export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ + $(foreach dir,$(DATA),$(CURDIR)/$(dir)) + +export DEPSDIR := $(CURDIR)/$(BUILD) + +CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) +CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) +SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) +BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) + +#--------------------------------------------------------------------------------- +# use CXX for linking C++ projects, CC for standard C +#--------------------------------------------------------------------------------- +ifeq ($(strip $(CPPFILES)),) +#--------------------------------------------------------------------------------- + export LD := $(CC) +#--------------------------------------------------------------------------------- +else +#--------------------------------------------------------------------------------- + export LD := $(CXX) +#--------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------- + +export OFILES := $(addsuffix .o,$(BINFILES)) \ + $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) + +export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ + $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ + -I$(CURDIR)/$(BUILD) + +export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) + +ifeq ($(strip $(ICON)),) + icons := $(wildcard *.png) + ifneq (,$(findstring $(TARGET).png,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).png + else + ifneq (,$(findstring icon.png,$(icons))) + export APP_ICON := $(TOPDIR)/icon.png + endif + endif +else + export APP_ICON := $(TOPDIR)/$(ICON) +endif + +ifeq ($(strip $(NO_SMDH)),) + export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh +endif + +.PHONY: $(BUILD) clean all + +#--------------------------------------------------------------------------------- +all: $(BUILD) + +$(BUILD): + @[ -d $@ ] || mkdir -p $@ + @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile + +#--------------------------------------------------------------------------------- +clean: + @echo clean ... + @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf + + +#--------------------------------------------------------------------------------- +else + +DEPENDS := $(OFILES:.o=.d) + +#--------------------------------------------------------------------------------- +# main targets +#--------------------------------------------------------------------------------- +ifeq ($(strip $(NO_SMDH)),) +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else +$(OUTPUT).3dsx : $(OUTPUT).elf +endif + +$(OUTPUT).elf : $(OFILES) + +#--------------------------------------------------------------------------------- +# you need a rule like this for each extension you use as binary data +#--------------------------------------------------------------------------------- +%.bin.o : %.bin +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +# WARNING: This is not the right way to do this! TODO: Do it right! +#--------------------------------------------------------------------------------- +%.vsh.o : %.vsh +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @python $(AEMSTRO)/aemstro_as.py $< ../$(notdir $<).shbin + @bin2s ../$(notdir $<).shbin | $(PREFIX)as -o $@ + @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h + @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h + @echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h + @rm ../$(notdir $<).shbin + +-include $(DEPENDS) + +#--------------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------------- diff --git a/examples/get_system_language/README.md b/examples/get_system_language/README.md new file mode 100644 index 0000000..a54dbd6 --- /dev/null +++ b/examples/get_system_language/README.md @@ -0,0 +1,4 @@ +get_system_language +======= + +This is an example on how to get the system language on the 3DS. diff --git a/examples/get_system_language/source/main.c b/examples/get_system_language/source/main.c new file mode 100644 index 0000000..20494fa --- /dev/null +++ b/examples/get_system_language/source/main.c @@ -0,0 +1,46 @@ +#include +#include +#include <3ds.h> + + +int main(int argc, char** argv) +{ + // Initialize services + gfxInit(); + initCfgu(); + + + u8 language = 0; + + // Init console for text output + 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 + CFGU_GetConfigInfoBlk2(1, 0xA0002, &language); + + + // Main loop + while (aptMainLoop()) + { + hidScanInput(); + + // Print language code + printf("\x1b[0;0HLanguage code: %d", (int)language); + + u32 kDown = hidKeysDown(); + if (kDown & KEY_START) + break; // break in order to return to hbmenu + + // Flush and swap framebuffers + gfxFlushBuffers(); + gfxSwapBuffers(); + gspWaitForVBlank(); + } + + // Exit services + exitCfgu(); + gfxExit(); + return 0; +} diff --git a/libctru/include/3ds/services/cfgu.h b/libctru/include/3ds/services/cfgu.h index 036e7d2..8ff7db4 100644 --- a/libctru/include/3ds/services/cfgu.h +++ b/libctru/include/3ds/services/cfgu.h @@ -8,3 +8,4 @@ Result CFGU_GetSystemModel(u8* model); 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); diff --git a/libctru/source/services/cfgu.c b/libctru/source/services/cfgu.c index c28a6cc..6ff7752 100644 --- a/libctru/source/services/cfgu.c +++ b/libctru/source/services/cfgu.c @@ -90,3 +90,19 @@ Result CFGU_GetCountryCodeID(u16 string, u16* code) return (Result)cmdbuf[1]; } + +Result CFGU_GetConfigInfoBlk2(u32 size, u32 blkID, u8* outData) +{ + Result ret = 0; + u32 *cmdbuf = getThreadCommandBuffer(); + + 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; + + return (Result)cmdbuf[1]; +} From eb0f771409742bf8810fa1279e0f12b0ed2d9cb0 Mon Sep 17 00:00:00 2001 From: profi200 Date: Fri, 26 Dec 2014 02:46:38 +0100 Subject: [PATCH 2/5] 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]; } From 9ab796b058d1518fab8a48aee70f5b57201e8ecb Mon Sep 17 00:00:00 2001 From: profi200 Date: Fri, 26 Dec 2014 02:57:49 +0100 Subject: [PATCH 3/5] Forgot to finish the changes on the get_system_language example. --- examples/get_system_language/source/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/get_system_language/source/main.c b/examples/get_system_language/source/main.c index 940ef35..d254957 100644 --- a/examples/get_system_language/source/main.c +++ b/examples/get_system_language/source/main.c @@ -28,7 +28,8 @@ int main(int argc, char** argv) hidScanInput(); // Print return value and language code - printf("\x1b[0;0HLanguage code: %d", (int)language); + printf("\x1b[0;0Hresult: %d", (int)res); + printf("\x1b[1;0HLanguage code: %d", (int)language); u32 kDown = hidKeysDown(); if (kDown & KEY_START) From 4f08f191ff9834d799a6efad89caac3a958b9b92 Mon Sep 17 00:00:00 2001 From: profi200 Date: Fri, 26 Dec 2014 03:03:40 +0100 Subject: [PATCH 4/5] Better in hex. --- examples/get_system_language/source/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/get_system_language/source/main.c b/examples/get_system_language/source/main.c index d254957..1a5d4c0 100644 --- a/examples/get_system_language/source/main.c +++ b/examples/get_system_language/source/main.c @@ -28,7 +28,7 @@ int main(int argc, char** argv) hidScanInput(); // Print return value and language code - printf("\x1b[0;0Hresult: %d", (int)res); + printf("\x1b[0;0Hresult: 0x%x", (int)res); printf("\x1b[1;0HLanguage code: %d", (int)language); u32 kDown = hidKeysDown(); From bb5c4a6ca860b49ae2e7fd0f453daa3dfdf9cb2c Mon Sep 17 00:00:00 2001 From: profi200 Date: Mon, 29 Dec 2014 22:46:59 +0100 Subject: [PATCH 5/5] Simplified reading the system language by adding a wrapper. Print only once in the get_system_language example. --- examples/get_system_language/source/main.c | 12 +++++------- libctru/include/3ds/services/cfgu.h | 1 + libctru/source/services/cfgu.c | 7 +++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/get_system_language/source/main.c b/examples/get_system_language/source/main.c index 1a5d4c0..d0fa815 100644 --- 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 8ff7db4..10c4178 100644 --- 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 01e74db..e5e2556 100644 --- 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); +}