Project modified so that seperate ARM7 and ARM9 bits can be compiled. Intended for wifi access.

3 files changed, 312 insertions, 0 deletions

diff --git a/arm7/.cvsignore b/arm7/.cvsignore
new file mode 100644
index 0000000..970db45
--- /dev/null
+++ b/arm7/.cvsignore
@@ -0,0 +1,2 @@
+build
+ds81.arm7.elf
\ No newline at end of file
diff --git a/arm7/Makefile b/arm7/Makefile
new file mode 100644
index 0000000..c4ede78
--- /dev/null
+++ b/arm7/Makefile
@@ -0,0 +1,132 @@
+#---------------------------------------------------------------------------------
+.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-interwork
+
+CFLAGS	:=	-g -Wall -O2\
+		-mcpu=arm7tdmi -mtune=arm7tdmi -fomit-frame-pointer\
+		-ffast-math \
+		$(ARCH)
+
+CFLAGS	+=	$(INCLUDE) -DARM7
+CXXFLAGS	:=	$(CFLAGS)
+
+
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=ds_arm7.specs -g $(ARCH) -mno-fpu -Wl,-Map,$(notdir $*).map
+
+LIBS	:= -lnds7 -ldswifi7
+
+#---------------------------------------------------------------------------------
+# 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 ARM7BIN	:=	$(TOPDIR)/$(TARGET).arm7
+export ARM7ELF	:=	$(CURDIR)/$(TARGET).arm7.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
+#---------------------------------------------------------------------------------
+$(ARM7BIN)	:	$(ARM7ELF)
+	@$(OBJCOPY) -O binary $< $@
+	@echo built ... $(notdir $@)
+
+
+$(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
+#---------------------------------------------------------------------------------------
diff --git a/arm7/source/main.c b/arm7/source/main.c
new file mode 100644
index 0000000..34aef8f
--- /dev/null
+++ b/arm7/source/main.c
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------
+	$Id$
+
+	Simple ARM7 stub (sends RTC, TSC, and X/Y data to the ARM 9)
+
+	$Log$
+	Revision 1.2  2005/09/07 20:06:06  wntrmute
+	updated for latest libnds changes
+	
+	Revision 1.8  2005/08/03 05:13:16  wntrmute
+	corrected sound code
+
+
+---------------------------------------------------------------------------------*/
+#include <nds.h>
+
+#include <nds/bios.h>
+#include <nds/arm7/touch.h>
+#include <nds/arm7/clock.h>
+
+#include <dswifi7.h>
+
+
+//---------------------------------------------------------------------------------
+void startSound(int sampleRate, const void* data, u32 bytes, u8 channel, u8 vol,  u8 pan, u8 format) {
+//---------------------------------------------------------------------------------
+	SCHANNEL_TIMER(channel)  = SOUND_FREQ(sampleRate);
+	SCHANNEL_SOURCE(channel) = (u32)data;
+	SCHANNEL_LENGTH(channel) = bytes >> 2 ;
+	SCHANNEL_CR(channel)     = SCHANNEL_ENABLE | SOUND_ONE_SHOT | SOUND_VOL(vol) | SOUND_PAN(pan) | (format==1?SOUND_8BIT:SOUND_16BIT);
+}
+
+
+//---------------------------------------------------------------------------------
+s32 getFreeSoundChannel() {
+//---------------------------------------------------------------------------------
+	int i;
+	for (i=0; i<16; i++) {
+		if ( (SCHANNEL_CR(i) & SCHANNEL_ENABLE) == 0 ) return i;
+	}
+	return -1;
+}
+
+//---------------------------------------------------------------------------------
+void VblankHandler(void) {
+//---------------------------------------------------------------------------------
+	static int heartbeat = 0;
+
+	uint16 but=0, x=0, y=0, xpx=0, ypx=0, z1=0, z2=0, batt=0, aux=0;
+	int t1=0, t2=0;
+	uint32 temp=0;
+	uint8 ct[sizeof(IPC->curtime)];
+	u32 i;
+
+	// Update the heartbeat
+	heartbeat++;
+
+	// Read the touch screen
+
+	but = REG_KEYXY;
+
+	if (!(but & (1<<6))) {
+
+		touchPosition tempPos = touchReadXY();
+
+		x = tempPos.x;
+		y = tempPos.y;
+		xpx = tempPos.px;
+		ypx = tempPos.py;
+	}
+
+	z1 = touchRead(TSC_MEASURE_Z1);
+	z2 = touchRead(TSC_MEASURE_Z2);
+
+	
+	batt = touchRead(TSC_MEASURE_BATTERY);
+	aux  = touchRead(TSC_MEASURE_AUX);
+
+	// Read the time
+	rtcGetTime((uint8 *)ct);
+	BCDToInteger((uint8 *)&(ct[1]), 7);
+
+	// Read the temperature
+	temp = touchReadTemperature(&t1, &t2);
+
+	// Update the IPC struct
+	IPC->heartbeat	= heartbeat;
+	IPC->buttons		= but;
+	IPC->touchX			= x;
+	IPC->touchY			= y;
+	IPC->touchXpx		= xpx;
+	IPC->touchYpx		= ypx;
+	IPC->touchZ1		= z1;
+	IPC->touchZ2		= z2;
+	IPC->battery		= batt;
+	IPC->aux			= aux;
+
+	for(i=0; i<sizeof(ct); i++) {
+		IPC->curtime[i] = ct[i];
+	}
+
+	IPC->temperature = temp;
+	IPC->tdiode1 = t1;
+	IPC->tdiode2 = t2;
+
+
+	//sound code  :)
+	TransferSound *snd = IPC->soundData;
+	IPC->soundData = 0;
+
+	if (0 != snd) {
+
+		for (i=0; i<snd->count; i++) {
+			s32 chan = getFreeSoundChannel();
+
+			if (chan >= 0) {
+				startSound(snd->data[i].rate, snd->data[i].data, snd->data[i].len, chan, snd->data[i].vol, snd->data[i].pan, snd->data[i].format);
+			}
+		}
+	}
+
+	Wifi_Update(); // update wireless in vblank
+
+}
+
+// callback to allow wifi library to notify arm9
+void arm7_synctoarm9() { // send fifo message
+   REG_IPC_FIFO_TX = 0x87654321;
+}
+// interrupt handler to allow incoming notifications from arm9
+void arm7_fifo() { // check incoming fifo messages
+   u32 msg = REG_IPC_FIFO_RX;
+   if(msg==0x87654321) Wifi_Sync();
+}
+
+//---------------------------------------------------------------------------------
+int main(int argc, char ** argv) {
+//---------------------------------------------------------------------------------
+  REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_SEND_CLEAR; // enable & prepare fifo asap
+	// Reset the clock if needed
+	rtcReset();
+
+	//enable sound
+	powerON(POWER_SOUND);
+	SOUND_CR = SOUND_ENABLE | SOUND_VOL(0x7F);
+	IPC->soundData = 0;
+
+	irqInit();
+	irqSet(IRQ_VBLANK, VblankHandler);
+	irqEnable(IRQ_VBLANK);
+	
+	irqSet(IRQ_WIFI, Wifi_Interrupt); // set up wifi interrupt
+	irqEnable(IRQ_WIFI);
+
+{ // sync with arm9 and init wifi
+  	u32 fifo_temp;   
+
+	  while(1) { // wait for magic number
+    	while(REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
+      fifo_temp=REG_IPC_FIFO_RX;
+      if(fifo_temp==0x12345678) break;
+   	}
+   	while(REG_IPC_FIFO_CR&IPC_FIFO_RECV_EMPTY) swiWaitForVBlank();
+   	fifo_temp=REG_IPC_FIFO_RX; // give next value to wifi_init
+   	Wifi_Init(fifo_temp);
+   	
+   	irqSet(IRQ_FIFO_NOT_EMPTY,arm7_fifo); // set up fifo irq
+   	irqEnable(IRQ_FIFO_NOT_EMPTY);
+   	REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_RECV_IRQ;
+
+   	Wifi_SetSyncHandler(arm7_synctoarm9); // allow wifi lib to notify arm9
+  } // arm7 wifi init complete
+
+	// Keep the ARM7 out of main RAM
+	while (1) swiWaitForVBlank();
+}
+
+