Added CFGU_GetConfigInfoBlk2() and an example.

diff --git a/examples/get_system_language/Makefile b/examples/get_system_language/Makefile
new file mode 100644 (file)
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=<path to>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):
+#     - <Project name>.png
+#     - icon.png
+#     - <libctru folder>/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 (file)
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 (file)
index 0000000..20494fa
--- /dev/null
+++ b/examples/get_system_language/source/main.c
@@ -0,0 +1,46 @@
+#include <stdio.h>
+#include <string.h>
+#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 036e7d24ebb94fc00f10d8a4d34cf1c827126904..8ff7db4c53e697837aa3a2c40f32cfc4d40f79dc 100644 (file)
--- 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 c28a6cc9e404705965f8ca36b46a024758747fb2..6ff7752245253110a7c16d0eef72c69e62ddd8ae 100644 (file)
--- 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];
+}