- Adjust for libogc2 changes.

emukidid · Mar 29, 2024 · 2f58c5f · 2f58c5f
1 parent 5e3c515
commit 2f58c5f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/cube/swiss/source/bba.c b/cube/swiss/source/bba.c
@@ -70,6 +70,7 @@ bool bba_exists(u32 location)
 	if ((location & LOC_SERIAL_PORT_1) && EXI_GetID(EXI_CHANNEL_0, EXI_DEVICE_2, &id)) {
 		switch (id) {
 			case EXI_MX98730EC_ID:
+			case EXI_ENC28J60_ID:
 				return true;
 		}
 	}

diff --git a/cube/swiss/source/devices/fsp/deviceHandler-FSP.c b/cube/swiss/source/devices/fsp/deviceHandler-FSP.c
@@ -301,10 +301,12 @@ bool deviceHandler_FSP_test() {
 			__device_fsp.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
 			__device_fsp.features = FEAT_READ|FEAT_WRITE|FEAT_THREAD_SAFE;
 			__device_fsp.emulable = EMU_NONE;
-			if(ifname[1] == '0')
+			if(ifname[1] == 'A')
 				__device_fsp.location = LOC_MEMCARD_SLOT_A;
-			else if(ifname[1] == '1')
+			else if(ifname[1] == 'B')
 				__device_fsp.location = LOC_MEMCARD_SLOT_B;
+			else if(ifname[1] == '1')
+				__device_fsp.location = LOC_SERIAL_PORT_1;
 			else if(ifname[1] == '2')
 				__device_fsp.location = LOC_SERIAL_PORT_2;
 		}

diff --git a/cube/swiss/source/devices/ftp/deviceHandler-FTP.c b/cube/swiss/source/devices/ftp/deviceHandler-FTP.c
@@ -238,10 +238,12 @@ bool deviceHandler_FTP_test() {
 		if(ifname[0] == 'E') {
 			__device_ftp.hwName = "ENC28J60";
 			__device_ftp.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
-			if(ifname[1] == '0')
+			if(ifname[1] == 'A')
 				__device_ftp.location = LOC_MEMCARD_SLOT_A;
-			else if(ifname[1] == '1')
+			else if(ifname[1] == 'B')
 				__device_ftp.location = LOC_MEMCARD_SLOT_B;
+			else if(ifname[1] == '1')
+				__device_ftp.location = LOC_SERIAL_PORT_1;
 			else if(ifname[1] == '2')
 				__device_ftp.location = LOC_SERIAL_PORT_2;
 		}

diff --git a/cube/swiss/source/devices/smb/deviceHandler-SMB.c b/cube/swiss/source/devices/smb/deviceHandler-SMB.c
@@ -243,10 +243,12 @@ bool deviceHandler_SMB_test() {
 		if(ifname[0] == 'E') {
 			__device_smb.hwName = "ENC28J60";
 			__device_smb.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
-			if(ifname[1] == '0')
+			if(ifname[1] == 'A')
 				__device_smb.location = LOC_MEMCARD_SLOT_A;
-			else if(ifname[1] == '1')
+			else if(ifname[1] == 'B')
 				__device_smb.location = LOC_MEMCARD_SLOT_B;
+			else if(ifname[1] == '1')
+				__device_smb.location = LOC_SERIAL_PORT_1;
 			else if(ifname[1] == '2')
 				__device_smb.location = LOC_SERIAL_PORT_2;
 		}