iop/pctip(LwIP): make conpile with LwIP 2.2

rickgaiser · Jan 17, 2024 · 50a8d48 · 50a8d48
1 parent 207a7dd
commit 50a8d48
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/iop/tcpip/tcpip/Makefile b/iop/tcpip/tcpip/Makefile
@@ -32,10 +32,10 @@ ifdef PS2IP_DNS
 IOP_CFLAGS += -DPS2IP_DNS
 endif
 
-IOP_INCS += -I$(LWIP)/src/include -I$(LWIP)/src/include/ipv4 -I$(PS2IP_BASE)/include
+IOP_INCS += -I$(LWIP)/src/include -I$(LWIP)/src/include/ipv4 -I$(PS2IP_BASE)/include -I$(PS2SDKSRC)/iop/kernel/include
 
 ps2api_OBJECTS = api_lib.o api_msg.o api_netbuf.o err.o sockets.o tcpip.o
-ps2api_IPV4 = icmp.o ip.o ip4.o ip4_addr.o ip4_frag.o inet_chksum.o
+ps2api_IPV4 = icmp.o ip.o ip4.o ip4_addr.o ip4_frag.o inet_chksum.o acd.o
 ps2ip_OBJECTS = sys.o lwip_init.o mem.o netif.o pbuf.o stats.o tcp_in.o tcp_out.o udp.o memp.o tcp.o ethernet.o etharp.o raw.o def.o timeouts.o $(ps2api_IPV4) $(ps2api_OBJECTS)
 
 ifdef PS2IP_DHCP
@@ -87,6 +87,9 @@ $(IOP_OBJS_DIR)icmp.o: $(LWIP)/src/core/ipv4/icmp.c
 $(IOP_OBJS_DIR)ip.o: $(LWIP)/src/core/ip.c
 	$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
 
+$(IOP_OBJS_DIR)acd.o: $(LWIP)/src/core/ipv4/acd.c
+	$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
+
 $(IOP_OBJS_DIR)ip4.o: $(LWIP)/src/core/ipv4/ip4.c
 	$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
 
@@ -165,4 +168,3 @@ $(IOP_OBJS_DIR)udp.o: $(LWIP)/src/core/udp.c
 
 $(IOP_OBJS_DIR)sys_arch.o: $(PS2IP_BASE)/sys_arch.c
 	$(IOP_CC) $(IOP_CFLAGS) -c $< -o $@
-
diff --git a/iop/tcpip/tcpip/src/exports.tab b/iop/tcpip/tcpip/src/exports.tab
@@ -67,6 +67,6 @@ DECLARE_EXPORT_TABLE(ps2ip, 2, 6)
 #endif
 	DECLARE_EXPORT(netif_set_link_up)
 	DECLARE_EXPORT(netif_set_link_down)	//55
-	DECLARE_EXPORT(tcpip_callback_with_block)
+	DECLARE_EXPORT(_retonly) // tcpip_callback_with_block
 	DECLARE_EXPORT(pbuf_coalesce)
 END_EXPORT_TABLE
diff --git a/iop/tcpip/tcpip/src/imports.lst b/iop/tcpip/tcpip/src/imports.lst
@@ -52,8 +52,11 @@ I_strncmp
 I_strtok
 I_strtoul
 I_memcmp
+I_memmove
 I_strtol
 I_strcmp
+I_look_ctype_table
+I_tolower
 sysclib_IMPORTS_end
 
 sysmem_IMPORTS_start

diff --git a/iop/tcpip/tcpip/src/ps2ip.c b/iop/tcpip/tcpip/src/ps2ip.c
@@ -51,6 +51,9 @@ static int		iTimerDHCP=0;
 #endif	//defined(PS2IP_DHCP)
 #endif
 
+int errno = 0;
+err_t sys_mbox_trypost_fromisr(sys_mbox_t *mbox, void *msg) {return 0;}
+
 int
 ps2ip_getconfig(char* pszName,t_ip_info* pInfo)
 {