X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Flibretro.c;h=15041bc365d7f175d62f568b8c405ffd86f84c23;hp=1eb2147f7c910f4c4b078e901c1db5a5d1cc221d;hb=f9f60dae01fe8a8262d52950893c2674c4545f4a;hpb=2857d72e4ca743bba3cf55e298949e24d97dff02

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 1eb2147f..15041bc3 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -11,6 +11,7 @@
 
 #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"
@@ -31,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 };
@@ -42,7 +47,7 @@ static int vout_open(void)
 	return 0;
 }
 
-static void vout_set_mode(int w, int h, int bpp)
+static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 }
 
@@ -64,7 +69,7 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 
 	if (vram == NULL) {
 		// blanking
-		memset(pl_vout_buf, 0, dstride * h * 2);
+		memset(vout_buf, 0, dstride * h * 2);
 		goto out;
 	}
 
@@ -95,11 +100,23 @@ static void vout_close(void)
 {
 }
 
+static void *pl_mmap(unsigned int size)
+{
+	return psxMap(0, size, 0, MAP_TAG_VRAM);
+}
+
+static void pl_munmap(void *ptr, unsigned int size)
+{
+	psxUnmap(ptr, size, MAP_TAG_VRAM);
+}
+
 struct rearmed_cbs pl_rearmed_cbs = {
 	.pl_vout_open = vout_open,
 	.pl_vout_set_mode = vout_set_mode,
 	.pl_vout_flip = vout_flip,
 	.pl_vout_close = vout_close,
+	.mmap = pl_mmap,
+	.munmap = pl_munmap,
 	/* from psxcounters */
 	.gpu_hcnt = &hSyncCount,
 	.gpu_frame_count = &frame_counter,
@@ -119,7 +136,7 @@ void plat_trigger_vibrate(int is_strong)
 {
 }
 
-void pl_update_gun(int *xn, int *xres, int *y, int *in)
+void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
 {
 }
 
@@ -261,7 +278,7 @@ bool retro_load_game(const struct retro_game_info *info)
 		printf("could not load CD-ROM!\n");
 		return false;
 	}
-	emu_on_new_cd();
+	emu_on_new_cd(0);
 
 	return true;
 }
@@ -282,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)
@@ -374,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)