From: kub <derkub@gmail.com>
Date: Mon, 17 Feb 2025 22:41:52 +0000 (+0100)
Subject: platform ps2, improve pad detection
X-Git-Tag: v2.04~47
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22103e71494536294947716acdbc198988530c68;p=picodrive.git

platform ps2, improve pad detection
---

diff --git a/platform/ps2/in_ps2.c b/platform/ps2/in_ps2.c
index a8014c79..5ddf0e9a 100644
--- a/platform/ps2/in_ps2.c
+++ b/platform/ps2/in_ps2.c
@@ -229,6 +229,7 @@ static const in_drv_t in_ps2_drv = {
 void in_ps2_init(struct in_default_bind *defbinds)
 {
 	int i, j;
+	int st, tm;
 
 	for (j = 0; j < 2 && padMapped < 4; j++) {
 		mtapPortOpen(j);
@@ -236,9 +237,15 @@ void in_ps2_init(struct in_default_bind *defbinds)
 		for (i = 0; i < 4 && padMapped < 4; i++) {
 			padBuf[j][i] = memalign(64, 256);
 			if (padPortOpen(j, i, padBuf[j][i])) {
-				padMap[padMapped][0] = j;
-				padMap[padMapped][1] = i;
-				padMapped++;
+				tm = 10;
+				do { usleep(100000); st = padGetState(j, i); }
+				while (st > PAD_STATE_DISCONN && st < PAD_STATE_STABLE && --tm >= 0);
+				if (st == PAD_STATE_STABLE) {
+					padMap[padMapped][0] = j;
+					padMap[padMapped][1] = i;
+					padMapped++;
+				} else
+					padPortClose(j, i);
 			} else
 				free(padBuf[j][i]);
 		}