Add W6300 device driver

Author: Extrems

Makefile

@@ -128,7 +128,7 @@ LWIPOBJ		:=	network.o netio.o gcif.o	\
 			sys.o tcp.o tcp_in.o tcp_out.o	\
 			udp.o icmp.o ip.o ip_frag.o		\
 			ip_addr.o etharp.o loopif.o		\
-			enc28j60if.o w5500if.o w6100if.o
+			enc28j60if.o w5500if.o w6x00if.o
 
 #---------------------------------------------------------------------------------
 OGCOBJ		:=	\

gc/netif/w6100if.h gc/netif/w6x00if.hgc/netif/w6100if.h renamed to gc/netif/w6x00if.h

@@ -1,8 +1,8 @@
 /*-------------------------------------------------------------
 
-w6100if.h -- W6100 device driver
+w6x00if.h -- W6X00 device driver
 
-Copyright (C) 2024 Extrems' Corner.org
+Copyright (C) 2024 - 2025 Extrems' Corner.org
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any
@@ -25,11 +25,11 @@ distribution.
 
 -------------------------------------------------------------*/
 
-#ifndef __NETIF_W6100IF_H__
-#define __NETIF_W6100IF_H__
+#ifndef __NETIF_W6X00IF_H__
+#define __NETIF_W6X00IF_H__
 
 #include "lwip/netif.h"
 
-err_t w6100if_init(struct netif *netif);
+err_t w6x00if_init(struct netif *netif);
 
-#endif /* __NETIF_W6100IF_H__ */
+#endif /* __NETIF_W6X00IF_H__ */

libogc/exi.c

@@ -784,8 +784,6 @@ char *EXI_GetTypeString(u32 nType)
 			return "GDEV";
 		case 0x02020000:
 			return "Modem";
-		case 0x03000000:
-			return "WIZnet";
 		case 0x03010000:
 			return "Marlin";
 		case 0x04120000:
@@ -817,6 +815,9 @@ char *EXI_GetTypeString(u32 nType)
 			return "IDE-EXI";
 		case 0xfa050000:
 			return "ENC28J60";
+		case 0x03000000:
+		case 0xff800000:
+			return "WIZnet";
 		default:
 			return "Unknown";
 	}

lwip/netif/enc28j60if.c

@@ -43,6 +43,8 @@ distribution.
 
 static vu32 *const _piReg = (u32 *)0xCC003000;
 
+#define ENC28J60_CID (0xFA050000)
+
 #define ENC28J60_CMD_RCR(x) ((0x00 | ((x) & 0x1F)) << 24) // Read Control Register
 #define ENC28J60_CMD_RBM    ((0x3A) << 24)                // Read Buffer Memory
 #define ENC28J60_CMD_WCR(x) ((0x40 | ((x) & 0x1F)) << 24) // Write Control Register
@@ -601,7 +603,7 @@ static bool ENC28J60_Init(s32 chan, s32 dev, struct enc28j60if *enc28j60if)
 	CurrBank[chan] = 0;
 	usleep(1000);
 
-	if (!EXI_GetIDEx(chan, dev, &id) || id != 0xFA050000 ||
+	if (!EXI_GetIDEx(chan, dev, &id) || id != ENC28J60_CID ||
 		!ENC28J60_ReadPHYReg(chan, ENC28J60_PHID1, &phid1) || phid1 != 0x0083 ||
 		!ENC28J60_ReadPHYReg(chan, ENC28J60_PHID2, &phid2) || phid2 != 0x1400) {
 		if (chan < EXI_CHANNEL_2 && dev == EXI_DEVICE_0)

lwip/netif/w5500if.c

@@ -39,6 +39,8 @@ distribution.
 
 static vu32 *const _piReg = (u32 *)0xCC003000;
 
+#define W5500_CID (0x03000000)
+
 #define W5500_BSB(x)         (((x) & 0x1F) << 27) // Block Select Bits
 #define W5500_RWB                       (1 << 26) // Read/Write Access Mode Bit
 #define W5500_OM(x)           (((x) & 0x3) << 24) // SPI Operation Mode Bits
@@ -351,7 +353,7 @@ static bool W5500_WriteCmd(s32 chan, u32 cmd, const void *buf, u32 len)
 {
 	bool err = false;
 
-	cmd |= W5500_RWB;
+	cmd |=  W5500_RWB;
 	cmd  = (cmd << 16) | (cmd >> 16);
 
 	if (!EXI_Select(chan, Dev[chan], EXI_SPEED32MHZ))
@@ -564,14 +566,15 @@ static bool W5500_Init(s32 chan, s32 dev, struct w5500if *w5500if)
 		LWP_ThreadSleep(w5500if->unlockQueue);
 	IRQ_Restore(level);
 
-	if (!EXI_GetID(chan, dev, &id) || id != 0x03000000) {
+	if (!EXI_GetID(chan, dev, &id) || id != W5500_CID) {
 		if (chan < EXI_CHANNEL_2 && dev == EXI_DEVICE_0)
 			EXI_Detach(chan);
 		EXI_Unlock(chan);
 		return false;
 	}
 
 	Dev[chan] = dev;
+
 	if (!W5500_ReadReg(chan, W5500_VERSIONR, &versionr) || versionr != 0x04) {
 		if (chan < EXI_CHANNEL_2 && dev == EXI_DEVICE_0)
 			EXI_Detach(chan);

lwip/netif/w6100if.c

@@ -29,7 +29,7 @@
 #include <netif/gcif/gcif.h>
 #include <netif/loopif.h>
 #include <netif/w5500if.h>
-#include <netif/w6100if.h>
+#include <netif/w6x00if.h>
 
 #include <sys/iosupport.h>
 
@@ -1517,7 +1517,7 @@ s32 if_configex(struct in_addr *local_ip,struct in_addr *netmask,struct in_addr
 	hbba = bba_create(&g_hNetIF);
 	pnet = netif_add(&g_hNetIF,&loc_ip,&mask,&gw,hbba,bba_init,net_input);
 	if(!pnet)
-		pnet = netif_add(&g_hNetIF,&loc_ip,&mask,&gw,NULL,w6100if_init,net_input);
+		pnet = netif_add(&g_hNetIF,&loc_ip,&mask,&gw,NULL,w6x00if_init,net_input);
 	if(!pnet)
 		pnet = netif_add(&g_hNetIF,&loc_ip,&mask,&gw,NULL,w5500if_init,net_input);
 	if(!pnet)