Update for template changes.

.gitignore

@@ -1,9 +1,5 @@
 .idea
-build
 CMakeLists.txt
-*.3dsx
+
-*.elf
+build
-*.smdh
+output
-*.zip
-*.cia
-*.3ds

Makefile

@@ -9,13 +9,11 @@ endif
 TOPDIR ?= $(CURDIR)
 include $(DEVKITARM)/3ds_rules
 
-APP_ID = FBI
 APP_TITLE = FBI
 APP_DESCRIPTION = Open source CIA installer.
 APP_AUTHOR = Steveice10
 
 #---------------------------------------------------------------------------------
-# 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
@@ -31,7 +29,6 @@ APP_AUTHOR = Steveice10
 #     - icon.png
 #     - <libctru folder>/default_icon.png
 #---------------------------------------------------------------------------------
-TARGET		:=	$(APP_ID)
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
@@ -65,12 +62,9 @@ LIBS	:= -lctru -lm
 #---------------------------------------------------------------------------------
 LIBDIRS	:= $(CTRULIB) ./lib
 
-MAKEROM = $(TOPDIR)/resources/tools/makerom
+MAKEROM = $(TOPDIR)/tools/makerom
-BANNER_TOOL = $(TOPDIR)/resources/tools/banner
+BANNER_TOOL = $(TOPDIR)/tools/banner
-PREPARE_BANNER = python2 banner.py
+CREATE_BANNER = python create.py
-PREPARE_ICON24 = python2 icon.py
-PREPARE_ICON48 = python2 icon.py
-CREATE_BANNER = python2 create.py
 
 
 #---------------------------------------------------------------------------------
@@ -80,7 +74,10 @@ CREATE_BANNER = python2 create.py
 ifneq ($(BUILD),$(notdir $(CURDIR)))
 #---------------------------------------------------------------------------------
 
-export OUTPUT	:=	$(CURDIR)/$(TARGET)
+null            :=
+SPACE           :=      $(null) $(null)
+export OUTPUT_D	:=	$(CURDIR)/output
+export OUTPUT	:=	$(OUTPUT_D)/$(subst $(SPACE),,$(APP_TITLE))
 export TOPDIR	:=	$(CURDIR)
 
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
@@ -116,18 +113,7 @@ export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 
 export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 
-ifeq ($(strip $(ICON)),)
+export APP_ICON := $(TOPDIR)/$(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
 
 .PHONY: $(BUILD) clean all
 
@@ -141,7 +127,7 @@ $(BUILD):
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(TARGET).3ds $(TARGET).cia $(BANNER_TOOL)/banner.bnr $(BANNER_TOOL)/icon.icn
+	@rm -fr $(BUILD) $(OUTPUT_D)
 
 
 #---------------------------------------------------------------------------------
@@ -154,40 +140,30 @@ DEPENDS	:=	$(OFILES:.o=.d)
 #---------------------------------------------------------------------------------
 ifeq ($(strip $(NO_SMDH)),)
 .PHONY: all
-all	:	$(OUTPUT).3dsx $(OUTPUT).smdh $(OUTPUT).cia $(OUTPUT).3ds
+all	:	$(OUTPUT_D) $(OUTPUT).3dsx $(OUTPUT).smdh $(OUTPUT).cia $(OUTPUT).3ds
 endif
+$(OUTPUT_D)     :
+	@[ -d $@ ] || mkdir -p $@
+
 $(OUTPUT).3dsx	:	$(OUTPUT).elf
 $(OUTPUT).elf	:	$(OFILES)
 
-$(BANNER_TOOL)/banner.bnr: $(TOPDIR)/resources/banner.png $(TOPDIR)/resources/icon24.png $(TOPDIR)/resources/icon48.png
+banner.bnr: $(TOPDIR)/resources/icon24.png $(TOPDIR)/resources/icon48.png $(TOPDIR)/resources/banner.png
-	cp $(TOPDIR)/resources/banner.png $(BANNER_TOOL)/banner/banner.png
+	cd $(BANNER_TOOL); $(CREATE_BANNER) "$(APP_TITLE)" "$(APP_TITLE)" "$(APP_AUTHOR)" $(TOPDIR)/resources/icon24.png $(TOPDIR)/resources/icon48.png $(TOPDIR)/resources/banner.png $(TOPDIR)/$(BUILD)/icon.icn $(TOPDIR)/$(BUILD)/banner.bnr
-	cp $(TOPDIR)/resources/icon24.png $(BANNER_TOOL)/icon24/icon24.png
+	@echo "built ... banner files"
-	cp $(TOPDIR)/resources/icon48.png $(BANNER_TOOL)/icon48/icon48.png
-	cd $(BANNER_TOOL)/banner; $(PREPARE_BANNER)
-	cd $(BANNER_TOOL)/icon24; $(PREPARE_ICON24)
-	cd $(BANNER_TOOL)/icon48; $(PREPARE_ICON48)
-	cd $(BANNER_TOOL); $(CREATE_BANNER)
-	rm $(BANNER_TOOL)/banner/banner.png
-	rm $(BANNER_TOOL)/banner/banner.cgfx
-	rm $(BANNER_TOOL)/banner/compressed.cgfx
-	rm $(BANNER_TOOL)/banner/banner.cbmd
-	rm $(BANNER_TOOL)/icon24/icon24.png
-	rm $(BANNER_TOOL)/icon24/icon24.ctpk
-	rm $(BANNER_TOOL)/icon48/icon48.png
-	rm $(BANNER_TOOL)/icon48/icon48.ctpk
 	
-$(BANNER_TOOL)/icon.icn: $(BANNER_TOOL)/banner.bnr
+icon.icn: banner.bnr
 
-$(OUTPUT).cia: $(OUTPUT).elf $(TOPDIR)/resources/cia.rsf $(BANNER_TOOL)/banner.bnr $(BANNER_TOOL)/icon.icn
+stripped.elf: $(OUTPUT).elf
-	@cp $(OUTPUT).elf $(TARGET)_stripped.elf
+	@cp $(OUTPUT).elf stripped.elf
-	@$(PREFIX)strip $(TARGET)_stripped.elf
+	@$(PREFIX)strip stripped.elf
-	$(MAKEROM) -f cia -o $(OUTPUT).cia -rsf $(TOPDIR)/resources/cia.rsf -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(BANNER_TOOL)/icon.icn -banner $(BANNER_TOOL)/banner.bnr
+
+$(OUTPUT).cia: stripped.elf $(TOPDIR)/resources/cia.rsf banner.bnr icon.icn
+	$(MAKEROM) -f cia -o $(OUTPUT).cia -rsf $(TOPDIR)/resources/cia.rsf -target t -exefslogo -elf stripped.elf -icon icon.icn -banner banner.bnr
 	@echo "built ... $(notdir $@)"
 
-$(OUTPUT).3ds: $(OUTPUT).elf $(TOPDIR)/resources/3ds.rsf $(BANNER_TOOL)/banner.bnr $(BANNER_TOOL)/icon.icn
+$(OUTPUT).3ds: stripped.elf $(TOPDIR)/resources/3ds.rsf banner.bnr icon.icn
-	@cp $(OUTPUT).elf $(TARGET)_stripped.elf
+	$(MAKEROM) -f cci -o $(OUTPUT).3ds -rsf $(TOPDIR)/resources/3ds.rsf -target d -exefslogo -elf stripped.elf -icon icon.icn -banner banner.bnr
-	@$(PREFIX)strip $(TARGET)_stripped.elf
-	$(MAKEROM) -f cci -o $(OUTPUT).3ds -rsf $(TOPDIR)/resources/3ds.rsf -target d -exefslogo -elf $(TARGET)_stripped.elf -icon $(BANNER_TOOL)/icon.icn -banner $(BANNER_TOOL)/banner.bnr
 	@echo "built ... $(notdir $@)"
 
 #---------------------------------------------------------------------------------

resources/3ds.rsf

@@ -15,7 +15,7 @@ TitleInfo:
   Category                : Application
   
 CardInfo:
-  MediaSize               : 128MB # 128MB / 256MB / 512MB / 1GB / 2GB / 4GB
+  MediaSize               : 128MB # 128MB / 256MB / 512MB / 1GB / 2GB / 4GB / 8GB / 16GB / 32GB
   MediaType               : Card1 # Card1 / Card2
   CardDevice              : None # NorFlash(Pick this if you use savedata) / None
   
@@ -26,6 +26,7 @@ Option:
   EnableCrypt             : true # Enables encryption for NCCH and CIA
   EnableCompress          : true # Compresses exefs code
 
+
 ExeFs: # these are the program segments from the ELF, check your elf for the appropriate segment names
   ReadOnly: 
    - .rodata
@@ -42,10 +43,10 @@ PlainRegion: # only used with SDK ELFs
  - .module_id
   
 AccessControlInfo:
-  #UseExtSaveData : true
+  # UseExtSaveData : true
-  #ExtSaveDataId: 0xff3ff
+  # ExtSaveDataId: 0xff3ff
-  #UseExtendedSaveDataAccessControl: true
+  # UseExtendedSaveDataAccessControl: true
-  #AccessibleSaveDataIds: [0x101, 0x202, 0x303, 0x404, 0x505, 0x606]
+  # AccessibleSaveDataIds: [0x101, 0x202, 0x303, 0x404, 0x505, 0x606]
 
 SystemControlInfo:
   SaveDataSize: 128KB
@@ -138,7 +139,6 @@ AccessControlInfo:
    - $hostio0
    - $hostio1
    - ac:u
-   - am:u
    - boss:U
    - cam:u
    - cecd:u
@@ -162,6 +162,7 @@ AccessControlInfo:
    - y2r:u
    - ldr:ro
    - ir:USER
+   - am:u
   
    
 SystemControlInfo:

resources/AppData.txt

@@ -1,22 +0,0 @@
-#-display text: enter your info between the quotes
-#-don't use unicode (i.e. weird characters) or program will barf
-#-not certain about string length limits so be conservative
-
-longtitle="FBI CIA Installer"
-shortitle="FBI"
-publisher="Steveice10"
-
-#-setting flags: don't change unless you know what you're doing
-#-1 is on, 0 is off
-#-for more info, visit http://3dbrew.org/wiki/SMDH#Flags
-
-visibility    =1
-autoBoot      =0
-use3D         =1
-requireEULA   =0
-autoSaveOnExit=0
-extendedBanner=0
-gameRatings   =0
-useSaveData   =1
-recordAppUsage=0
-disableSaveBU =0

resources/cia.rsf

@@ -173,7 +173,6 @@ AccessControlInfo:
    - $hostio0
    - $hostio1
    - ac:u
-   - am:u
    - boss:U
    - cam:u
    - cecd:u
@@ -199,6 +198,7 @@ AccessControlInfo:
    - ir:USER
    - ir:u
    - csnd:SND
+   - am:u
   
    
 SystemControlInfo:

resources/tools/banner/.gitignore

@@ -1,2 +0,0 @@
-*.bnr
-*.icn

resources/tools/banner/banner/banner.py

@@ -1,98 +0,0 @@
-from PIL import Image, ImageDraw
-import sys,os,platform
-
-f=open('banner.png','rb')
-image=Image.open(f)
-if image.size[0] != 256 or image.size[1] != 128:
-	f.close()
-	print "ERROR: Image must be exactly 256 x 128. Abort."
-	sys.exit(4)
-
-icon=open('banner.cgfx','wb')
-hdr=open("header.bin","rb")
-
-posit=open('map256x128.bin','rb')
-'''
-chx=[0,1,4,5,16,17,20,21]
-chy=[0,2,8,10,32,34,40,42]
-w=image.size[0]
-h=image.size[1]
-'''
-n=256*128
-i=[0]*(n*2)
-cbmdhdr="\x43\x42\x4D\x44\x00\x00\x00\x00\x88"+("\x00"*0x7B)
-
-dump=list(image.getdata())
-pos=0
-
-for x in range(n):
-	#xx=x%w
-	#yy=x/w
-	#print xx,yy
-	#pos=(chx[x%8]+chy[(x>>3)%8])+((x>>6)<<6)  fail (i'm not a math major :p)
-	#print pos
-
-	p1=ord(posit.read(1))  
-	p2=ord(posit.read(1))
-	pos=p1+(p2<<8)
-	#print p1,p2,pos
-	r=dump[x][0]>>4
-	g=dump[x][1]>>4
-	b=dump[x][2]>>4
-	a=dump[x][3]>>4
-
-	i[pos<<1]= (b<<4) | a
-	i[(pos<<1)+1]= (r<<4) | g
-
-
-buf=hdr.read()
-hdr.close()
-	
-for byte in buf:
-	icon.write((byte))	
-for byte in i:
-    icon.write(chr(byte))
-
-icon.close()
-	
-if platform.system() == "Windows":
-	os.system("DSDecmp.exe -c lz11 banner.cgfx compressed.cgfx")
-else:
-	os.system("wine DSDecmp.exe -c lz11 banner.cgfx compressed.cgfx")
-
-ccgfx=open("compressed.cgfx",'rb')
-l=ccgfx.read()
-len=len(l)+136
-
-pad=16-(len%16)
-l+=("\x00"*pad)
-len+=pad
-
-cbmdlen=['']*4
-for c in range(4):
-	cbmdlen[c]=chr(len&255)
-	len=len>>8
-
-for i in cbmdlen:
-	cbmdhdr+=i
-
-cbmd=open("banner.cbmd","wb")
-cbmdfinal=l
-cbmdhdr+=cbmdfinal
-cbmd.write(cbmdhdr)
-cbmd.close()
-
-print "Done."
-f.close()
-posit.close()
-cbmd.close()
-ccgfx.close()
-sys.exit(0)
-
-
-
-
-
-
-
-

resources/tools/banner/create.py

@@ -1,59 +0,0 @@
-import os,sys
-execfile("../../AppData.txt")
-
-icn=open("icon.icn","wb")
-bnr=open("banner.bnr","wb")
-
-cptk1=open("icon24/icon24.ctpk","rb")
-cptk2=open("icon48/icon48.ctpk","rb")
-bcwav1=open("audio/audio.bcwav","rb")
-cbmd1=open("banner/banner.cbmd","rb")
-
-ctp1=cptk1.read()
-ctp2=cptk2.read()
-bcwav=bcwav1.read()
-cbmd=cbmd1.read()
-
-header=list("\x53\x4D\x44\x48\x00\x00\x00\x00")
-header+=("\x00"*0x1FF8)
-header+="\x00\x00\x00\x00\x00\x00\x00\x00\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x00\x00\x00\x00\xFF\xFF\xFF\x7F\x31\x48\x62\x64\x99\x99\x99\x19\x91\x18\x62\x64\xA5\x01\x00\x00\x00\x01\x00\x00\x00\x00\x80\x3F\x32\x41\x79\x24\x00\x00\x00\x00\x00\x00\x00\x00"
-
-header[0x2028]=chr(visibility | autoBoot<<1 | use3D<<2 | requireEULA<<3 | autoSaveOnExit<<4 | extendedBanner<<5 | gameRatings<<6 | useSaveData<<7)
-header[0x2029]=chr(recordAppUsage | disableSaveBU<<2)
-
-offset=8
-pos=0
-
-for x in range(11):
-	for c in longtitle:
-		header[offset+pos*2]=longtitle[pos]
-		pos+=1
-	pos=0
-	offset+=0x80
-	for c in shortitle:
-		header[offset+pos*2]=shortitle[pos]
-		pos+=1
-	pos=0
-	offset+=0x100
-	
-	for c in publisher:
-		header[offset+pos*2]=publisher[pos]
-		pos+=1
-	pos=0
-	offset+=0x80
-
-header=''.join(header)
-header+=(ctp1+ctp2)
-
-icn.write(header)
-bnr.write(cbmd+bcwav)
-
-print "banner.bnr built."
-print "icon.icn built."
-print "Done."
-bnr.close()
-icn.close()
-cptk1.close()
-cptk2.close()
-bcwav1.close()
-cbmd1.close()

resources/tools/banner/icon24/icon.py

@@ -1,65 +0,0 @@
-from PIL import Image, ImageDraw
-import sys,os
-
-icon=open('icon24.ctpk','wb')
-
-f=open('icon24.png','rb')
-image=Image.open(f)
-posit=open('map24x24.bin','rb')
-
-chx=[0,1,4,5,16,17,20,21]
-chy=[0,2,8,10,32,34,40,42]
-w=image.size[0]
-h=image.size[1]
-n=w*w
-i=[0]*(n*2)
-
-if w != h:
-    print "width, height unequal"
-    f.close()
-    icon.close()
-    sys.exit(1)
-if w != 24:
-    print "sides need to be 24 pixels"
-    f.close()
-    icon.close()
-    sys.exit(1)
-
-dump=list(image.getdata())
-
-
-pos=0
-
-for x in xrange(n):
-    #xx=x%w
-    #yy=x/w
-    #print xx,yy
-    #pos=(chx[x%8]+chy[(x>>3)%8])+((x>>6)<<6) 
-    #print pos
-
-    p1=ord(posit.read(1)) 
-    p2=ord(posit.read(1))
-    pos=p1+(p2<<8)
-    #print p1,p2,pos
-    r=dump[x][0]>>3
-    g=dump[x][1]>>2
-    b=dump[x][2]>>3
-
-    i[pos<<1]=(g&7)<<5| b
-    i[(pos<<1)+1]=(r)<<3 | g>>3
-
-for byte in i:
-    icon.write(chr(byte))
-print "Done."
-icon.close()
-f.close()
-posit.close()
-
-exit()
-
-
-
-
-
-
-

resources/tools/banner/icon48/icon.py

@@ -1,65 +0,0 @@
-from PIL import Image, ImageDraw
-import sys,os
-
-icon=open('icon48.ctpk','wb')
-
-f=open('icon48.png','rb')
-image=Image.open(f)
-posit=open('map48x48.bin','rb')
-
-chx=[0,1,4,5,16,17,20,21]
-chy=[0,2,8,10,32,34,40,42]
-w=image.size[0]
-h=image.size[1]
-n=w*w
-i=[0]*(n*2)
-
-if w != h:
-    print "width, height unequal"
-    f.close()
-    icon.close()
-    sys.exit(1)
-if w != 48:
-    print "sides need to be 48 pixels"
-    f.close()
-    icon.close()
-    sys.exit(1)
-
-dump=list(image.getdata())
-
-
-pos=0
-
-for x in xrange(n):
-    #xx=x%w
-    #yy=x/w
-    #print xx,yy
-    #pos=(chx[x%8]+chy[(x>>3)%8])+((x>>6)<<6) 
-    #print pos
-
-    p1=ord(posit.read(1))  
-    p2=ord(posit.read(1))
-    pos=p1+(p2<<8)
-    #print p1,p2,pos
-    r=dump[x][0]>>3
-    g=dump[x][1]>>2
-    b=dump[x][2]>>3
-
-    i[pos<<1]=(g&7)<<5| b
-    i[(pos<<1)+1]=(r)<<3 | g>>3
-
-for byte in i:
-    icon.write(chr(byte))
-print "Done."
-icon.close()
-f.close()
-posit.close()
-
-exit()
-
-
-
-
-
-
-

source/common.c

@@ -547,13 +547,26 @@ App* app_list(MediaType mediaType, u32* count) {
 	}
 
 	u32 titleCount;
-	AM_GetTitleCount(app_mediatype_to_byte(mediaType), &titleCount);
+	if(AM_GetTitleCount(app_mediatype_to_byte(mediaType), &titleCount) != 0) {
+		if(count != NULL) {
+			*count = 0;
+		}
+
+		return (App*) malloc(0);
+	}
+
 	if(count != NULL) {
 		*count = titleCount;
 	}
 
 	u64 titleIds[titleCount];
-	AM_GetTitleList(app_mediatype_to_byte(mediaType), titleCount, titleIds);
+	if(AM_GetTitleList(app_mediatype_to_byte(mediaType), titleCount, titleIds) != 0) {
+		if(count != NULL) {
+			*count = 0;
+		}
+
+		return (App*) malloc(0);
+	}
 
 	App* titles = (App*) malloc(titleCount * sizeof(App));
 	for(int i = 0; i < titleCount; i++) {
@@ -581,23 +594,24 @@ bool app_install(MediaType mediaType, const char* path, bool (*onProgress)(int p
 		return false;
 	}
 
+	FILE* fd = fopen(path, "r");
+	if(!fd) {
+		return false;
+	}
+
+	fseek(fd, 0, SEEK_END);
+	u64 size = (u64) ftell(fd);
+	fseek(fd, 0, SEEK_SET);
+
 	if(onProgress != NULL) {
 		onProgress(0);
 	}
 
-	FS_archive sdmcArchive = (FS_archive) {ARCH_SDMC, (FS_path) {PATH_EMPTY, 1, (u8*) ""}};
+	Handle ciaHandle;
-	FSUSER_OpenArchive(NULL, &sdmcArchive);
+	if(AM_StartCiaInstall(app_mediatype_to_byte(mediaType), &ciaHandle) != 0) {
-	Handle fileHandle;
-	u64 size;
-
-	if(FSUSER_OpenFile(NULL, &fileHandle, sdmcArchive, FS_makePath(PATH_CHAR, path + 5), FS_OPEN_READ, FS_ATTRIBUTE_NONE) != 0) {
 		return false;
 	}
 
-	FSFILE_GetSize(fileHandle, &size);
-
-	Handle ciaHandle;
-	AM_StartCiaInstall(app_mediatype_to_byte(mediaType), &ciaHandle);
 	FSFILE_SetSize(ciaHandle, size);
 
 	u32 bufSize = 1024 * 256; // 256KB
@@ -610,23 +624,27 @@ bool app_install(MediaType mediaType, const char* path, bool (*onProgress)(int p
 			break;
 		}
 
-		u32 bytesRead;
+		u32 bytesRead = fread(buf, 1, bufSize, fd);
-		FSFILE_Read(fileHandle, &bytesRead, pos, buf, bufSize);
 		FSFILE_Write(ciaHandle, NULL, pos, buf, bytesRead, FS_WRITE_NOFLUSH);
 	}
 
-	if(!cancelled) {
+	free(buf);
-		if(onProgress != NULL) {
+	fclose(fd);
-			onProgress(100);
-		}
 
-		AM_FinishCiaInstall(app_mediatype_to_byte(mediaType), &ciaHandle);
+	if(cancelled) {
+		return false;
 	}
 
-	free(buf);
+	if(onProgress != NULL) {
-	FSFILE_Close(fileHandle);
+		onProgress(100);
-	FSUSER_CloseArchive(NULL, &sdmcArchive);
+	}
-	return !cancelled;
+
+	Result res = AM_FinishCiaInstall(app_mediatype_to_byte(mediaType), &ciaHandle);
+	if(res != 0 && res != 0xC8A044DC) { // Happens when already installed, but seems to have succeeded anyway...
+		return false;
+	}
+
+	return true;
 }
 
 bool app_delete(MediaType mediaType, App app) {
@@ -648,22 +666,27 @@ bool app_launch(MediaType mediaType, App app) {
 u64 fs_get_free_space(MediaType mediaType) {
 	u32 clusterSize;
 	u32 freeClusters;
+	Result res = 0;
 	if(mediaType == NAND) {
-		FSUSER_GetNandArchiveResource(NULL, NULL, &clusterSize, NULL, &freeClusters);
+		res = FSUSER_GetNandArchiveResource(NULL, NULL, &clusterSize, NULL, &freeClusters);
 	} else {
-		FSUSER_GetSdmcArchiveResource(NULL, NULL, &clusterSize, NULL, &freeClusters);
+		res = FSUSER_GetSdmcArchiveResource(NULL, NULL, &clusterSize, NULL, &freeClusters);
+	}
+
+	if(res != 0) {
+		return 0;
 	}
 
 	return clusterSize * freeClusters;
 }
 
-void platform_init() {
+bool platform_init() {
-	srvInit();
+	if(srvInit() != 0 || aptInit() != 0 || hidInit(NULL) != 0 || fsInit() != 0 || sdmcInit() != 0) {
-	aptInit();
+		return false;
-	hidInit(NULL);
+	}
+
 	gfxInitDefault();
-	fsInit();
+	return true;
-	sdmcInit();
 }
 
 void platform_cleanup() {

source/common.h

@@ -113,7 +113,7 @@ bool app_launch(MediaType mediaType, App app);
 
 u64 fs_get_free_space(MediaType mediaType);
 
-void platform_init();
+bool platform_init();
 void platform_cleanup();
 bool platform_is_running();
 u64 platform_get_time();

source/main.cpp

@@ -4,7 +4,9 @@
 #include "ui.h"
 
 int main(int argc, char **argv) {
-	platform_init();
+	if(!platform_init()) {
+		return 0;
+	}
 
 	MediaType destination = SD;
 	Mode mode = INSTALL;

tools/banner/.gitignore

@@ -0,0 +1 @@
+__pycache__

tools/banner/compress.py

@@ -0,0 +1,255 @@
+# used http://code.google.com/p/u-lzss/source/browse/trunk/js/lib/ulzss.js as
+# a guide
+from sys import stderr
+
+from collections import defaultdict
+from operator import itemgetter
+from struct import pack, unpack
+
+class SlidingWindow:
+    # The size of the sliding window
+    size = 4096
+
+    # The minimum displacement.
+    disp_min = 2
+
+    # The hard minimum — a disp less than this can't be represented in the
+    # compressed stream.
+    disp_start = 1
+
+    # The minimum length for a successful match in the window
+    match_min = 1
+
+    # The maximum length of a successful match, inclusive.
+    match_max = None
+
+    def __init__(self, buf):
+        self.data = buf
+        self.hash = defaultdict(list)
+        self.full = False
+
+        self.start = 0
+        self.stop = 0
+        #self.index = self.disp_min - 1
+        self.index = 0
+
+        assert self.match_max is not None
+
+    def next(self):
+        if self.index < self.disp_start - 1:
+            self.index += 1
+            return
+
+        if self.full:
+            olditem = self.data[self.start]
+            assert self.hash[olditem][0] == self.start
+            self.hash[olditem].pop(0)
+
+        item = self.data[self.stop]
+        self.hash[item].append(self.stop)
+        self.stop += 1
+        self.index += 1
+
+        if self.full:
+            self.start += 1
+        else:
+            if self.size <= self.stop:
+                self.full = True
+
+    def advance(self, n=1):
+        """Advance the window by n bytes"""
+        for _ in range(n):
+            self.next()
+
+    def search(self):
+        match_max = self.match_max
+        match_min = self.match_min
+
+        counts = []
+        indices = self.hash[self.data[self.index]]
+        for i in indices:
+            matchlen = self.match(i, self.index)
+            if matchlen >= match_min:
+                disp = self.index - i
+                #assert self.index - disp >= 0
+                #assert self.disp_min <= disp < self.size + self.disp_min
+                if self.disp_min <= disp:
+                    counts.append((matchlen, -disp))
+                    if matchlen >= match_max:
+                        #assert matchlen == match_max
+                        return counts[-1]
+
+        if counts:
+            match = max(counts, key=itemgetter(0))
+            return match
+
+        return None
+
+    def match(self, start, bufstart):
+        size = self.index - start
+
+        if size == 0:
+            return 0
+
+        matchlen = 0
+        it = range(min(len(self.data) - bufstart, self.match_max))
+        for i in it:
+            if self.data[start + (i % size)] == self.data[bufstart + i]:
+                matchlen += 1
+            else:
+                break
+        return matchlen
+
+class NLZ10Window(SlidingWindow):
+    size = 4096
+
+    match_min = 3
+    match_max = 3 + 0xf
+
+class NLZ11Window(SlidingWindow):
+    size = 4096
+
+    match_min = 3
+    match_max = 0x111 + 0xFFFF
+
+class NOverlayWindow(NLZ10Window):
+    disp_min = 3
+
+def _compress(input, windowclass=NLZ10Window):
+    """Generates a stream of tokens. Either a byte (int) or a tuple of (count,
+    displacement)."""
+
+    window = windowclass(input)
+
+    i = 0
+    while True:
+        if len(input) <= i:
+            break
+        match = window.search()
+        if match:
+            yield match
+            #if match[1] == -283:
+            #    raise Exception(match, i)
+            window.advance(match[0])
+            i += match[0]
+        else:
+            yield input[i]
+            window.next()
+            i += 1
+
+def packflags(flags):
+    n = 0
+    for i in range(8):
+        n <<= 1
+        try:
+            if flags[i]:
+                n |= 1
+        except IndexError:
+            pass
+    return n
+
+def chunkit(it, n):
+    buf = []
+    for x in it:
+        buf.append(x)
+        if n <= len(buf):
+            yield buf
+            buf = []
+    if buf:
+        yield buf
+
+def compress(input, out):
+    # header
+    out.write(pack("<L", (len(input) << 8) + 0x10))
+
+    # body
+    length = 0
+    for tokens in chunkit(_compress(input), 8):
+        flags = [type(t) == tuple for t in tokens]
+        out.write(pack(">B", packflags(flags)))
+
+        for t in tokens:
+            if type(t) == tuple:
+                count, disp = t
+                count -= 3
+                disp = (-disp) - 1
+                assert 0 <= disp < 4096
+                sh = (count << 12) | disp
+                out.write(pack(">H", sh))
+            else:
+                out.write(pack(">B", t))
+
+        length += 1
+        length += sum(2 if f else 1 for f in flags)
+
+    # padding
+    padding = 4 - (length % 4 or 4)
+    if padding:
+        out.write(b'\xff' * padding)
+
+def compress_nlz11(input, out):
+    # header
+    out.write(pack("<L", (len(input) << 8) + 0x11))
+
+    # body
+    length = 0
+    for tokens in chunkit(_compress(input, windowclass=NLZ11Window), 8):
+        flags = [type(t) == tuple for t in tokens]
+        out.write(pack(">B", packflags(flags)))
+        length += 1
+
+        for t in tokens:
+            if type(t) == tuple:
+                count, disp = t
+                disp = (-disp) - 1
+                #if disp == 282:
+                #    raise Exception
+                assert 0 <= disp <= 0xFFF
+                if count <= 1 + 0xF:
+                    count -= 1
+                    assert 2 <= count <= 0xF
+                    sh = (count << 12) | disp
+                    out.write(pack(">H", sh))
+                    length += 2
+                elif count <= 0x11 + 0xFF:
+                    count -= 0x11
+                    assert 0 <= count <= 0xFF
+                    b = count >> 4
+                    sh = ((count & 0xF) << 12) | disp
+                    out.write(pack(">BH", b, sh))
+                    length += 3
+                elif count <= 0x111 + 0xFFFF:
+                    count -= 0x111
+                    assert 0 <= count <= 0xFFFF
+                    l = (1 << 28) | (count << 12) | disp
+                    out.write(pack(">L", l))
+                    length += 4
+                else:
+                    raise ValueError(count)
+            else:
+                out.write(pack(">B", t))
+                length += 1
+
+    # padding
+    padding = 4 - (length % 4 or 4)
+    if padding:
+        out.write(b'\xff' * padding)
+
+def dump_compress_nlz11(input, out):
+    # body
+    length = 0
+    def dump():
+        for t in _compress(input, windowclass=NLZ11Window):
+            if type(t) == tuple:
+                yield t
+    from pprint import pprint
+    pprint(list(dump()))
+
+if __name__ == '__main__':
+    from sys import stdout, argv
+    data = open(argv[1], "rb").read()
+    stdout = stdout.detach()
+    #compress(data, stdout)
+    compress_nlz11(data, stdout)
+
+    #dump_compress_nlz11(data, stdout)

tools/banner/create.py

@@ -0,0 +1,163 @@
+from PIL import Image, ImageDraw
+from io import BytesIO
+from compress import compress_nlz11
+from struct import pack
+import sys
+
+longtitle=sys.argv[1]
+shortitle=sys.argv[2]
+publisher=sys.argv[3]
+
+# fixed variables; not likely these will be used in this context, but here just in case.
+visibility    =1
+autoBoot      =0
+use3D         =1
+requireEULA   =0
+autoSaveOnExit=0
+extendedBanner=0
+gameRatings   =0
+useSaveData   =1
+recordAppUsage=0
+disableSaveBU =0
+
+def make_icon(file, size):
+    f=open(file,'rb')
+    image=Image.open(f)
+    posit=open('map' + str(size) + 'x' + str(size) + '.bin','rb')
+
+    w=image.size[0]
+    h=image.size[1]
+    n=w*w
+    i=[0]*(n*2)
+
+    if w != h:
+        print("width, height unequal")
+        f.close()
+        sys.exit(1)
+    if w != size:
+        print("sides need to be " + str(size) + " pixels")
+        f.close()
+        sys.exit(1)
+
+    dump=list(image.getdata())
+
+
+    pos=0
+
+    for x in range(n):
+        p1=ord(posit.read(1))  
+        p2=ord(posit.read(1))
+        pos=p1+(p2<<8)
+
+        r=dump[x][0]>>3
+        g=dump[x][1]>>2
+        b=dump[x][2]>>3
+
+        i[pos<<1]=(g&7)<<5| b
+        i[(pos<<1)+1]=(r)<<3 | g>>3
+
+    f.close()
+    posit.close()
+    return bytearray(i)
+
+def make_banner(file):
+    f=open(file,'rb')
+    image=Image.open(f)
+    if image.size[0] != 256 or image.size[1] != 128:
+	    f.close()
+	    print("ERROR: Image must be exactly 256 x 128. Abort.")
+	    sys.exit(4)
+
+    hdr=open("header.bin","rb")
+
+    posit=open('map256x128.bin','rb')
+    n=256*128
+    i=[0]*(n*2)
+    cbmdhdr=bytearray(b"\x43\x42\x4D\x44\x00\x00\x00\x00\x88"+(b"\x00"*0x7B))
+
+    dump=list(image.getdata())
+    pos=0
+
+    for x in range(n):
+        p1=ord(posit.read(1))  
+        p2=ord(posit.read(1))
+        pos=p1+(p2<<8)
+
+        r=dump[x][0]>>4
+        g=dump[x][1]>>4
+        b=dump[x][2]>>4
+        a=dump[x][3]>>4
+
+        i[pos<<1]= (b<<4) | a
+        i[(pos<<1)+1]= (r<<4) | g
+
+
+    buf=hdr.read()
+    hdr.close()
+
+    out = BytesIO()
+    compress_nlz11(buf+bytearray(i), out)
+    l=bytearray(out.getvalue())
+    length=len(l)+136
+
+    pad=16-(length%16)
+    l+=bytearray([0]*pad)
+    length+=pad
+
+    for c in range(4):
+	    cbmdhdr+=pack("B", length & 255)
+	    length=length>>8
+
+    cbmdhdr+=l
+
+    f.close()
+    posit.close()
+    return bytearray(cbmdhdr)
+  
+def make_audio():
+    # TODO: Convert WAV file.
+    bcwav1=open("audio.bcwav","rb")
+    bcwav=bcwav1.read()
+    bcwav1.close()
+    return bytearray(bcwav)
+
+ctp1=make_icon(sys.argv[4], 24)
+ctp2=make_icon(sys.argv[5], 48)
+bcwav=make_audio()
+cbmd=make_banner(sys.argv[6])
+
+icn=open(sys.argv[7],"wb")
+bnr=open(sys.argv[8],"wb")
+
+header=bytearray(b"\x53\x4D\x44\x48\x00\x00\x00\x00")+bytearray(b"\x00"*0x1FF8)+bytearray(b"\x00\x00\x00\x00\x00\x00\x00\x00\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x00\x00\x00\x00\xFF\xFF\xFF\x7F\x31\x48\x62\x64\x99\x99\x99\x19\x91\x18\x62\x64\xA5\x01\x00\x00\x00\x01\x00\x00\x00\x00\x80\x3F\x32\x41\x79\x24\x00\x00\x00\x00\x00\x00\x00\x00")
+
+header[0x2028]=(visibility | autoBoot<<1 | use3D<<2 | requireEULA<<3 | autoSaveOnExit<<4 | extendedBanner<<5 | gameRatings<<6 | useSaveData<<7)
+header[0x2029]=(recordAppUsage | disableSaveBU<<2)
+
+offset=8
+pos=0
+
+for x in range(11):
+        for c in longtitle:
+            header[offset+pos*2]=ord(longtitle[pos])
+            pos+=1
+        pos=0
+        offset+=0x80
+        for c in shortitle:
+            header[offset+pos*2]=ord(shortitle[pos])
+            pos+=1
+        pos=0
+        offset+=0x100
+        for c in publisher:
+            header[offset+pos*2]=ord(publisher[pos])
+            pos+=1
+        pos=0
+        offset+=0x80
+
+header+=(ctp1+ctp2)
+
+icn.write(header)
+bnr.write(cbmd+bcwav)
+
+bnr.close()
+icn.close()