- Add ETH2GC logo.

- Update tooltip.

cube/swiss/source/devices/fsp/deviceHandler-FSP.c

@@ -298,7 +298,8 @@ bool deviceHandler_FSP_test() {
 	if(if_indextoname(1, ifname)) {
 		if(ifname[0] == 'E') {
 			__device_fsp.hwName = "ENC28J60";
-			__device_fsp.features = FEAT_READ|FEAT_WRITE;
+			__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')
 				__device_fsp.location = LOC_MEMCARD_SLOT_A;
@@ -344,7 +345,7 @@ DEVICEHANDLER_INTERFACE __device_fsp = {
 	.hwName = "Broadband Adapter",
 	.deviceName = "File Service Protocol",
 	.deviceDescription = "Configurable via the settings screen",
-	.deviceTexture = {TEX_SAMBA, 140, 64, 140, 64},
+	.deviceTexture = {TEX_BBA, 140, 64, 140, 64},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_BOOT_GCM|FEAT_THREAD_SAFE|FEAT_HYPERVISOR|FEAT_PATCHES|FEAT_AUDIO_STREAMING,
 	.emulable = EMU_READ|EMU_AUDIO_STREAMING|EMU_ETHERNET,
 	.location = LOC_SERIAL_PORT_1,

cube/swiss/source/devices/ftp/deviceHandler-FTP.c

@@ -237,6 +237,7 @@ bool deviceHandler_FTP_test() {
 	if(if_indextoname(1, ifname)) {
 		if(ifname[0] == 'E') {
 			__device_ftp.hwName = "ENC28J60";
+			__device_ftp.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
 			if(ifname[1] == '0')
 				__device_ftp.location = LOC_MEMCARD_SLOT_A;
 			else if(ifname[1] == '1')
@@ -265,7 +266,7 @@ DEVICEHANDLER_INTERFACE __device_ftp = {
 	.hwName = "Broadband Adapter",
 	.deviceName = "File Transfer Protocol",
 	.deviceDescription = "Configurable via the settings screen",
-	.deviceTexture = {TEX_SAMBA, 140, 64, 140, 64},
+	.deviceTexture = {TEX_BBA, 140, 64, 140, 64},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_THREAD_SAFE,
 	.location = LOC_SERIAL_PORT_1,
 	.initial = &initial_FTP,

cube/swiss/source/devices/smb/deviceHandler-SMB.c

@@ -242,6 +242,7 @@ bool deviceHandler_SMB_test() {
 	if(if_indextoname(1, ifname)) {
 		if(ifname[0] == 'E') {
 			__device_smb.hwName = "ENC28J60";
+			__device_smb.deviceTexture = (textureImage){TEX_ETH2GC, 64, 80, 64, 80};
 			if(ifname[1] == '0')
 				__device_smb.location = LOC_MEMCARD_SLOT_A;
 			else if(ifname[1] == '1')
@@ -270,7 +271,7 @@ DEVICEHANDLER_INTERFACE __device_smb = {
 	.hwName = "Broadband Adapter",
 	.deviceName = "SMB 1.0/CIFS",
 	.deviceDescription = "Configurable via the settings screen",
-	.deviceTexture = {TEX_SAMBA, 140, 64, 140, 64},
+	.deviceTexture = {TEX_BBA, 140, 64, 140, 64},
 	.features = FEAT_READ|FEAT_WRITE|FEAT_THREAD_SAFE,
 	.location = LOC_SERIAL_PORT_1,
 	.initial = &initial_SMB,

cube/swiss/source/gui/FrameBufferMagic.c

@@ -51,7 +51,7 @@ GXTlutObj usbgeckoTlutObj;
 GXTexObj memcardTexObj;
 GXTlutObj memcardTlutObj;
 GXTexObj memcardIndTexObj;
-GXTexObj sambaTexObj;
+GXTexObj bbaTexObj;
 GXTexObj wiikeyTexObj;
 GXTexObj systemTexObj;
 GXTexObj btnhilightTexObj;
@@ -77,6 +77,7 @@ GXTexObj fileimgTexObj;
 GXTexObj dirimgTexObj;
 GXTexObj gcloaderTexObj;
 GXTexObj m2loaderTexObj;
+GXTexObj eth2gcTexObj;
 
 static char fbTextBuffer[256];
 
@@ -330,12 +331,12 @@ static void init_textures()
 	TPL_GetTexture(&imagesTPL, gcdvdsmall, &gcdvdsmallTexObj);
 	TPL_GetTextureCI(&imagesTPL, sdsmall, &sdsmallTexObj, &sdsmallTlutObj, GX_TLUT0);
 	GX_InitTexObjUserData(&sdsmallTexObj, &sdsmallTlutObj);
-	TPL_GetTextureCI(&imagesTPL, hdd, &hddTexObj, &hddTlutObj, GX_TLUT0);
+	TPL_GetTextureCI(&imagesTPL, hddimg, &hddTexObj, &hddTlutObj, GX_TLUT0);
 	GX_InitTexObjUserData(&hddTexObj, &hddTlutObj);
-	TPL_GetTextureCI(&imagesTPL, qoob, &qoobTexObj, &qoobTlutObj, GX_TLUT0);
+	TPL_GetTextureCI(&imagesTPL, qoobimg, &qoobTexObj, &qoobTlutObj, GX_TLUT0);
 	GX_InitTexObjFilterMode(&qoobTexObj, GX_LINEAR, GX_NEAR);
 	GX_InitTexObjUserData(&qoobTexObj, &qoobTlutObj);
-	TPL_GetTexture(&imagesTPL, qoob_ind, &qoobIndTexObj);
+	TPL_GetTexture(&imagesTPL, qoobimg_ind, &qoobIndTexObj);
 	GX_InitTexObjFilterMode(&qoobIndTexObj, GX_NEAR, GX_NEAR);
 	TPL_GetTexture(&imagesTPL, wodeimg, &wodeimgTexObj);
 	TPL_GetTexture(&imagesTPL, wiikeyimg, &wiikeyTexObj);
@@ -347,7 +348,7 @@ static void init_textures()
 	GX_InitTexObjFilterMode(&memcardIndTexObj, GX_NEAR, GX_NEAR);
 	TPL_GetTextureCI(&imagesTPL, usbgeckoimg, &usbgeckoTexObj, &usbgeckoTlutObj, GX_TLUT0);
 	GX_InitTexObjUserData(&usbgeckoTexObj, &usbgeckoTlutObj);
-	TPL_GetTexture(&imagesTPL, sambaimg, &sambaTexObj);
+	TPL_GetTexture(&imagesTPL, bbaimg, &bbaTexObj);
 	TPL_GetTexture(&buttonsTPL, btnhilight, &btnhilightTexObj);
 	TPL_GetTexture(&buttonsTPL, btndevice, &btndeviceTexObj);
 	TPL_GetTexture(&buttonsTPL, btnsettings, &btnsettingsTexObj);
@@ -376,6 +377,7 @@ static void init_textures()
 	TPL_GetTexture(&imagesTPL, dirimg, &dirimgTexObj);
 	TPL_GetTexture(&imagesTPL, gcloaderimg, &gcloaderTexObj);
 	TPL_GetTexture(&imagesTPL, m2loaderimg, &m2loaderTexObj);
+	TPL_GetTexture(&imagesTPL, eth2gcimg, &eth2gcTexObj);
 }
 
 static void drawInit()
@@ -542,8 +544,8 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 			indTexObj = &memcardIndTexObj;
 			ss = 80; ts = 92;
 			break;
-		case TEX_SAMBA:
-			texObj = &sambaTexObj;
+		case TEX_BBA:
+			texObj = &bbaTexObj;
 			break;
 		case TEX_BTNHILIGHT:
 			GX_SetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO);
@@ -583,6 +585,9 @@ static void _DrawImageNow(int textureId, int x, int y, int width, int height, in
 		case TEX_M2LOADER:
 			texObj = &m2loaderTexObj;
 			break;
+		case TEX_ETH2GC:
+			texObj = &eth2gcTexObj; color = (GXColor) {216,216,216,255};
+			break;
 	}
 
 	if(!ss) ss = GX_GetTexObjWidth(texObj);

cube/swiss/source/gui/FrameBufferMagic.h

@@ -66,12 +66,13 @@ enum TextureId
 	TEX_WIIKEY,
 	TEX_SYSTEM,
 	TEX_USBGECKO,
-	TEX_SAMBA,
+	TEX_BBA,
 	TEX_CHECKED,
 	TEX_UNCHECKED,
 	TEX_STAR,
 	TEX_GCLOADER,
-	TEX_M2LOADER
+	TEX_M2LOADER,
+	TEX_ETH2GC
 };
 
 extern GXTexObj ntscjTexObj;

cube/swiss/source/gui/settings.c

@@ -97,7 +97,7 @@ static char *tooltips_game[PAGE_GAME_MAX+1] = {
 	"Digital Trigger Level:\n\nSets the threshold where the L/R Button is fully pressed.",
 	"Emulate Audio Streaming:\n\nAudio streaming is a hardware feature that allows a compressed\naudio track to be played in the background by the disc drive.\n\nEmulation is necessary for devices not attached to the\nDVD Interface, or for those not implementing it regardless.",
 	"Emulate Read Speed:\n\nNo - Start transfer immediately (default)\nYes - Delay transfer to simulate the GameCube disc drive\nWii - Delay transfer to simulate the Wii disc drive\n\nThis is necessary to avoid programming mistakes obfuscated\nby the original medium, or for speedrunning.",
-	"Emulate Broadband Adapter:\n\nOnly available with the File Service Protocol.\n\nPackets not destined for the hypervisor are forwarded to\nthe virtual MAC. The virtual MAC address is the same as\nthe physical MAC. The physical MAC/PHY retain their\nconfiguration from Swiss, including link speed.",
+	"Emulate Broadband Adapter:\n\nOnly available with the File Service Protocol or an initialised\nETH2GC module, where memory constraints permit.\n\nPackets not destined for the hypervisor are forwarded to\nthe virtual MAC. The virtual MAC address is the same as\nthe physical MAC. The physical MAC/PHY retain their\nconfiguration from Swiss, including link speed.",
 	"Prefer Clean Boot:\n\nWhen enabled, the GameCube will be reset and the game\nbooted through normal processes with no changes applied.\nRegion restrictions may be applicable.\n\nOnly available to devices attached to the DVD Interface."
 };
 

cube/swiss/source/images/images.scf

@@ -1,23 +1,24 @@
 <filepath="backdrop.png" id="backdrop" colfmt=8 palfmt=0 />
 <filepath="backdrop_ind.png" id="backdrop_ind" colfmt=3 />
+<filepath="bba.tif" id="bbaimg" colfmt=3 />
 <filepath="dir.tif" id="dirimg" colfmt=6 />
 <filepath="dol.tif" id="dolimg" colfmt=6 />
 <filepath="dolcli.tif" id="dolcliimg" colfmt=6 />
 <filepath="elf.tif" id="elfimg" colfmt=6 />
+<filepath="eth2gc.tif" id="eth2gcimg" colfmt=0 />
 <filepath="file.tif" id="fileimg" colfmt=6 />
 <filepath="gcdvdsmall.tif" id="gcdvdsmall" colfmt=3 />
 <filepath="gcloader.tif" id="gcloaderimg" colfmt=0 />
-<filepath="hdd.tif" id="hdd" colfmt=9 palfmt=0 />
+<filepath="hdd.tif" id="hddimg" colfmt=9 palfmt=0 />
 <filepath="m2loader.tif" id="m2loaderimg" colfmt=0 />
 <filepath="memcard.png" id="memcardimg" colfmt=9 palfmt=0 />
 <filepath="memcard_ind.png" id="memcardimg_ind" colfmt=1 />
 <filepath="mp3.tif" id="mp3img" colfmt=6 />
 <filepath="ntscj.tif" id="ntscjimg" colfmt=5 />
 <filepath="ntscu.tif" id="ntscuimg" colfmt=5 />
 <filepath="pal.tif" id="palimg" colfmt=5 />
-<filepath="qoob.png" id="qoob" colfmt=9 palfmt=0 />
-<filepath="qoob_ind.png" id="qoob_ind" colfmt=1 />
-<filepath="samba.tif" id="sambaimg" colfmt=3 />
+<filepath="qoob.png" id="qoobimg" colfmt=9 palfmt=0 />
+<filepath="qoob_ind.png" id="qoobimg_ind" colfmt=1 />
 <filepath="sdsmall.tif" id="sdsmall" colfmt=9 palfmt=0 />
 <filepath="systemimg.tif" id="systemimg" colfmt=3 />
 <filepath="usbgecko.tif" id="usbgeckoimg" colfmt=9 palfmt=0 />

cube/swiss/source/swiss.c

@@ -35,6 +35,7 @@
 #include "info.h"
 #include "httpd.h"
 #include "exi.h"
+#include "bba.h"
 #include "patcher.h"
 #include "dvd.h"
 #include "elf.h"