From 6a298de4811066eb3cd2fadfd78970281ed30074 Mon Sep 17 00:00:00 2001
From: notaz <notaz@pixelinis>
Date: Sat, 6 Oct 2012 21:04:55 +0300
Subject: [PATCH] u8/caanoo release

---
 gp2x/Makefile        |  9 +++++++++
 gp2x/gpsp_caanoo.gpe |  9 +++++++++
 gp2x/gpsp_caanoo.ini |  4 ++++
 gp2x/readme_gp2x.txt | 37 +++++++++++++++++++++++++++++++++++++
 sound.c              |  2 ++
 5 files changed, 61 insertions(+)
 create mode 100755 gp2x/gpsp_caanoo.gpe
 create mode 100644 gp2x/gpsp_caanoo.ini

diff --git a/gp2x/Makefile b/gp2x/Makefile
index 9f06dd8..5e8a906 100644
--- a/gp2x/Makefile
+++ b/gp2x/Makefile
@@ -76,3 +76,12 @@ $(BIN):	$(OBJS)
 clean:
 	rm -f *.o *.u *.z $(BIN) 
 
+rel: gpsp_caanoo gpsp_caanoo.ini gpsp_caanoo.gpe warm_2.6.24.ko \
+		../COPYING.DOC ../readme.txt readme_gp2x.txt ../game_config.txt
+	rm -rf out
+	mkdir -p out/gpsp_caanoo
+	cp $^ out/gpsp_caanoo/
+	mv out/gpsp_caanoo/gpsp_caanoo.ini out/
+	mv out/gpsp_caanoo/readme_gp2x.txt out/gpsp_caanoo/readme_caanoo.txt
+	echo -n '/mnt/sd' > out/gpsp_caanoo/romdir.txt
+	cd out && zip -9 -r ../gpsp_caanoo.zip *
diff --git a/gp2x/gpsp_caanoo.gpe b/gp2x/gpsp_caanoo.gpe
new file mode 100755
index 0000000..288ca4b
--- /dev/null
+++ b/gp2x/gpsp_caanoo.gpe
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# if you know good LCD settings, set them here
+# export pollux_dpc_set='lcd_timings=397,1,37,277,341,0,17,337;clkdiv0=9'
+
+./gpsp_caanoo "$@"
+
+cd /usr/gp2x
+exec ./gp2xmenu
diff --git a/gp2x/gpsp_caanoo.ini b/gp2x/gpsp_caanoo.ini
new file mode 100644
index 0000000..251ada4
--- /dev/null
+++ b/gp2x/gpsp_caanoo.ini
@@ -0,0 +1,4 @@
+[info]
+name="gpSP Caanoo"
+path="/gpsp_caanoo/gpsp_caanoo.gpe"
+group="GAMES"
diff --git a/gp2x/readme_gp2x.txt b/gp2x/readme_gp2x.txt
index 75f74c4..26a5a87 100644
--- a/gp2x/readme_gp2x.txt
+++ b/gp2x/readme_gp2x.txt
@@ -1,3 +1,40 @@
+-- porter's foreword --
+
+Even though ZX-81 ported my Wiz version to Caanoo, some people kept
+asking me to do the port instead because of apparent sound problems,
+so here it is. Note that I did not use ZX-81's work for this release,
+because I had various changes for Pandora version and wanted to have
+them in, so different set of bugs then in ZX-81's version are
+possible. Savestates might also be incompatible.
+
+To use this, you'll first need to copy authentic GBA BIOS to gpSP
+directory. It must be named gba_bios.bin and should be 16kB in size.
+
+I've appended the original gpSP GP2X readme file as it contains lots
+of information that is still relevant for this version, as well as
+development history of this project.
+
+- notaz
+
+Changelog:
+
+0.9-2xb u8
+- Caanoo port
+- fixed tv-out for pandora
+- integrated M-HT's neon scalers (pandora only)
+- merged an assortment of calc84maniac's bugfixes
+
+0.9-2xb u7
+- Pandora port, using hardware scaler for video output.
+- Fixed a few portablility issues in ARM asm and sound code.
+- Tweaked timing to suit pandora's LCD refresh nicely.
+- Maybe fixed GBC/digital sound channel desync over time.
+- Some other not-that-relevant cleanups and tweaks.
+
+Source code should be available at:
+http://notaz.gp2x.de/cgi-bin/gitweb.cgi
+
+
 -- gameplaySP2X  Gameboy Advance emulator for GP2X --
 
 gpSP2X is a version of my (Exophase)'s emulator originally for Sony PSP.
diff --git a/sound.c b/sound.c
index 5593bbe..962b3a6 100644
--- a/sound.c
+++ b/sound.c
@@ -32,6 +32,8 @@ static SDL_cond *sound_cv;
 
 #ifdef PSP_BUILD
 u32 audio_buffer_size_number = 1;
+#elif defined(POLLUX_BUILD)
+u32 audio_buffer_size_number = 7;
 #else
 u32 audio_buffer_size_number = 8;
 #endif
-- 
2.39.2