From f29fbd5358e28135d389e2218da7c90f8b94b983 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 9 Dec 2012 19:58:34 +0200
Subject: pipe error messages through single function

for easier redirection to file, logcat or whatever
---
 frontend/libretro.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index db13d7a..0eef059 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -236,7 +236,7 @@ bool retro_load_game(const struct retro_game_info *info)
 	enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
 	if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
 		native_rgb565 = 1;
-		fprintf(stderr, "RGB565 supported, using it\n");
+		SysPrintf("RGB565 supported, using it\n");
 	}
 
 	if (plugins_opened) {
@@ -248,7 +248,7 @@ bool retro_load_game(const struct retro_game_info *info)
 
 	/* have to reload after set_cd_image for correct cdr plugin */
 	if (LoadPlugins() == -1) {
-		printf("faled to load plugins\n");
+		SysPrintf("failed to load plugins\n");
 		return false;
 	}
 
@@ -256,7 +256,7 @@ bool retro_load_game(const struct retro_game_info *info)
 	NetOpened = 0;
 
 	if (OpenPlugins() == -1) {
-		printf("faled to open plugins\n");
+		SysPrintf("failed to open plugins\n");
 		return false;
 	}
 
@@ -264,14 +264,14 @@ bool retro_load_game(const struct retro_game_info *info)
 
 	Config.PsxAuto = 1;
 	if (CheckCdrom() == -1) {
-		printf("unsupported/invalid CD image: %s\n", info->path);
+		SysPrintf("unsupported/invalid CD image: %s\n", info->path);
 		return false;
 	}
 
 	SysReset();
 
 	if (LoadCdrom() == -1) {
-		printf("could not load CD-ROM!\n");
+		SysPrintf("could not load CD-ROM!\n");
 		return false;
 	}
 	emu_on_new_cd(0);
@@ -359,7 +359,7 @@ void retro_init(void)
 	ret = emu_core_preinit();
 	ret |= emu_core_init();
 	if (ret != 0) {
-		printf("PCSX init failed, sorry\n");
+		SysPrintf("PCSX init failed.\n");
 		exit(1);
 	}
 
@@ -379,11 +379,11 @@ void retro_init(void)
 		}
 	}
 	if (f != NULL) {
-		printf("found BIOS file: %s\n", Config.Bios);
+		SysPrintf("found BIOS file: %s\n", Config.Bios);
 		fclose(f);
 	}
 	else
-		printf("no BIOS files found.\n");
+		SysPrintf("no BIOS files found.\n");
 
 	level = 1;
 	environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
-- 
cgit v1.2.3


From f9f60dae01fe8a8262d52950893c2674c4545f4a Mon Sep 17 00:00:00 2001
From: Toad King
Date: Sun, 2 Dec 2012 14:36:18 -0500
Subject: libretro: use SRAM saving routines for memory card.

force only one memory card for libretro
---
 frontend/libretro.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index db13d7a..15041bc 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -32,6 +32,10 @@ static int samples_sent, samples_to_send;
 static int plugins_opened;
 static int native_rgb565;
 
+/* memory card data */
+extern char Mcd1Data[MCD_SIZE];
+extern char McdDisable[2];
+
 /* PCSX ReARMed core calls and stuff */
 int in_type1, in_type2;
 int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
@@ -295,12 +299,12 @@ unsigned retro_get_region(void)
 
 void *retro_get_memory_data(unsigned id)
 {
-	return NULL;
+	return Mcd1Data;
 }
 
 size_t retro_get_memory_size(unsigned id)
 {
-	return 0;
+	return MCD_SIZE;
 }
 
 void retro_reset(void)
@@ -387,6 +391,9 @@ void retro_init(void)
 
 	level = 1;
 	environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
+
+	McdDisable[0] = 0;
+	McdDisable[1] = 1;
 }
 
 void retro_deinit(void)
-- 
cgit v1.2.3


From 46aa5b98890412bca8487b28809df3ece137dba9 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 4 Dec 2012 14:16:34 +0100
Subject: libretro: make RGB565 support into compile-time option

all libretro frontends should support this no matter what
---
 frontend/libretro.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 15041bc..49e346b 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -30,7 +30,6 @@ static retro_audio_sample_batch_t audio_batch_cb;
 static void *vout_buf;
 static int samples_sent, samples_to_send;
 static int plugins_opened;
-static int native_rgb565;
 
 /* memory card data */
 extern char Mcd1Data[MCD_SIZE];
@@ -51,6 +50,7 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 }
 
+#ifdef FRONTEND_SUPPORTS_RGB565
 static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
@@ -60,6 +60,7 @@ static void convert(void *buf, size_t bytes)
 		p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
 	}
 }
+#endif
 
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
@@ -90,8 +91,9 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 	}
 
 out:
-	if (!native_rgb565)
-		convert(vout_buf, w * h * 2);
+#ifndef FRONTEND_SUPPORTS_RGB565
+   convert(vout_buf, w * h * 2);
+#endif
 	video_cb(vout_buf, w, h, w * 2);
 	pl_rearmed_cbs.flip_cnt++;
 }
@@ -237,11 +239,12 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
 
 bool retro_load_game(const struct retro_game_info *info)
 {
+#ifdef FRONTEND_SUPPORTS_RGB565
 	enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
 	if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
-		native_rgb565 = 1;
 		fprintf(stderr, "RGB565 supported, using it\n");
 	}
+#endif
 
 	if (plugins_opened) {
 		ClosePlugins();
@@ -402,4 +405,3 @@ void retro_deinit(void)
 	free(vout_buf);
 	vout_buf = NULL;
 }
-
-- 
cgit v1.2.3


From bcbe4aa4b45d8d37a6a3f1d80b4da1f3beb2be16 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 4 Dec 2012 14:36:01 +0100
Subject: libretro: call video_cb on every frame

We need to do video_cb in retro_run every frame instead of
just once every time the video callback is called - otherwise
we will get very bad/skippy framerates.
Performance is much improved now in nearly all games.
---
 frontend/libretro.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 49e346b..e505804 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -62,6 +62,9 @@ static void convert(void *buf, size_t bytes)
 }
 #endif
 
+static unsigned game_width;
+static unsigned game_height;
+
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
 	unsigned short *dest = vout_buf;
@@ -94,8 +97,8 @@ out:
 #ifndef FRONTEND_SUPPORTS_RGB565
    convert(vout_buf, w * h * 2);
 #endif
-	video_cb(vout_buf, w, h, w * 2);
-	pl_rearmed_cbs.flip_cnt++;
+   game_width = w;
+   game_height = h;
 }
 
 static void vout_close(void)
@@ -353,6 +356,8 @@ void retro_run(void)
 	psxCpu->Execute();
 
 	samples_to_send += 44100 / 60;
+	video_cb(vout_buf, game_width, game_height, game_width * 2);
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3


From 2ee53c487bfaa112fec8f740ae05717a79994264 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 4 Dec 2012 16:38:01 +0100
Subject: libretro: Move flip screen counter increment back to end of flip
 screen callback

---
 frontend/libretro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index e505804..180c1d7 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -99,6 +99,7 @@ out:
 #endif
    game_width = w;
    game_height = h;
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
@@ -357,7 +358,6 @@ void retro_run(void)
 
 	samples_to_send += 44100 / 60;
 	video_cb(vout_buf, game_width, game_height, game_width * 2);
-	pl_rearmed_cbs.flip_cnt++;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3


From 7df396ea8c8eff6094e999f5c67b5f6b7e599199 Mon Sep 17 00:00:00 2001
From: Toad King
Date: Tue, 4 Dec 2012 19:26:09 -0500
Subject: libretro: initialize blank memory card

---
 frontend/libretro.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 180c1d7..6212980 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -41,6 +41,39 @@ int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
 int in_keystate;
 int in_enable_vibration;
 
+static void init_memcard(char *mcd_data)
+{
+	unsigned off = 0;
+	unsigned i;
+
+	memset(mcd_data, 0, MCD_SIZE);
+
+	mcd_data[off++] = 'M';
+	mcd_data[off++] = 'C';
+	off += 0x7d;
+	mcd_data[off++] = 0x0e;
+
+	for (i = 0; i < 15; i++) {
+		mcd_data[off++] = 0xa0;
+		off += 0x07;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		off += 0x75;
+		mcd_data[off++] = 0xa0;
+	}
+
+	for (i = 0; i < 20; i++) {
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		off += 0x04;
+		mcd_data[off++] = 0xff;
+		mcd_data[off++] = 0xff;
+		off += 0x76;
+	}
+}
+
 static int vout_open(void)
 {
 	return 0;
@@ -402,6 +435,7 @@ void retro_init(void)
 
 	McdDisable[0] = 0;
 	McdDisable[1] = 1;
+	init_memcard(Mcd1Data);
 }
 
 void retro_deinit(void)
-- 
cgit v1.2.3


From e2bdb933ecee40a0c4caf14a20f5e642e3b93120 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 10 Dec 2012 03:38:46 +0200
Subject: libretro: only pass fb to video_cb when it's updated

---
 frontend/libretro.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 6212980..8256fe1 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -97,6 +97,7 @@ static void convert(void *buf, size_t bytes)
 
 static unsigned game_width;
 static unsigned game_height;
+static unsigned game_fb_dirty;
 
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
@@ -132,7 +133,8 @@ out:
 #endif
    game_width = w;
    game_height = h;
-	pl_rearmed_cbs.flip_cnt++;
+   game_fb_dirty = 1;
+   pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
@@ -390,7 +392,9 @@ void retro_run(void)
 	psxCpu->Execute();
 
 	samples_to_send += 44100 / 60;
-	video_cb(vout_buf, game_width, game_height, game_width * 2);
+
+	video_cb(game_fb_dirty ? vout_buf : NULL, game_width, game_height, game_width * 2);
+	game_fb_dirty = 0;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3


From cc4f9b703ba166301a31ef6c695e1d02572e6bc4 Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 10 Dec 2012 18:42:13 +0200
Subject: libretro: minor cleanups

---
 frontend/libretro.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 8256fe1..bdcf519 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -83,7 +83,7 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 }
 
-#ifdef FRONTEND_SUPPORTS_RGB565
+#ifndef FRONTEND_SUPPORTS_RGB565
 static void convert(void *buf, size_t bytes)
 {
 	unsigned int i, v, *p = buf;
@@ -129,12 +129,12 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 
 out:
 #ifndef FRONTEND_SUPPORTS_RGB565
-   convert(vout_buf, w * h * 2);
+	convert(vout_buf, w * h * 2);
 #endif
-   game_width = w;
-   game_height = h;
-   game_fb_dirty = 1;
-   pl_rearmed_cbs.flip_cnt++;
+	game_width = w;
+	game_height = h;
+	game_fb_dirty = 1;
+	pl_rearmed_cbs.flip_cnt++;
 }
 
 static void vout_close(void)
-- 
cgit v1.2.3


From 5ca2ec64779fee99d0fc347330a83ae5e982d282 Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 11 Dec 2012 01:37:33 +0200
Subject: libretro: set cycle_multiplier

---
 frontend/libretro.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4e509a0..3431685 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -437,6 +437,15 @@ void retro_init(void)
 	level = 1;
 	environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
 
+	/* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times)
+	 * we have to do this because cache misses and some IO penalties
+	 * are not emulated. Warning: changing this may break compatibility. */
+#ifdef __ARM_ARCH_7A__
+	cycle_multiplier = 175;
+#else
+	cycle_multiplier = 200;
+#endif
+
 	McdDisable[0] = 0;
 	McdDisable[1] = 1;
 	init_memcard(Mcd1Data);
-- 
cgit v1.2.3


From 70d56ca34a084bf613247c027f58b58055d75ecd Mon Sep 17 00:00:00 2001
From: notaz
Date: Tue, 11 Dec 2012 02:20:42 +0200
Subject: libretro: handle borders

---
 frontend/libretro.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 3431685..3b366d4 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -28,6 +28,9 @@ static retro_environment_t environ_cb;
 static retro_audio_sample_batch_t audio_batch_cb;
 
 static void *vout_buf;
+static int vout_width, vout_height;
+static int vout_doffs_old, vout_fb_dirty;
+
 static int samples_sent, samples_to_send;
 static int plugins_opened;
 
@@ -81,6 +84,8 @@ static int vout_open(void)
 
 static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
+	vout_width = w;
+	vout_height = h;
 }
 
 #ifndef FRONTEND_SUPPORTS_RGB565
@@ -95,15 +100,12 @@ static void convert(void *buf, size_t bytes)
 }
 #endif
 
-static unsigned game_width;
-static unsigned game_height;
-static unsigned game_fb_dirty;
-
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
 	unsigned short *dest = vout_buf;
 	const unsigned short *src = vram;
-	int dstride = w, h1 = h;
+	int dstride = vout_width, h1 = h;
+	int doffs;
 
 	if (vram == NULL) {
 		// blanking
@@ -111,6 +113,15 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 		goto out;
 	}
 
+	doffs = (vout_height - h) * dstride;
+	doffs += (dstride - w) / 2 & ~1;
+	if (doffs != vout_doffs_old) {
+		// clear borders
+		memset(vout_buf, 0, dstride * h * 2);
+		vout_doffs_old = doffs;
+	}
+	dest += doffs;
+
 	if (bgr24)
 	{
 		// XXX: could we switch to RETRO_PIXEL_FORMAT_XRGB8888 here?
@@ -129,11 +140,9 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 
 out:
 #ifndef FRONTEND_SUPPORTS_RGB565
-	convert(vout_buf, w * h * 2);
+	convert(vout_buf, vout_width * vout_height * 2);
 #endif
-	game_width = w;
-	game_height = h;
-	game_fb_dirty = 1;
+	vout_fb_dirty = 1;
 	pl_rearmed_cbs.flip_cnt++;
 }
 
@@ -393,8 +402,8 @@ void retro_run(void)
 
 	samples_to_send += 44100 / 60;
 
-	video_cb(game_fb_dirty ? vout_buf : NULL, game_width, game_height, game_width * 2);
-	game_fb_dirty = 0;
+	video_cb(vout_fb_dirty ? vout_buf : NULL, vout_width, vout_height, vout_width * 2);
+	vout_fb_dirty = 0;
 }
 
 void retro_init(void)
-- 
cgit v1.2.3