Added long awaited CD-ROM library and loads of fixes, see changelog for details

13 files changed, 861 insertions, 13 deletions

diff --git a/examples/cdxa/ball16c.h b/examples/cdxa/ball16c.h
new file mode 100644
index 0000000..c79f273
--- /dev/null
+++ b/examples/cdxa/ball16c.h
@@ -0,0 +1,16 @@
+unsigned int ball16c_size=192;
+unsigned char ball16c[] = {
+0x10,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0xc0,0x03,0x10,
+0x01,0x10,0x00,0x01,0x00,0x00,0x00,0x31,0xc6,0x73,0xce,0x94,0xd2,0x07,0x9d,
+0xd6,0xda,0x38,0xe3,0xef,0xbd,0x9b,0xef,0x8c,0xb1,0xc6,0x98,0xde,0xfb,0x4a,
+0xa9,0xa4,0x90,0xad,0xb5,0x00,0x00,0x8c,0x00,0x00,0x00,0xc0,0x03,0x00,0x01,
+0x04,0x00,0x10,0x00,0x00,0x00,0x10,0x22,0x12,0x02,0x00,0x00,0x00,0x10,0x32,
+0x33,0x23,0x11,0x04,0x00,0x00,0x23,0x55,0x66,0x35,0x72,0x47,0x00,0x20,0x52,
+0x86,0x68,0x36,0x12,0x97,0x0a,0x20,0x65,0xbb,0x8b,0x36,0x12,0x91,0x04,0x31,
+0x85,0xbb,0x68,0x35,0x12,0x97,0xdc,0x32,0x86,0x8b,0x56,0x35,0x73,0x97,0xa4,
+0x32,0x66,0x68,0x55,0x23,0x71,0x9e,0xac,0x32,0x65,0x56,0x33,0x13,0x71,0xce,
+0xa4,0x21,0x33,0x33,0x23,0x11,0xe7,0xc9,0xd4,0x12,0x22,0x22,0x13,0x71,0xe7,
+0xc9,0xda,0x10,0x17,0x11,0x77,0x77,0x9e,0x4c,0x0d,0x40,0x77,0x71,0xe7,0x9e,
+0xc9,0xd4,0x0d,0x00,0x94,0x99,0x99,0xcc,0x4c,0xda,0x00,0x00,0xa0,0xc4,0xc4,
+0x44,0xda,0x0d,0x00,0x00,0x00,0xd0,0xaa,0xda,0x0d,0x00,0x00
+};
diff --git a/examples/cdxa/iso.xml b/examples/cdxa/iso.xml
new file mode 100644
index 0000000..840b414
--- /dev/null
+++ b/examples/cdxa/iso.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<iso_project image_name="cdxa.iso">
+
+	<track type="data">
+
+		<identifiers
+			system			="PLAYSTATION"
+			application		="PLAYSTATION"
+			volume			="PSN00BSDK"
+			volume_set		="PSN00BSDK"
+			publisher		="MEIDOTEK"
+		/>
+
+		<directory_tree>
+
+			<file name="system.cnf"	type="data" source="system.cnf"/>
+			<file name="cdxa.exe" type="data" source="cdxa.exe"/>
+			
+			<!-- CD-XA file, you'll have to provide your own to make this example work -->
+			<file name="xasample.xa" type="xa" source="D:\str-temp\subcon.xa"/>
+
+			<dummy sectors="1024"/>
+
+		</directory_tree>
+
+	</track>
+
+</iso_project>
diff --git a/examples/cdxa/main.c b/examples/cdxa/main.c
new file mode 100644
index 0000000..5d043eb
--- /dev/null
+++ b/examples/cdxa/main.c
@@ -0,0 +1,551 @@
+/* 
+ * LibPSn00b Example Programs
+ *
+ * CD-XA Audio Example
+ * 2019 Meido-Tek Productions / PSn00bSDK Project
+ *
+ * Demonstrates playback and looping of CD-XA audio using the
+ * new libpsxcd library.
+ *
+ *
+ * Since there is not yet an open source XA audio encoder yet, the
+ * only way to create XA audio data is by using the official tools.
+ * You will have to provide your own XA file to get this example
+ * to work.
+ *
+ * You will also need MKPSXISO (https://github.com/lameguy64/mkpsxiso)
+ * to build an ISO image with your XA audio data.
+ *
+ *
+ * Theory of operation:
+ *
+ * CD-XA playback is accomplished by first locating the XA file in
+ * the ISO9660 file system using CdSearchFile(). CD mode is then set
+ * using the CdlSetmode command with CdlModeSpeed, CdlModeRT and
+ * CdlModeSF flags to configure the CD controller for XA audio
+ * streaming. Trying to play XA audio without CdlModeSF, which
+ * enables filtering, will feed all XA channels to the SPU resulting
+ * in a stuttery cacophony of sounds.
+ *
+ * The XA channel for playback is selected using  the CdlSetfilter
+ * command and CdlFILTER struct. XA audio is usually comprised of
+ * multiple audio streams interleaved together and this command
+ * sets which channel to filter in from all the other channels.
+ * CdlModeSF enables the filtering feature and is required when
+ * playing back XA audio streams with multiple interleaved sound
+ * channels.
+ *
+ * Playback is initiated by issuing CdlReadS with the XA file's
+ * location specified as a parameter, which is internally issued
+ * to the CD controller as the seek target before CdlReadS is
+ * actually issued.
+ *
+ * Playback can be stopped by simply issuing CdlPause during playback.
+ * It is not recommended to use CdlStop as it will stop the disc spinning
+ * and result to much slower response once the disc has stopped.
+ *
+ * The most effective method of determining the end of an XA stream is
+ * by hooking a callback routine with CdReadyCallback(), which is
+ * triggered whenever a data sector has been read and checking the
+ * header of the received sector if it belongs to the channel currently
+ * being played.
+ *
+ * Additionally, XA audio data must be encoded with video sectors at
+ * the end of each XA stream to serve as a terminator marker which
+ * triggers CdReadyCallback() during playback. From within the callback
+ * a CdlReadS command with the location of the XA data can be issued again
+ * to repeat the track or CdlPause to stop playback.
+ *
+ *
+ * Tips:
+ *
+ *	- For best efficiency, it is recommended to have all XA tracks in
+ *    a single XA file have roughly the same length to one another,
+ *    otherwise tracks that end short will be padded with empty sectors
+ *	  which wastes potentially usable disc space.
+ *
+ *  - The CD filter can be changed during playback and the switchover is
+ *    completely seamless. Use this trick to accomplish dynamic music
+ *    effects that change seamlessly based on events during gameplay.
+ *
+ *	- With custom tools, it is possible to interleave data sectors with
+ *	  a single XA audio stream which would permit music playback during
+ *	  loading sessions (aside from using sequenced music). Alternatively,
+ *	  CdlReadN can be used to begin playback but with more reliable data
+ *	  reading. This is also how streaming FMV sequences are accomplished.
+ *
+ *
+ * Pros over CD audio:
+ *
+ *	- Does not require changing disc speed when switching between data
+ *	  access and audio playback.
+ *
+ *	- Permits switching between streams during playback without restart.
+ *
+ *	- Near 1:4 audio compression ratio.
+ *
+ *	- Data sectors can be interleaved alongside XA audio.
+ *
+ *
+ * Cons compared to CD audio:
+ *
+ *	- Skips more often on a poor condition disc or optical pick-up.
+ *
+ *	- Cannot be played with any CD player.
+ *
+ *	- Lower audio sample rate (37.8KHz whereas CD audio is 44.1KHz, not
+ *	  good for audiophools).
+ *
+ *
+ * Controls:
+ *
+ *	  Up/Down	- Select channel.
+ *	  Cross		- Play selected channel.
+ *	  Circle	- Stop selected channel.
+ *	  Right		- Switch channel (without restarting playback).
+ *
+ *
+ * Example by Lameguy64
+ *
+ *
+ * Changelog:
+ *
+ *	  November 22, 2019 - Initial version
+ *
+ */
+ 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <psxetc.h>
+#include <psxgte.h>
+#include <psxgpu.h>
+#include <psxapi.h>
+#include <psxpad.h>
+#include <psxsio.h>
+#include <psxspu.h>
+#include <psxcd.h>
+
+#include <malloc.h>
+#include "ball16c.h"
+
+
+#define MAX_BALLS	1536		/* Number of balls to display */
+
+#define OT_LEN 		8			/* Ordering table length */
+
+
+/* Screen coordinates */
+#define SCREEN_XRES	320
+#define SCREEN_YRES	240
+
+#define CENTER_X	SCREEN_XRES/2
+#define CENTER_Y	SCREEN_YRES/2
+
+
+/* Display and drawing environments */
+DISPENV disp[2];
+DRAWENV draw[2];
+
+char pribuff[2][65536];			/* Primitive packet buffers */
+unsigned int ot[2][OT_LEN];		/* Ordering tables */
+char *nextpri;					/* Pointer to next packet buffer offset */
+int db = 0;						/* Double buffer index */
+
+
+/* Ball struct and array */
+typedef struct BALL_TYPE
+{
+	short x,y;
+	short xdir,ydir;
+	unsigned char r,g,b,p;
+} BALL_TYPE;
+
+BALL_TYPE balls[MAX_BALLS];
+
+
+/* TIM image parameters for loading the ball texture and drawing sprites */
+TIM_IMAGE tim;
+
+
+/* XA audio handling stuff */
+volatile int num_loops=0;			/* Loop counter */
+volatile int xa_play_channel;		/* Currently playing channel number */
+CdlLOC xa_loc;						/* XA data start location
+
+
+/* Sector header structure for video sector terminator */
+typedef struct SECTOR_HEAD
+{
+	u_short	id;
+	u_short chan;
+	u_char	pad[28];
+} SECTOR_HEAD;
+
+
+/* Pad input buffer*/
+char padbuff[2][34];
+
+char xa_sector_buff[2048];
+
+/* Callback for detecting end of channel (hooked by CdReadyCallback) */
+void xa_callback(int intr, unsigned char *result)
+{
+	SECTOR_HEAD *sec;
+	
+	/* Only respond to data ready callbacks */
+	if (intr == CdlDataReady)
+	{
+		/* Fetch data sector */
+		CdGetSector((u_long*)&xa_sector_buff, 2048);
+		
+		/* Quirk: This CdGetSector() implementation must fetch 2048 bytes */
+		/* or more otherwise the following sectors will be read in an	  */
+		/* incorrect byte order, probably due to stray data in the data	  */
+		/* FIFO. Trying to flush remaining bytes in the FIFO through      */
+		/* memory reads after DMA transfer yields random deadlocking on   */
+		/* real hardware for some reason. CdGetSector() probably reads    */
+		/* the data FIFO in software rather than DMA transfer whereas 	  */
+		/* CdGetSector2() uses DMA transfer in the official SDK.		  */
+		
+		/* Check if sector belongs to the currently playing channel */
+		sec = (SECTOR_HEAD*)xa_sector_buff;
+		
+		if( sec->id == 352 )
+		{
+			// Debug
+			//printf("ID=%d CHAN=%d PL=%d\n", sec->id, (sec->chan>>10)&0xF, xa_play_channel);
+		
+			/* Check if sector is of the currently playing channel */
+			if( ((sec->chan>>10)&0xF) == xa_play_channel ) 
+			{
+				num_loops++;
+			
+				/* Retry playback by seeking to start of XA data and stream */
+				CdControlF(CdlReadS, (u_char*)&xa_loc);
+			
+				/* Stop playback */
+				//CdControlF(CdlPause, 0);
+			}
+		}
+	}
+}
+
+void init()
+{	
+	int i;
+	
+	/* Reset GPU (also installs event handler for VSync) */
+	printf("Init GPU... ");
+	ResetGraph( 0 );
+	printf("Done.\n");
+
+	
+	/* Uncomment to direct tty messages to serial */
+	AddSIO(115200);
+	
+	
+	/* Initialize SPU and CD-ROM */
+	printf("Initializing CD-ROM... ");
+	SpuInit();
+	CdInit(0);
+	printf("Done.\n");
+	
+	
+	/* Set display and draw environment parameters */
+	SetDefDispEnv(&disp[0], 0, 0, SCREEN_XRES, SCREEN_YRES);
+	SetDefDispEnv(&disp[1], 0, SCREEN_YRES, SCREEN_XRES, SCREEN_YRES);
+	
+	SetDefDrawEnv(&draw[0], 0, SCREEN_YRES, SCREEN_XRES, SCREEN_YRES);
+	SetDefDrawEnv(&draw[1], 0, 0, SCREEN_XRES, SCREEN_YRES);
+	
+	
+	/* Set clear color, area clear and dither processing */
+	setRGB0(&draw[0], 63, 0, 127);
+	draw[0].isbg = 1;
+	draw[0].dtd = 1;
+	setRGB0(&draw[1], 63, 0, 127);
+	draw[1].isbg = 1;
+	draw[1].dtd = 1;
+	
+	
+	/* Load and open font stream */
+	FntLoad(960, 0);
+	FntOpen(32, 32, 256, 176, 2, 200);
+	
+	
+	/* Upload the ball texture */
+	GetTimInfo((unsigned int*)ball16c, &tim); /* Get TIM parameters */
+	LoadImage(tim.prect, tim.paddr);		/* Upload texture to VRAM */
+	if( tim.mode & 0x8 )
+	{
+		LoadImage(tim.crect, tim.caddr);	/* Upload CLUT if present */
+	}
+	
+	
+	/* Calculate ball positions */
+	printf("Calculating balls... ");
+	
+	for(i=0; i<MAX_BALLS; i++)
+	{	
+		balls[i].x = (rand()%304);
+		balls[i].y = (rand()%224);
+		balls[i].xdir = 1-(rand()%3);
+		balls[i].ydir = 1-(rand()%3);
+		if( !balls[i].xdir )
+			balls[i].xdir = 1;
+		if( !balls[i].ydir )
+			balls[i].ydir = 1;
+		balls[i].xdir *= 2;
+		balls[i].ydir *= 2;
+		balls[i].r = (rand()%256);
+		balls[i].g = (rand()%256);
+		balls[i].b = (rand()%256);	
+	}
+	
+	printf("Done.\n");
+	
+	
+	/* Initialize pad */
+	InitPAD(padbuff[0], 34, padbuff[1], 34);
+	StartPAD();
+	ChangeClearPAD(0);
+	
+}
+
+
+int main(int argc, const char* argv[])
+{
+
+	SPRT *spr;
+	SPRT_16 *sprt;
+	DR_TPAGE *tpri;
+	PADTYPE *pad;
+
+	CdlFILE	file;
+	CdlFILTER filter;
+	
+	int i,counter=0;
+	int sel_channel=0;
+	int p_up=0,p_down=0,p_right=0,p_cross=0,p_circle=0;
+	
+	
+	/* Init graphics and stuff before doing anything else */
+	init();
+
+	/* Locate the XA file */
+	if( !CdSearchFile(&file, "\\XASAMPLE.XA") )
+	{
+		printf("Unable to find file.\n");
+		return 0;
+	}
+	else
+	{
+		int sec;
+		sec = CdPosToInt(&file.loc);
+		printf("XA located at sector %d size %d.\n", sec, file.size);
+	}
+	
+	/* Save file location as XA location */
+	xa_loc = file.loc;
+	
+	/* Hook XA callback function to CdReadyCallback (for auto stop/loop */
+	CdReadyCallback(xa_callback);
+
+	/* Set CD mode for XA streaming (2x speed, send XA to SPU, enable filter */
+	i = CdlModeSpeed|CdlModeRT|CdlModeSF;
+	CdControl(CdlSetmode, (u_char*)&i, 0);
+	
+	/* Set file 1 on filter for channels 0-7 */
+	filter.file = 1;
+		
+	/* Main loop */
+	printf("Entering loop...\n");
+	
+	while(1) {
+		
+		pad = ((PADTYPE*)padbuff[0]);
+
+		if( pad->stat == 0 )
+		{
+			if(( pad->type == 0x4 )||( pad->type == 0x5 )||( pad->type == 0x7 ))
+			{
+				/* Menu selection controls */
+				if( !(pad->btn&PAD_UP) )
+				{
+					if( !p_up )
+					{
+						if( sel_channel > 0 )
+						{
+							sel_channel--;
+						}
+						p_up = 1;
+					}
+				}
+				else
+				{
+					p_up = 0;
+				}
+				
+				if( !(pad->btn&PAD_DOWN) )
+				{
+					if( !p_down )
+					{
+						if( sel_channel < 7 )
+						{
+							sel_channel++;
+						}
+						p_down = 1;
+					}
+				}
+				else
+				{
+					p_down = 0;
+				}
+				
+				/* Play selected XA channel from start */
+				if( !(pad->btn&PAD_CROSS) )
+				{
+					if( !p_cross )
+					{
+						filter.chan = sel_channel;
+						CdControl(CdlSetfilter, (u_char*)&filter, 0);
+						CdControl(CdlReadS, (u_char*)&xa_loc, 0);
+						xa_play_channel = sel_channel;
+						p_cross = 1;
+					}
+				}
+				else
+				{
+					p_cross = 0;
+				}
+				
+				/* Stop playback */
+				if( !(pad->btn&PAD_CIRCLE) )
+				{
+					if( !p_circle )
+					{
+						CdControl(CdlPause, 0, 0);
+						p_circle = 1;
+					}
+				}
+				else
+				{
+					p_circle = 0;
+				}
+				
+				/* Change XA channel */
+				if( !(pad->btn&PAD_RIGHT) )
+				{
+					if( !p_right )
+					{
+						filter.chan = sel_channel;
+						CdControl(CdlSetfilter, (u_char*)&filter, 0);
+						xa_play_channel = sel_channel;
+						p_right = 1;
+					}
+				}
+				else
+				{
+					p_right = 0;
+				}
+				
+			}
+		}
+		
+		
+		/* Display information */
+		FntPrint(-1, "\n PSN00BSDK XA AUDIO EXAMPLE\n\n");
+		FntPrint(-1, " CHANNEL:\n");
+		
+		for(i=0; i<8; i++)
+		{
+			if( i == sel_channel )
+			{
+				FntPrint(-1, " -->%d\n", i);
+			}
+			else
+			{
+				FntPrint(-1, "    %d\n", i);
+			}
+		}
+		
+		FntPrint(-1, "\n CURRENT=%d STATUS=%x LOOPS=%d\n", 
+			xa_play_channel, CdStatus(), num_loops);
+		FntPrint(-1, "\n <X>-PLAY (START) <O>-STOP\n <R>-SET CHANNEL\n");
+		
+		
+		/* Clear ordering table and set start address of primitive buffer */
+		ClearOTagR(ot[db], OT_LEN);
+		nextpri = pribuff[db];
+		
+		
+		/* Sort the balls */
+		sprt = (SPRT_16*)nextpri;
+		for( i=0; i<MAX_BALLS; i++ ) {
+			
+			setSprt16(sprt);
+			setXY0(sprt, balls[i].x, balls[i].y);
+			setRGB0(sprt, balls[i].r, balls[i].g, balls[i].b);
+			setUV0(sprt, 0, 0);
+			setClut(sprt, tim.crect->x, tim.crect->y);
+			
+			addPrim(ot[db]+(OT_LEN-1), sprt);
+			sprt++;
+			
+			balls[i].x += balls[i].xdir;
+			balls[i].y += balls[i].ydir;
+			
+			if( ( balls[i].x+16 ) > SCREEN_XRES ) {
+				balls[i].xdir = -2;
+			} else if( balls[i].x < 0 ) {
+				balls[i].xdir = 2;
+			}
+			
+			if( ( balls[i].y+16 ) > SCREEN_YRES ) {
+				balls[i].ydir = -2;
+			} else if( balls[i].y < 0 ) {
+				balls[i].ydir = 2;
+			}
+			
+		}
+		nextpri = (char*)sprt;
+		
+		
+		/* Sort a TPage primitive so the sprites will draw pixels from */
+		/* the correct texture page in VRAM */
+		tpri = (DR_TPAGE*)nextpri;
+		setDrawTPage(tpri, 0, 0, getTPage(0, 0, tim.prect->x, tim.prect->y));
+		addPrim(ot[db]+(OT_LEN-1), tpri);
+		nextpri += sizeof(DR_TPAGE);
+		
+		/* Draw font */
+		FntFlush(-1);
+		
+		/* Wait for GPU and VSync */
+		DrawSync(0);
+		VSync(0);
+		
+		/* Since draw.isbg is non-zero this clears the screen */
+		PutDispEnv(&disp[db]);
+		PutDrawEnv(&draw[db]);
+		SetDispMask(1);
+		
+		/* Begin drawing the new frame */
+		DrawOTag( ot[db]+(OT_LEN-1) );
+		
+		/* Alternate to the next buffer */
+		db = !db;
+		
+		/* Periodically issue CdlNop every second to update CdStatus() */
+		counter++;
+		if( (counter%60) == 59 )
+		{
+			CdControl(CdlNop, 0, 0);
+		}
+		
+	}
+	
+	return 0;
+
+}
diff --git a/examples/cdxa/makefile b/examples/cdxa/makefile
new file mode 100644
index 0000000..c94f48c
--- /dev/null
+++ b/examples/cdxa/makefile
@@ -0,0 +1,60 @@
+include ../sdk-common.mk
+
+TARGET		= cdxa.elf
+
+CFILES		= $(notdir $(wildcard *.c))
+CPPFILES 	= $(notdir $(wildcard *.cpp))
+AFILES		= $(notdir $(wildcard *.s))
+
+OFILES		= $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o))
+
+PREFIX		= mipsel-unknown-elf-
+
+# Include directories
+INCLUDE	 	= -I../../libpsn00b/include
+
+# Library directories, last entry must point toolchain libraries
+LIBDIRS		= -L../../libpsn00b
+
+LIBDIRS 	+= -L$(GCC_BASE)/lib/gcc/mipsel-unknown-elf/$(GCC_VERSION)
+INCLUDE	 	+= -I$(GCC_BASE)/lib/gcc/mipsel-unknown-elf/$(GCC_VERSION)/include
+
+LIBS		= -lpsxcd -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxsio -lpsxapi -lc
+
+CFLAGS		= -g -O2 -fno-builtin -fdata-sections -ffunction-sections
+CPPFLAGS	= $(CFLAGS) \
+				-fno-exceptions \
+				-fno-rtti \
+				-fno-unwind-tables \
+				-fno-threadsafe-statics \
+				-fno-use-cxa-atexit
+
+AFLAGS		= -g -msoft-float
+LDFLAGS		= -g -Ttext=0x80010000 -gc-sections \
+				-T $(GCC_BASE)/mipsel-unknown-elf/lib/ldscripts/elf32elmip.x
+
+CC			= $(PREFIX)gcc
+CXX			= $(PREFIX)g++
+AS			= $(PREFIX)as
+LD			= $(PREFIX)ld
+
+all: $(OFILES)
+	$(LD) $(LDFLAGS) $(LIBDIRS) $(OFILES) $(LIBS) -o $(TARGET)
+	elf2x -q $(TARGET)
+	mkpsxiso -y -q iso.xml
+	
+build/%.o: %.c
+	@mkdir -p $(dir $@)
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+build/%.o: %.cpp
+	@mkdir -p $(dir $@)
+	$(CXX) $(CPPFLAGS) $(INCLUDE) -c $< -o $@
+	
+build/%.o: %.s
+	@mkdir -p $(dir $@)
+	$(CC) $(AFLAGS) $(INCLUDE) -c $< -o $@
+	
+clean:
+	make -C libpsxcd clean
+	rm -rf build $(TARGET) $(TARGET:.elf=.exe)
diff --git a/examples/cdxa/system.cnf b/examples/cdxa/system.cnf
new file mode 100644
index 0000000..e61e50e
--- /dev/null
+++ b/examples/cdxa/system.cnf
@@ -0,0 +1,4 @@
+BOOT=cdrom:\cdxa.exe;1
+TCB=4
+EVENT=10
+STACK=801FFFF0
diff --git a/examples/childexec/parent.c b/examples/childexec/parent.c
index dbaf696..7f577e4 100644
--- a/examples/childexec/parent.c
+++ b/examples/childexec/parent.c
@@ -223,7 +223,8 @@ int main(int argc, const char* argv[]) {
 		/* Sort a TPage primitive so the sprites will draw pixels from */
 		/* the correct texture page in VRAM */
 		tpri = (DR_TPAGE*)nextpri;
-		setDrawTPage( tpri, 0, 0, tim.prect->x, tim.prect->y );
+		setDrawTPage( tpri, 0, 0, 
+			getTPage( 0, 0, tim.prect->x, tim.prect->y ) );
 		addPrim( ot[db]+(OT_LEN-1), tpri );
 		nextpri += sizeof(DR_TPAGE);
 		
@@ -301,4 +302,4 @@ void run_child() {
 	// Set this program's display mode
 	PutDispEnv(&disp);
 	
-}
\ No newline at end of file
+}
diff --git a/examples/fpscam/makefile b/examples/fpscam/makefile
index 67fe7c2..4f344eb 100644
--- a/examples/fpscam/makefile
+++ b/examples/fpscam/makefile
@@ -11,13 +11,7 @@ OFILES		= $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o)
 INCLUDE	 	+= 
 LIBDIRS		+= 
 
-<<<<<<< .mine
 LIBS		= -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
-||||||| .r23
-LIBS		= -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lgcc
-=======
-LIBS		= -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
->>>>>>> .r27
 
 CFLAGS		= -g -O2 -fno-builtin -fdata-sections -ffunction-sections
 CPPFLAGS	= $(CFLAGS) -fno-exceptions
diff --git a/examples/gte/makefile b/examples/gte/makefile
index 89b27d3..2be2374 100644
--- a/examples/gte/makefile
+++ b/examples/gte/makefile
@@ -11,7 +11,7 @@ OFILES		= $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o)
 INCLUDE	 	+= 
 LIBDIRS		+= 
 
-LIBS		= -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lgcc
+LIBS		= -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
 
 CFLAGS		= -g -O2 -fno-builtin -fdata-sections -ffunction-sections
 CPPFLAGS	= $(CFLAGS) -fno-exceptions
diff --git a/examples/makefile b/examples/makefile
index dda76ce..4c4aadf 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -4,7 +4,7 @@
 
 TOPTARGETS	= all clean
 
-DIRS 		= balls gte n00bdemo
+DIRS 		= balls gte n00bdemo fpscam childexec render2tex rgb24 timer billboard
 
 
 $(TOPTARGETS): $(DIRS)
diff --git a/examples/n00bdemo/makefile b/examples/n00bdemo/makefile
index 8159a22..96275fb 100644
--- a/examples/n00bdemo/makefile
+++ b/examples/n00bdemo/makefile
@@ -10,7 +10,7 @@ OFILES		= $(addprefix build/,$(CFILES:.c=.o) $(AFILES:.s=.o))
 INCLUDE	 	+= -I../../libpsn00b/lzp
 LIBDIRS		+= -L../../libpsn00b/lzp
 
-LIBS		= -llzp -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lgcc
+LIBS		= -llzp -lc -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
 
 CFLAGS		= -g -O2 -fno-builtin -fdata-sections -ffunction-sections
 CPPFLAGS	= $(CFLAGS) -fno-exceptions
diff --git a/examples/rgb24/makefile b/examples/rgb24/makefile
index ada9fbb..eea866d 100644
--- a/examples/rgb24/makefile
+++ b/examples/rgb24/makefile
@@ -11,12 +11,12 @@ OFILES		= $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o)
 INCLUDE	 	+=
 LIBDIRS		+=
 
-LIBS		= -lc -lpsxgpu -lpsxapi -lgcc
+LIBS		= -lpsxgpu -lpsxapi -lc
 
 CFLAGS		= -g -O2 -fno-builtin -fdata-sections -ffunction-sections
 CPPFLAGS	= $(CFLAGS) -fno-exceptions
 AFLAGS		= -g -msoft-float
-LDFLAGS		= -g -Ttext=0x80010000 -gc-sections
+LDFLAGS		= -g -Ttext=0x80010000 -gc-sections -T $(GCC_BASE)/mipsel-unknown-elf/lib/ldscripts/elf32elmip.x
 
 CC			= $(PREFIX)gcc
 CXX			= $(PREFIX)g++
diff --git a/examples/timer/main.c b/examples/timer/main.c
new file mode 100644
index 0000000..7d9f7b3
--- /dev/null
+++ b/examples/timer/main.c
@@ -0,0 +1,154 @@
+#include <stdio.h>
+#include <psxgpu.h>
+#include <psxapi.h>
+#include <psxetc.h>
+
+/* OT and Packet Buffer sizes */
+#define OT_LEN			256
+#define PACKET_LEN		1024
+
+/* Screen resolution */
+#define SCREEN_XRES		320
+#define SCREEN_YRES		240
+
+/* Screen center position */
+#define CENTERX			SCREEN_XRES>>1
+#define CENTERY			SCREEN_YRES>>1
+
+
+/* Double buffer structure */
+typedef struct {
+	DISPENV	disp;			/* Display environment */
+	DRAWENV	draw;			/* Drawing environment */
+} DB;
+
+/* Double buffer variables */
+DB		db[2];
+int		db_active = 0;
+
+
+/* Function declarations */
+void init();
+void display();
+
+
+volatile int timer_calls = 0;
+volatile short *timer2_ctrl = (short*)0x1F801124;
+void timer_func()
+{
+	timer_calls++;
+}
+
+volatile int vsync_count = 0;
+volatile int tick_count = 0;
+volatile int tick_value = 0;
+
+void vsync_func()
+{
+	vsync_count++;
+	if( vsync_count > 60 )
+	{
+		tick_value = timer_calls-tick_count;
+		tick_count = timer_calls;
+		vsync_count = 0;
+	}
+}
+
+/* Main function */
+int main() {
+	
+	int counter;
+	
+	/* Init graphics and GTE */
+	init();
+	
+	
+	EnterCriticalSection();
+	//SetRCnt(RCntCNT2, 0xF040, RCntMdINTR);
+	
+	// NTSC clock base
+	counter = 4304000/560;
+	
+	// PAL clock base
+	//counter = 5163000/560;
+	
+	SetRCnt(RCntCNT2, counter, RCntMdINTR);
+	*timer2_ctrl = 0x1E58;
+	InterruptCallback(6, timer_func);
+	StartRCnt(RCntCNT2);
+	ChangeClearRCnt(2, 0);
+	ExitCriticalSection();
+	
+	VSyncCallback(vsync_func);
+	
+	/* Main loop */
+	while( 1 ) {
+		
+		FntPrint(-1, "TIMER COUNT=%d\n", timer_calls);
+		FntPrint(-1, "TICKS/SEC=%d\n", tick_value);
+		
+		/* Swap buffers and draw text */
+		display();
+		
+	}
+	
+	return 0;
+	
+}
+
+void init() {
+
+	/* Reset the GPU, also installs a VSync event handler */
+	ResetGraph( 0 );
+	//SetVideoMode(MODE_PAL);
+	
+	/* Set display and draw environment areas */
+	/* (display and draw areas must be separate, otherwise hello flicker) */
+	SetDefDispEnv( &db[0].disp, 0, 0, SCREEN_XRES, SCREEN_YRES );
+	SetDefDrawEnv( &db[0].draw, SCREEN_XRES, 0, SCREEN_XRES, SCREEN_YRES );
+	
+	/* Enable draw area clear and dither processing */
+	setRGB0( &db[0].draw, 63, 0, 127 );
+	db[0].draw.isbg = 1;
+	db[0].draw.dtd = 1;
+	
+	
+	/* Define the second set of display/draw environments */
+	SetDefDispEnv( &db[1].disp, SCREEN_XRES, 0, SCREEN_XRES, SCREEN_YRES );
+	SetDefDrawEnv( &db[1].draw, 0, 0, SCREEN_XRES, SCREEN_YRES );
+	
+	//db[0].disp.screen.y = 24;
+	//db[1].disp.screen.y = 24;
+	
+	setRGB0( &db[1].draw, 63, 0, 127 );
+	db[1].draw.isbg = 1;
+	db[1].draw.dtd = 1;
+	
+	
+	/* Apply the drawing environment of the first double buffer */
+	PutDrawEnv( &db[0].draw );
+	
+	FntLoad(960, 0);
+	FntOpen(0, 8, 320, 216, 0, 100);
+	
+}
+
+void display() {
+	
+	FntFlush(-1);
+	
+	/* Wait for GPU to finish drawing and vertical retrace */
+	DrawSync( 0 );
+	VSync( 0 );
+	
+	/* Swap buffers */
+	db_active ^= 1;
+	
+	/* Apply display/drawing environments */
+	PutDrawEnv( &db[db_active].draw );
+	PutDispEnv( &db[db_active].disp );
+	
+	/* Enable display */
+	SetDispMask( 1 );
+	
+}
\ No newline at end of file
diff --git a/examples/timer/makefile b/examples/timer/makefile
new file mode 100644
index 0000000..0c1340d
--- /dev/null
+++ b/examples/timer/makefile
@@ -0,0 +1,39 @@
+include ../sdk-common.mk
+
+TARGET		= timer.elf
+
+CFILES		= $(notdir $(wildcard *.c))
+CPPFILES 	= $(notdir $(wildcard *.cpp))
+AFILES		= $(notdir $(wildcard *.s))
+
+OFILES		= $(addprefix build/,$(CFILES:.c=.o) $(CPPFILES:.cpp=.o) $(AFILES:.s=.o))
+
+INCLUDE	 	+= 
+LIBDIRS		+= 
+
+LIBS		= -lpsxetc -lpsxgpu -lpsxgte -lpsxspu -lpsxapi -lc
+
+CFLAGS		= -g -O2 -fno-builtin -fdata-sections -ffunction-sections
+CPPFLAGS	= $(CFLAGS) -fno-exceptions
+AFLAGS		= -g -msoft-float
+LDFLAGS		= -g -Ttext=0x80010000 -gc-sections -T $(GCC_BASE)/mipsel-unknown-elf/lib/ldscripts/elf32elmip.x
+
+CC			= $(PREFIX)gcc
+CXX			= $(PREFIX)g++
+AS			= $(PREFIX)as
+LD			= $(PREFIX)ld
+
+all: $(OFILES)
+	$(LD) $(LDFLAGS) $(LIBDIRS) $(OFILES) $(LIBS) -o $(TARGET)
+	elf2x -q $(TARGET)
+	
+build/%.o: %.c
+	@mkdir -p $(dir $@)
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+	
+build/%.o: %.s
+	@mkdir -p $(dir $@)
+	$(CC) $(AFLAGS) $(INCLUDE) -c $< -o $@
+	
+clean:
+	rm -rf build $(TARGET) $(TARGET:.elf=.exe)