- Apply appropriate graphics for ETH2GC Netcard+.

emukidid · Dec 19, 2024 · dcd2c2d · dcd2c2d
1 parent bf92c89
commit dcd2c2d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/cube/swiss/source/devices/fat/deviceHandler-FAT.c b/cube/swiss/source/devices/fat/deviceHandler-FAT.c
@@ -437,8 +437,10 @@ bool deviceHandler_FAT_test_sd_b() {
 	if (ret) {
 		if (sdgecko_getTransferMode(1) == CARDIO_TRANSFER_DMA)
 			__device_sd_b.hwName = "Semi-Passive SD Card Adapter";
-		else
+		else if (sdgecko_getDevice(1) == EXI_DEVICE_0)
 			__device_sd_b.hwName = "Passive SD Card Adapter";
+		else
+			__device_sd_b.hwName = "ETH2GC Netcard+";
 	}
 	return ret;
 }

diff --git a/cube/swiss/source/devices/fsp/deviceHandler-FSP.c b/cube/swiss/source/devices/fsp/deviceHandler-FSP.c
@@ -290,9 +290,14 @@ bool deviceHandler_FSP_test() {
 	}
 	switch (bba_exists(LOC_ANY)) {
 		case LOC_MEMCARD_SLOT_A:
-		case LOC_MEMCARD_SLOT_B:
 			__device_fsp.deviceTexture = (textureImage){TEX_GCNET, 65, 84, 72, 88};
 			return true;
+		case LOC_MEMCARD_SLOT_B:
+			if (sdgecko_getDevice(1) == EXI_DEVICE_0)
+				__device_fsp.deviceTexture = (textureImage){TEX_GCNET, 65, 84, 72, 88};
+			else
+				__device_fsp.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
+			return true;
 		case LOC_SERIAL_PORT_1:
 			__device_fsp.deviceTexture = (textureImage){TEX_BBA, 140, 64, 140, 64};
 			return true;

diff --git a/cube/swiss/source/devices/ftp/deviceHandler-FTP.c b/cube/swiss/source/devices/ftp/deviceHandler-FTP.c
@@ -255,9 +255,14 @@ bool deviceHandler_FTP_test() {
 
 	switch (bba_exists(LOC_ANY)) {
 		case LOC_MEMCARD_SLOT_A:
-		case LOC_MEMCARD_SLOT_B:
 			__device_ftp.deviceTexture = (textureImage){TEX_GCNET, 65, 84, 72, 88};
 			return true;
+		case LOC_MEMCARD_SLOT_B:
+			if (sdgecko_getDevice(1) == EXI_DEVICE_0)
+				__device_ftp.deviceTexture = (textureImage){TEX_GCNET, 65, 84, 72, 88};
+			else
+				__device_ftp.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
+			return true;
 		case LOC_SERIAL_PORT_1:
 			__device_ftp.deviceTexture = (textureImage){TEX_BBA, 140, 64, 140, 64};
 			return true;

diff --git a/cube/swiss/source/devices/smb/deviceHandler-SMB.c b/cube/swiss/source/devices/smb/deviceHandler-SMB.c
@@ -260,9 +260,14 @@ bool deviceHandler_SMB_test() {
 
 	switch (bba_exists(LOC_ANY)) {
 		case LOC_MEMCARD_SLOT_A:
-		case LOC_MEMCARD_SLOT_B:
 			__device_smb.deviceTexture = (textureImage){TEX_GCNET, 65, 84, 72, 88};
 			return true;
+		case LOC_MEMCARD_SLOT_B:
+			if (sdgecko_getDevice(1) == EXI_DEVICE_0)
+				__device_smb.deviceTexture = (textureImage){TEX_GCNET, 65, 84, 72, 88};
+			else
+				__device_smb.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
+			return true;
 		case LOC_SERIAL_PORT_1:
 			__device_smb.deviceTexture = (textureImage){TEX_BBA, 140, 64, 140, 64};
 			return true;