From 76e889bcfaf9776b071627e7e8c9bff0465f539c Mon Sep 17 00:00:00 2001
From: meepingsnesroms
Date: Fri, 7 Apr 2017 09:14:29 -0700
Subject: Remove dead non retroarch platforms, prepare for second memcard

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

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4d56356..bf94f16 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -64,6 +64,7 @@ static int is_pal_mode;
 
 /* memory card data */
 extern char Mcd1Data[MCD_SIZE];
+extern char Mcd2Data[MCD_SIZE];
 extern char McdDisable[2];
 
 /* PCSX ReARMed core calls and stuff */
@@ -1711,6 +1712,7 @@ void retro_init(void)
 	McdDisable[0] = 0;
 	McdDisable[1] = 1;
 	init_memcard(Mcd1Data);
+   init_memcard(Mcd2Data);
 
 	SaveFuncs.open = save_open;
 	SaveFuncs.read = save_read;
-- 
cgit v1.2.3


From 646a63e41c53e5c1c971a4e305d4627dcee43c5e Mon Sep 17 00:00:00 2001
From: meepingsnesroms
Date: Fri, 7 Apr 2017 10:10:32 -0700
Subject: Move dummy functions

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

(limited to 'frontend/libretro.c')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index bf94f16..9a3f070 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -83,6 +83,15 @@ int in_enable_vibration = 1;
 #define VOUT_MAX_WIDTH 1024
 #define VOUT_MAX_HEIGHT 512
 
+//Dummy functions
+bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info){return false;}
+void retro_unload_game(void){}
+static int vout_open(void){return 0;}
+static void vout_close(void){}
+static int snd_init(void){return 0;}
+static void snd_finish(void){}
+static int snd_busy(void){return 0;}
+
 static void init_memcard(char *mcd_data)
 {
 	unsigned off = 0;
@@ -116,11 +125,6 @@ static void init_memcard(char *mcd_data)
 	}
 }
 
-static int vout_open(void)
-{
-	return 0;
-}
-
 static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp)
 {
 	vout_width = w;
@@ -199,10 +203,6 @@ out:
 	pl_rearmed_cbs.flip_cnt++;
 }
 
-static void vout_close(void)
-{
-}
-
 #ifdef _3DS
 typedef struct
 {
@@ -408,20 +408,6 @@ void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in)
 }
 
 /* sound calls */
-static int snd_init(void)
-{
-	return 0;
-}
-
-static void snd_finish(void)
-{
-}
-
-static int snd_busy(void)
-{
-	return 0;
-}
-
 static void snd_feed(void *buf, int bytes)
 {
 	if (audio_batch_cb != NULL)
@@ -1277,15 +1263,6 @@ bool retro_load_game(const struct retro_game_info *info)
 	return true;
 }
 
-bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info)
-{
-	return false;
-}
-
-void retro_unload_game(void)
-{
-}
-
 unsigned retro_get_region(void)
 {
 	return is_pal_mode ? RETRO_REGION_PAL : RETRO_REGION_NTSC;
-- 
cgit v1.2.3