X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=37cccc4fedef6da879a85063766e48d38929d85c;hb=e2b5e7aa45f75cd13ef238fa4ff9516891dabef5;hp=47f07a63ba589fba6cbf02e5a003093d8dfce1ad;hpb=4e47706596441172d1cc3f203b8baa398cea3023;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 47f07a63..37cccc4f 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2012
+ * (C) notaz, 2012,2014,2015
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -25,6 +25,7 @@
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
+#include "arm_features.h"
 #include "revision.h"
 #include "libretro.h"
 
@@ -197,7 +198,7 @@ void pl_timing_prepare(int is_pal)
 	is_pal_mode = is_pal;
 }
 
-void plat_trigger_vibrate(int pad, uint32_t low, uint32_t high)
+void plat_trigger_vibrate(int pad, int low, int high)
 {
     rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8);
     rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0);
@@ -283,7 +284,7 @@ void retro_get_system_info(struct retro_system_info *info)
 {
 	memset(info, 0, sizeof(*info));
 	info->library_name = "PCSX-ReARMed";
-	info->library_version = "r19";
+	info->library_version = "r22";
 	info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u";
 	info->need_fullpath = true;
 }
@@ -303,8 +304,9 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 /* savestates */
 size_t retro_serialize_size(void) 
 { 
-	// it's currently 4380651 bytes, but have some reserved for future
-	return 0x430000;
+	// it's currently 4380651-4397047 bytes,
+	// but have some reserved for future
+	return 0x440000;
 }
 
 struct save_fp {
@@ -601,7 +603,7 @@ static void extract_directory(char *buf, const char *path, size_t size)
    }
 }
 
-#ifdef __QNX__
+#if defined(__QNX__) || defined(_WIN32)
 /* Blackberry QNX doesn't have strcasestr */
 
 /*
@@ -1248,11 +1250,12 @@ void retro_init(void)
 	/* 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. */
-#if !defined(__arm__) || defined(__ARM_ARCH_7A__)
 	cycle_multiplier = 175;
-#else
+#ifdef HAVE_PRE_ARMV7
 	cycle_multiplier = 200;
 #endif
+	pl_rearmed_cbs.gpu_peops.iUseDither = 1;
+	spu_config.iUseFixedUpdates = 1;
 
 	McdDisable[0] = 0;
 	McdDisable[1] = 1;