added touch input

Author: NotImplementedLife

FSPDS.cbp

@@ -33,7 +33,7 @@
 			<Add option="-Wall" />
 		</Compiler>
 		<ExtraCommands>
-			<Add after='cmd /c copy  &quot;FSPDS.nds&quot; &quot;D:\Archive\Files\Nintendo\NDS\flash\R4wood\FSPDS.nds&quot;' />
+			<Add after='cmd /c copy  &quot;FSPDS.nds&quot; &quot;C:\DeSmuMe\R4wood\FSPDS.nds&quot;' />
 		</ExtraCommands>
 		<Unit filename="Makefile" />
 		<Unit filename="arm7/Makefile" />
@@ -50,10 +50,8 @@
 		<Unit filename="arm9/source/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="include/common.h" />
 		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
 			<lib_finder disable_auto="1" />
 		</Extensions>
 	</Project>

arm7/Makefile

@@ -17,7 +17,7 @@ include $(DEVKITARM)/ds_rules
 TARGET		:=	FSPDS
 BUILD		:=	build
 SOURCES		:=	source
-INCLUDES	:=	include
+INCLUDES	:=	include ../include
 
 #---------------------------------------------------------------------------------
 # options for code generation

arm7/source/main.c

@@ -1,11 +1,83 @@
+/*---------------------------------------------------------------------------------
+
+	default ARM7 core
+
+		Copyright (C) 2005 - 2010
+		Michael Noland (joat)
+		Jason Rogers (dovoto)
+		Dave Murphy (WinterMute)
+
+	This software is provided 'as-is', without any express or implied
+	warranty.  In no event will the authors be held liable for any
+	damages arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any
+	purpose, including commercial applications, and to alter it and
+	redistribute it freely, subject to the following restrictions:
+
+	1.	The origin of this software must not be misrepresented; you
+		must not claim that you wrote the original software. If you use
+		this software in a product, an acknowledgment in the product
+		documentation would be appreciated but is not required.
+
+	2.	Altered source versions must be plainly marked as such, and
+		must not be misrepresented as being the original software.
+
+	3.	This notice may not be removed or altered from any source
+		distribution.
+
+---------------------------------------------------------------------------------*/
+/// To process touch input and (hopefully) sound
 #include <nds.h>
+#include <maxmod7.h>
+
+void VblankHandler(void) { }
+
+void VcountHandler() {
+	inputGetAndSend();
+}
+
+volatile bool exitflag = false;
 
-int main(int argc, char **argv)
-{
-	while(1)
-    {
+void powerButtonCB() {
+	exitflag = true;
+}
+
+int main() {
+	// clear sound registers
+	dmaFillWords(0, (void*)0x04000400, 0x100);
+
+	REG_SOUNDCNT |= SOUND_ENABLE;
+	writePowerManagement(PM_CONTROL_REG, ( readPowerManagement(PM_CONTROL_REG) & ~PM_SOUND_MUTE ) | PM_SOUND_AMP );
+	powerOn(POWER_SOUND);
+
+	readUserSettings();
+	ledBlink(0);
+
+	irqInit();
+	// Start the RTC tracking IRQ
+	initClockIRQ();
+	fifoInit();
+	touchInit();
+
+	SetYtrigger(80);
+
+	installSoundFIFO();
+
+	installSystemFIFO();
+
+	irqSet(IRQ_VCOUNT, VcountHandler);
+	irqSet(IRQ_VBLANK, VblankHandler);
+
+	irqEnable( IRQ_VBLANK | IRQ_VCOUNT | IRQ_NETWORK);
+
+	setPowerButtonCB(powerButtonCB);
+
+	while (!exitflag) {
+		if ( 0 == (REG_KEYINPUT & (KEY_SELECT | KEY_START | KEY_L | KEY_R))) {
+			exitflag = true;
+		}
 		swiWaitForVBlank();
 	}
 	return 0;
 }
-

arm9/Makefile

@@ -17,7 +17,7 @@ TARGET :=	FSPDS
 #---------------------------------------------------------------------------------
 BUILD		:=	build
 SOURCES		:=	source
-INCLUDES	:=	include
+INCLUDES	:=	include ../include
 DATA		:=
 
 #---------------------------------------------------------------------------------

arm9/include/tabsystem.h

@@ -12,6 +12,7 @@ struct ConsoleTab
     void (*loadingProc)();
     void (*drawingProc)();
     void (*keyDownProc)(uint32);
+    void (*touchRdProc)();
     void (*leavingProc)();
 };
 
@@ -103,26 +104,38 @@ void PlayTabDrawing()
     iprintf(PlayerState ? PlayButton : PauseButton);
 }
 
+void PlayTabPlayButtonPressed()
+{
+    s16 index=7*CurrentPage+PageSelection;
+    if(PlayerLoadedFileIndex!=index)
+    {
+        c_goto(18,10);
+        iprintf("Loading...");
+        ppm_loadAnimationData();
+        c_goto(18,10);
+        iprintf("          ");
+        PlayerLoadedFileIndex=index;
+    }
+    PlayerState=1-PlayerState;
+    iprintf(PlayerState ? PlayButton : PauseButton);
+    PlayerThumbnailNeedsRedraw=true;
+}
+
 void PlayTabKeyDown(uint32 input)
 {
     if(input & KEY_A)
     {
-        s16 index=7*CurrentPage+PageSelection;
-        if(PlayerLoadedFileIndex!=index)
-        {
-            c_goto(18,10);
-            iprintf("Loading...");
-            ppm_loadAnimationData();
-            c_goto(18,10);
-            iprintf("          ");
-            PlayerLoadedFileIndex=index;
-        }
-        PlayerState=1-PlayerState;
-        iprintf(PlayerState ? PlayButton : PauseButton);
-        PlayerThumbnailNeedsRedraw=true;
+        PlayTabPlayButtonPressed();
     }
 }
 
+void PlayTabRdTouch()
+{
+    if(104<=touch.px && touch.px<152 && 72<=touch.py && touch.py<120)
+        PlayTabPlayButtonPressed();
+
+}
+
 void PlayTabLeaving()
 {
     PlayerState=PAUSED;
@@ -141,20 +154,23 @@ void initTabs()
     FilesTab.loadingProc=TabNoAction;
     FilesTab.drawingProc=FilesTabDrawing;
     FilesTab.keyDownProc=FilesTabKeyDown;
+    FilesTab.touchRdProc=TabNoAction;
     FilesTab.leavingProc=TabNoAction;
     FilesTab.left=&PlayTab;
     FilesTab.right=&InfoTab;
 
     InfoTab.loadingProc=InfoTabLoading;
     InfoTab.drawingProc=InfoTabDrawing;
     InfoTab.keyDownProc=TabNoAction;
+    InfoTab.touchRdProc=TabNoAction;
     InfoTab.leavingProc=TabNoAction;
     InfoTab.left=&FilesTab;
     InfoTab.right=&PlayTab;
 
     PlayTab.loadingProc=PlayTabLoading;
     PlayTab.drawingProc=PlayTabDrawing;
     PlayTab.keyDownProc=PlayTabKeyDown;
+    PlayTab.touchRdProc=PlayTabRdTouch;
     PlayTab.leavingProc=PlayTabLeaving;
     PlayTab.left=&InfoTab;
     PlayTab.right=&FilesTab;

arm9/include/vars.h

@@ -1,8 +1,11 @@
 #ifndef FSPDS_VARS_H_INCLUDED
 #define FSPDS_VARS_H_INCLUDED
 
+#include <nds.h>
 /// Filesystem variables
 
+touchPosition touch;
+
 #define MAXFILESCOUNT 1024
 int filescount=0;
 char files[MAXFILESCOUNT][29];

arm9/source/main.c

@@ -49,6 +49,11 @@ int main(int argc, char ** argv)
             CurrentTab->loadingProc();
             CurrentTab->drawingProc();
         }
+        else if (input & KEY_TOUCH)
+        {
+            touchRead(&touch);
+            CurrentTab->touchRdProc();
+        }
         else
         {
             CurrentTab->keyDownProc(input);