From 4e47706596441172d1cc3f203b8baa398cea3023 Mon Sep 17 00:00:00 2001
From: ksv1986
Date: Sat, 29 Nov 2014 17:15:37 +0300
Subject: libretro: Add rumble support

Conflicts:
	frontend/libretro.c
---
 include/psemu_plugin_defs.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'include/psemu_plugin_defs.h')

diff --git a/include/psemu_plugin_defs.h b/include/psemu_plugin_defs.h
index 3926ccd..0805f4a 100644
--- a/include/psemu_plugin_defs.h
+++ b/include/psemu_plugin_defs.h
@@ -205,7 +205,11 @@ typedef struct
 	// values are in range -128 - 127
 	unsigned char moveX, moveY;
 
-	unsigned char reserved[91];
+    uint8_t Vib[2];
+
+    volatile uint8_t VibF[2];
+
+    unsigned char reserved[87];
 
 } PadDataS;
 
-- 
cgit v1.2.3


From d71c709541218f67ab32229b03307b045a8ed6cb Mon Sep 17 00:00:00 2001
From: notaz
Date: Sat, 20 Dec 2014 20:26:22 +0200
Subject: fix up other platforms after rumble change

---
 include/psemu_plugin_defs.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include/psemu_plugin_defs.h')

diff --git a/include/psemu_plugin_defs.h b/include/psemu_plugin_defs.h
index 0805f4a..9986654 100644
--- a/include/psemu_plugin_defs.h
+++ b/include/psemu_plugin_defs.h
@@ -205,11 +205,10 @@ typedef struct
 	// values are in range -128 - 127
 	unsigned char moveX, moveY;
 
-    uint8_t Vib[2];
+	unsigned char Vib[2];
+	unsigned char VibF[2];
 
-    volatile uint8_t VibF[2];
-
-    unsigned char reserved[87];
+	unsigned char reserved[87];
 
 } PadDataS;
 
-- 
cgit v1.2.3