X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=180c1d7274683f5ad5525506d44306e597a6ce32;hp=b832a4efe7e7055066ab14ef1221e28cc3ee331f;hb=2ee53c487bfaa112fec8f740ae05717a79994264;hpb=e4c83ca67cf7ad13db3995909605ce01ff915824

diff --git a/frontend/libretro.c b/frontend/libretro.c
index b832a4ef..180c1d72 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -11,10 +11,10 @@
 
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
+#include "../libpcsxcore/psxmem_map.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfsound/out.h"
 #include "../plugins/gpulib/cspace.h"
-#include "linux/plat_mmap.h"
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
@@ -30,7 +30,10 @@ 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];
+extern char McdDisable[2];
 
 /* PCSX ReARMed core calls and stuff */
 int in_type1, in_type2;
@@ -47,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;
@@ -56,6 +60,10 @@ static void convert(void *buf, size_t bytes)
 		p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0);
 	}
 }
+#endif
+
+static unsigned game_width;
+static unsigned game_height;
 
 static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 {
@@ -86,9 +94,11 @@ 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);
-	video_cb(vout_buf, w, h, w * 2);
+#ifndef FRONTEND_SUPPORTS_RGB565
+   convert(vout_buf, w * h * 2);
+#endif
+   game_width = w;
+   game_height = h;
 	pl_rearmed_cbs.flip_cnt++;
 }
 
@@ -98,12 +108,12 @@ static void vout_close(void)
 
 static void *pl_mmap(unsigned int size)
 {
-	return plat_mmap(0, size, 0, 0);
+	return psxMap(0, size, 0, MAP_TAG_VRAM);
 }
 
 static void pl_munmap(void *ptr, unsigned int size)
 {
-	plat_munmap(ptr, size);
+	psxUnmap(ptr, size, MAP_TAG_VRAM);
 }
 
 struct rearmed_cbs pl_rearmed_cbs = {
@@ -233,11 +243,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();
@@ -295,12 +306,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)
@@ -346,6 +357,7 @@ void retro_run(void)
 	psxCpu->Execute();
 
 	samples_to_send += 44100 / 60;
+	video_cb(vout_buf, game_width, game_height, game_width * 2);
 }
 
 void retro_init(void)
@@ -387,6 +399,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)
@@ -395,4 +410,3 @@ void retro_deinit(void)
 	free(vout_buf);
 	vout_buf = NULL;
 }
-