From c0a95d8bbb2eae00e6966122abb76cf0f0f1681b Mon Sep 17 00:00:00 2001
From: Extrems <metaradil@gmail.com>
Date: Thu, 13 Jun 2024 14:53:57 -0400
Subject: [PATCH] Retry until we read the same ID twice

---
 libogc/exi.c        | 14 +++++++++++---
 libogc/sdgecko_io.c |  3 +--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/libogc/exi.c b/libogc/exi.c
index ab0f0767..f5c7f883 100644
--- a/libogc/exi.c
+++ b/libogc/exi.c
@@ -604,7 +604,7 @@ s32 EXI_GetID(s32 nChn,s32 nDev,u32 *nId)
 {
 	u64 idtime = 0;
 	s32 ret,lck;
-	u32 level;
+	u32 level,cnt,id;
 	exibus_priv *exi = &eximap[nChn];
 
 	if(nChn==EXI_CHANNEL_0 && nDev==EXI_DEVICE_2 && exi_id_serport1!=0) {
@@ -642,7 +642,14 @@ s32 EXI_GetID(s32 nChn,s32 nDev,u32 *nId)
 	else ret = EXI_Lock(nChn,nDev,NULL);
 
 	if(ret) {
-		ret = EXI_GetIDEx(nChn,nDev,nId);
+		id = 0xffffffff;
+		cnt = 0;
+		while(cnt<10) {
+			if((ret=EXI_GetIDEx(nChn,nDev,nId))==0) break;
+			if(id==*nId) break;
+			id = *nId;
+			cnt++;
+		}
 		EXI_Unlock(nChn);
 	}
 
@@ -680,9 +687,10 @@ s32 EXI_GetIDEx(s32 nChn,s32 nDev,u32 *nId)
 
 	ret = 0;
 	reg = 0;
+	*nId = 0;
 	if(EXI_Imm(nChn,&reg,2,EXI_WRITE,NULL)==0) ret |= 0x01;
 	if(EXI_Sync(nChn)==0) ret |= 0x02;
-	if(EXI_Imm(nChn,nId,4,EXI_READ,NULL)==0) ret |= 0x04;
+	if(EXI_Imm(nChn,nId,4,EXI_READWRITE,NULL)==0) ret |= 0x04;
 	if(EXI_Sync(nChn)==0) ret |= 0x08;
 	if(EXI_Deselect(nChn)==0) ret |= 0x10;
 
diff --git a/libogc/sdgecko_io.c b/libogc/sdgecko_io.c
index d898b1c4..82ea7e07 100644
--- a/libogc/sdgecko_io.c
+++ b/libogc/sdgecko_io.c
@@ -1196,11 +1196,10 @@ static bool __card_check(s32 drv_no)
 	s32 ret;
 	
 	if(drv_no<0 || drv_no>=MAX_DRIVE) return FALSE;
-	if(drv_no==2) return TRUE;
 #ifdef _CARDIO_DEBUG	
 	printf("__card_check(%d)\n",drv_no);
 #endif
-	if(_ioCardSelect[drv_no]!=EXI_DEVICE_0) {
+	if(drv_no==2 || _ioCardSelect[drv_no]!=EXI_DEVICE_0) {
 		if(EXI_GetID(drv_no,_ioCardSelect[drv_no],&id)==0) return FALSE;
 		if(id!=0xffffffff) return FALSE;
 		return TRUE;