Add fwTool

Makefile

@@ -0,0 +1,37 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+include $(DEVKITARM)/ds_rules
+
+export TARGET		:=	fwTool
+export TOPDIR		:=	$(CURDIR)
+
+
+.PHONY: arm7/$(TARGET).elf arm9/$(TARGET).elf
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all: $(TARGET).nds
+
+#---------------------------------------------------------------------------------
+$(TARGET).nds	:	arm7/$(TARGET).elf arm9/$(TARGET).elf
+	ndstool	-c $(TARGET).nds -b fwTool.bmp "Nintendo DS firmware tool;version 1.4" -7 arm7/$(TARGET).elf -9 arm9/$(TARGET).elf
+
+#---------------------------------------------------------------------------------
+arm7/$(TARGET).elf:
+	$(MAKE) -C arm7
+	
+#---------------------------------------------------------------------------------
+arm9/$(TARGET).elf:
+	$(MAKE) -C arm9
+
+#---------------------------------------------------------------------------------
+clean:
+	$(MAKE) -C arm9 clean
+	$(MAKE) -C arm7 clean
+	rm -f $(TARGET).nds $(TARGET).arm7 $(TARGET).arm9

arm7/Makefile

@@ -0,0 +1,126 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+include $(DEVKITARM)/ds_rules
+
+#---------------------------------------------------------------------------------
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# INCLUDES is a list of directories containing extra header files
+# DATA is a list of directories containing binary files
+# all directories are relative to this makefile
+#---------------------------------------------------------------------------------
+BUILD		:=	build
+SOURCES		:=	source  
+INCLUDES	:=	include build
+DATA		:=
+ 
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-mthumb -mthumb-interwork
+
+CFLAGS	:=	-g -Wall -O2\
+		-mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
+		-ffast-math \
+		$(ARCH)
+
+CFLAGS	+=	$(INCLUDE) -DARM7
+CXXFLAGS	:=	$(CFLAGS) -fno-rtti -fno-exceptions -fno-rtti
+
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=ds_arm7.specs -g $(ARCH) -Wl,-Map,$(notdir $*).map
+
+LIBS	:=	-ldswifi7 -lmm7 -lnds7
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=	$(LIBNDS)
+ 
+  
+#---------------------------------------------------------------------------------
+# 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 ARM7ELF	:=	$(CURDIR)/$(TARGET).elf
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir))
+ 
+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)/*.*)))
+ 
+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)
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+.PHONY: $(BUILD) clean
+ 
+#---------------------------------------------------------------------------------
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+ 
+#---------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) *.elf
+ 
+ 
+#---------------------------------------------------------------------------------
+else
+ 
+DEPENDS	:=	$(OFILES:.o=.d)
+ 
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+$(ARM7ELF)	:	$(OFILES)
+	@echo linking $(notdir $@)
+	@$(LD)  $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data 
+#---------------------------------------------------------------------------------
+%.bin.o	:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+-include $(DEPENDS)
+ 
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------

arm7/source/main.c

@@ -0,0 +1,115 @@
+#include <nds.h>
+
+#include <nds.h>
+#include <dswifi7.h>
+#include <maxmod7.h>
+
+//---------------------------------------------------------------------------------
+void VblankHandler(void) {
+//---------------------------------------------------------------------------------
+	Wifi_Update();
+}
+
+
+//---------------------------------------------------------------------------------
+void VcountHandler() {
+//---------------------------------------------------------------------------------
+	inputGetAndSend();
+}
+
+volatile bool exitflag = false;
+
+//---------------------------------------------------------------------------------
+void powerButtonCB() {
+//---------------------------------------------------------------------------------
+	exitflag = true;
+}
+
+static u8 readwriteSPI(u8 data) {
+	REG_SPIDATA = data;
+	SerialWaitBusy();
+	return REG_SPIDATA;
+}
+
+void readBios(u8 *buffer);
+
+//---------------------------------------------------------------------------------
+void dumpBios() {
+//---------------------------------------------------------------------------------
+
+	while(!fifoCheckValue32(FIFO_USER_01)) {
+		swiIntrWait(1,IRQ_FIFO_NOT_EMPTY);
+	}
+
+
+	u8 *dumped_bios = (u8 *)fifoGetValue32(FIFO_USER_01);
+
+	readBios(dumped_bios);
+
+	fifoSendValue32(FIFO_USER_01,0);
+
+}
+
+
+//---------------------------------------------------------------------------------
+int readJEDEC() {
+//---------------------------------------------------------------------------------
+	// read jedec id
+	int jedec = 0;
+	REG_SPICNT = SPI_ENABLE | SPI_BAUD_4MHz | SPI_DEVICE_NVRAM | SPI_CONTINUOUS;
+	readwriteSPI(SPI_EEPROM_RDID);
+	jedec = readwriteSPI(0);
+	jedec = ( jedec << 8 ) + readwriteSPI(0);
+	jedec = ( jedec << 8 ) + readwriteSPI(0);
+	
+	REG_SPICNT = 0;
+
+	return jedec;
+
+}
+
+//---------------------------------------------------------------------------------
+int main() {
+//---------------------------------------------------------------------------------
+	readUserSettings();
+
+	irqInit();
+	// Start the RTC tracking IRQ
+	initClockIRQ();
+	fifoInit();
+
+	mmInstall(FIFO_MAXMOD);
+
+	SetYtrigger(80);
+
+	installWifiFIFO();
+	installSoundFIFO();
+
+	installSystemFIFO();
+
+	irqSet(IRQ_VCOUNT, VcountHandler);
+	irqSet(IRQ_VBLANK, VblankHandler);
+
+	irqEnable( IRQ_VBLANK | IRQ_VCOUNT | IRQ_NETWORK);
+	
+	setPowerButtonCB(powerButtonCB);   
+
+	// Keep the ARM7 mostly idle
+	while (!exitflag) {
+
+		swiIntrWait(1,IRQ_FIFO_NOT_EMPTY);
+
+		if (fifoCheckValue32(FIFO_USER_01)) {
+
+			int command = fifoGetValue32(FIFO_USER_01);
+
+			if (command == 1) fifoSendValue32(FIFO_USER_01,readJEDEC());
+			if (command == 2) dumpBios();
+		}
+
+		if ( 0 == (REG_KEYINPUT & (KEY_SELECT | KEY_START | KEY_L | KEY_R))) {
+			exitflag = true;
+		}
+	}
+	return 0;
+}

arm7/source/readBIOS.s

@@ -0,0 +1,43 @@
+
+
+@---------------------------------------------------------------------------------
+@ http://problemkaputt.de/gbatek.htm#dsmemorycontrolbios
+@---------------------------------------------------------------------------------
+@ 05ECh  ldrb r3,[r3,12h]      ;requires incoming r3=src-12h
+@ 05EEh  pop  r2,r4,r6,r7,r15  ;requires dummy values & THUMB retadr on stack
+@---------------------------------------------------------------------------------
+@ after dumping found a better instruction sequence
+@---------------------------------------------------------------------------------
+@ 0x1664 : ldr r1, [r1] ; str r1, [r0] ; bx lr
+@---------------------------------------------------------------------------------
+	.arch	armv4t
+	.cpu	arm7tdmi
+
+
+	.text
+	.global readBios
+@---------------------------------------------------------------------------------
+	.arm
+	.align	4
+	.type	readBios STT_FUNC
+@---------------------------------------------------------------------------------
+readBios:
+@---------------------------------------------------------------------------------
+	push	{lr}
+	mov	r2, #0
+	adr	lr, ret
+	mov	r11, r11
+readLoop:
+	mov	r1, r2
+	ldr	r3, =0x1665
+	bx	r3
+ret:
+	add	r0, r0, #4
+	add	r2, r2, #4
+	cmp	r2, #0x4000
+	bne	readLoop
+
+	pop	{lr}
+	bx	lr
+
+

arm9/Makefile

@@ -0,0 +1,127 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
+
+include $(DEVKITARM)/ds_rules
+
+#---------------------------------------------------------------------------------
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# INCLUDES is a list of directories containing extra header files
+# DATA is a list of directories containing binary files
+# all directories are relative to this makefile
+#---------------------------------------------------------------------------------
+BUILD		:=	build
+SOURCES		:=	source  
+INCLUDES	:=	include
+DATA		:=
+
+
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-mthumb -mthumb-interwork
+
+CFLAGS	:=	-g -Wall -O2\
+ 			-march=armv5te -mtune=arm946e-s -fomit-frame-pointer\
+			-ffast-math \
+			$(ARCH)
+
+CFLAGS	+=	$(INCLUDE) -DARM9
+CXXFLAGS	:=	$(CFLAGS) -fno-rtti -fno-exceptions
+
+ASFLAGS	:=	-g $(ARCH) -march=armv5te -mtune=arm946e-s
+
+LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
+
+#---------------------------------------------------------------------------------
+# any extra libraries we wish to link with the project
+#---------------------------------------------------------------------------------
+LIBS	:=	-lfat -lnds9
+ 
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=	$(LIBNDS)
+ 
+#---------------------------------------------------------------------------------
+# 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 ARM9ELF	:=	$(CURDIR)/$(TARGET).elf
+export DEPSDIR := $(CURDIR)/$(BUILD)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+ 
+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)
+ 
+.PHONY: $(BUILD) clean
+ 
+#---------------------------------------------------------------------------------
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+ 
+#---------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) *.elf *.nds* *.bin 
+ 
+ 
+#---------------------------------------------------------------------------------
+else
+ 
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+$(ARM9ELF)	:	$(OFILES)
+	@echo linking $(notdir $@)
+	@$(LD)  $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data 
+#---------------------------------------------------------------------------------
+%.bin.o	:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+-include $(DEPSDIR)/*.d
+ 
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------

arm9/source/main.cpp

@@ -0,0 +1,237 @@
+#include <nds.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <fat.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#define MAX_SIZE	(1*1024*1024)
+
+int menuTop = 8, statusTop = 15;
+
+//---------------------------------------------------------------------------------
+void fifoWaitValue32(int channel) {
+//---------------------------------------------------------------------------------
+
+	while(!fifoCheckValue32(FIFO_USER_01)) {
+		swiIntrWait(1,IRQ_FIFO_NOT_EMPTY);
+	}
+
+}
+
+//---------------------------------------------------------------------------------
+int saveToFile(const char *filename, u8 *buffer, size_t size) {
+//---------------------------------------------------------------------------------
+	FILE *f = fopen(filename, "wb");
+	if (NULL==f) return -1;
+	size_t written = fwrite(buffer, 1, size, f);
+	fclose(f);
+	if (written != size) return -2;
+	return 0;
+}
+
+//---------------------------------------------------------------------------------
+int readJEDEC() {
+//---------------------------------------------------------------------------------
+
+	fifoSendValue32(FIFO_USER_01, 1);
+
+	fifoWaitValue32(FIFO_USER_01);
+
+	return  fifoGetValue32(FIFO_USER_01);
+}
+
+struct menuItem {
+	const char* name;
+	fp function;
+};
+
+u8 *firmware_buffer;
+size_t userSettingsOffset, fwSize, wifiOffset, wifiSize;
+
+//---------------------------------------------------------------------------------
+void clearStatus() {
+//---------------------------------------------------------------------------------
+	iprintf("\x1b[%d;0H\x1b[J\x1b[15;0H",statusTop);
+}
+
+//---------------------------------------------------------------------------------
+void dummy() {
+//---------------------------------------------------------------------------------
+	clearStatus();
+	iprintf("\x1b[%d;6HNOT IMPLEMENTED!",statusTop+3);
+}
+
+char dirname[15] = "FW";
+
+//---------------------------------------------------------------------------------
+void backupFirmware() {
+//---------------------------------------------------------------------------------
+
+	clearStatus();
+
+	readFirmware(0, firmware_buffer, fwSize);
+
+	if (saveToFile("firmware.bin", firmware_buffer, fwSize) < 0) {
+		iprintf("Error saving firmware!\n");
+	} else {
+		iprintf("Firmware saved as\n\n%s/firmware.bin", dirname );
+	}
+}
+
+//---------------------------------------------------------------------------------
+void backupBIOS() {
+//---------------------------------------------------------------------------------
+	clearStatus();
+
+	if (saveToFile("bios9.bin", (u8*)0xffff0000, 0x8000 ) < 0) {
+		iprintf("Error saving arm9 bios\n");
+		return;
+	}
+
+	fifoSendValue32(FIFO_USER_01, 2);
+	fifoSendValue32(FIFO_USER_01, (u32)firmware_buffer);
+
+	fifoWaitValue32(FIFO_USER_01);
+
+	fifoGetValue32(FIFO_USER_01);
+
+	if (saveToFile("bios7.bin", firmware_buffer, 0x4000) < 0 ) {
+		iprintf("Error saving arm7 bios\n");
+		return;
+	}
+
+	iprintf("BIOS saved as\n\n%1$s/bios9.bin\n%1$s/bios7.bin", dirname );
+
+}
+
+//---------------------------------------------------------------------------------
+void backupSettings() {
+//---------------------------------------------------------------------------------
+
+	clearStatus();
+
+	readFirmware(userSettingsOffset, firmware_buffer + userSettingsOffset, 512);
+
+	if (saveToFile("UserSettings.bin", firmware_buffer + userSettingsOffset, 512) < 0) {
+		iprintf("Error saving settings1!\n");
+	} else {
+		iprintf("User settings saved as\n\n%s/UserSettings.bin", dirname );
+	}
+}
+
+//---------------------------------------------------------------------------------
+void backupWifi() {
+//---------------------------------------------------------------------------------
+
+	clearStatus();
+
+	readFirmware(wifiOffset, firmware_buffer + wifiOffset, wifiSize);
+
+	if (saveToFile("WifiSettings.bin", firmware_buffer + wifiOffset, wifiSize) < 0) {
+		iprintf("Error saving Wifi settings!\n");
+	} else {
+		iprintf("Wifi settings saved as\n\n%s/WifiSettings.bin", dirname );
+	}
+}
+
+
+bool quitting = false;
+
+//---------------------------------------------------------------------------------
+void quit() {
+//---------------------------------------------------------------------------------
+	quitting = true;
+}
+
+struct menuItem mainMenu[] = {
+	{ "Backup Firmware", backupFirmware } ,
+	{ "Dump Bios", backupBIOS } ,
+	{ "Backup User Settings", backupSettings } ,
+	{ "Backup Wifi Settings", backupWifi } ,
+/*
+	TODO
+
+	{ "Restore Firmware", dummy } ,
+	{ "Restore User Settings", dummy } ,
+	{ "Restore Wifi Settings", dummy } ,
+*/	{ "Exit", quit }
+};
+
+void showMenu(menuItem menu[], int count) {
+	int i;
+	for (i=0; i<count; i++ ) {
+		iprintf("\x1b[%d;5H%s", i + menuTop, menu[i].name); 
+	}
+}
+
+
+//---------------------------------------------------------------------------------
+int main() {
+//---------------------------------------------------------------------------------
+
+	consoleDemoInit();
+	
+	if (!fatInitDefault()) {
+		printf("FAT init failed!\n");
+	} else {
+
+		iprintf("Nintendo DS firmware tool 1.4\n");
+
+		firmware_buffer = (u8 *)memalign(32,MAX_SIZE);
+
+		readFirmware(0, firmware_buffer, 512);
+
+		iprintf("\x1b[3;0HMAC ");
+		for (int i=0; i<6; i++) {
+			printf("%02X", firmware_buffer[0x36+i]);
+			sprintf(&dirname[2+(2*i)],"%02X",firmware_buffer[0x36+i]);
+			if (i < 5) printf(":");
+		}
+		
+		dirname[14] = 0;
+		
+		mkdir(dirname, 0777);
+		chdir(dirname);
+
+		userSettingsOffset = (firmware_buffer[32] + (firmware_buffer[33] << 8)) *8;
+
+		fwSize = userSettingsOffset + 512;
+
+		iprintf("\n%dK firmware\njedec id %X", fwSize/1024,readJEDEC());
+
+		wifiOffset = userSettingsOffset - 1024;
+		wifiSize = 1024;
+	
+		if ( firmware_buffer[29] == 0x57 ) {
+			wifiOffset -= 1536;
+			wifiSize += 1536;
+		}
+
+		fwSize -= (wifiSize + 512);
+
+		int count = sizeof(mainMenu) / sizeof(menuItem);
+
+		showMenu(mainMenu, count);
+
+		int selected = 0;
+		quitting = false;
+
+		while(!quitting) {
+				iprintf("\x1b[%d;3H]\x1b[23C[",selected + menuTop);
+				swiWaitForVBlank();
+				scanKeys();
+				int keys = keysDownRepeat();
+				iprintf("\x1b[%d;3H \x1b[23C ",selected + menuTop);
+				if ( (keys & KEY_UP)) selected--;
+				if (selected < 0)	selected = count - 1;
+				if ( (keys & KEY_DOWN)) selected++;
+				if (selected == count)	selected = 0;
+				if ( keys & KEY_A ) mainMenu[selected].function();
+		}
+	}
+
+	return 0;
+}