From: Twinaphex <libretro@gmail.com>
Date: Sat, 14 Dec 2019 18:09:16 +0000 (+0100)
Subject: Merge pull request #368 from negativeExponent/memmap
X-Git-Tag: r24l~689
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f4c0ee2cf547eefd91aa2e11439bad2ceb35e0;hp=-c;p=pcsx_rearmed.git

Merge pull request #368 from negativeExponent/memmap

Access psx main memory using retro_memory_map
---

d0f4c0ee2cf547eefd91aa2e11439bad2ceb35e0
diff --combined frontend/libretro.c
index 4d490875,7d6d8d48..d63f1268
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@@ -1052,6 -1052,20 +1052,20 @@@ strcasestr(const char *s, const char*fi
  }
  #endif
  
+ static void set_retro_memmap(void)
+ {
+ 	struct retro_memory_map retromap = { 0 };
+ 	struct retro_memory_descriptor mmap =
+ 	{
+ 		0, psxM, 0, 0, 0, 0, 0x200000
+ 	};
+ 
+ 	retromap.descriptors = &mmap;
+ 	retromap.num_descriptors = 1;
+ 
+     environ_cb(RETRO_ENVIRONMENT_SET_MEMORY_MAPS, &retromap);
+ }
+ 
  bool retro_load_game(const struct retro_game_info *info)
  {
  	size_t i;
@@@ -1313,6 -1327,8 +1327,8 @@@
  		}
  	}
  
+ 	set_retro_memmap();
+ 
  	return true;
  }
  
@@@ -1614,16 -1630,6 +1630,16 @@@ static void update_variables(bool in_fl
           Config.Cdda = 0;
     }
  
 +   var.value = NULL;
 +   var.key = "pcsx_rearmed_spuirq";
 +   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
 +   {
 +      if (strcmp(var.value, "disabled") == 0)
 +         Config.SpuIrq = 0;
 +      else
 +         Config.SpuIrq = 1;
 +   }
 +
  #ifndef DRC_DISABLE
     var.value = NULL;
     var.key = "pcsx_rearmed_nosmccheck";