From e288923db915ae8e0facd2fe0be8ed866b4f2373 Mon Sep 17 00:00:00 2001
From: alexis-puska
Date: Sat, 18 Jun 2016 14:01:50 +0200
Subject: suppress hack for crazy value on read port 2

pass pad index in pad datas structure.
---
 frontend/plugin.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'frontend')

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 5663e6d..8914519 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,7 +49,8 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad, int pad_index) {
+static long PADreadPort1(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
     if (multitap1 == 1)
@@ -67,12 +68,9 @@ static long PADreadPort1(PadDataS *pad, int pad_index) {
     return 0;
 }
 
-static long PADreadPort2(PadDataS *pad, int pad_index) {
-    /* Temporary hack to avoid segfault when pad_index is a crazy number */
-    if (pad_index <= 1 || pad_index > 8) {
-        pad_index = 1;
-    }
-
+static long PADreadPort2(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+    
     pad->controllerType = in_type[pad_index];
     pad->buttonStatus = ~in_keystate[pad_index];
     if (multitap2 ==1 )
-- 
cgit v1.2.3