From 63c67f71858d20fda2fb30bcc02351b5c071bc42 Mon Sep 17 00:00:00 2001
From: lr <1234@qq.com>
Date: Thu, 16 May 2024 14:27:44 +0800
Subject: [PATCH] modify arch

---
 .../net/net_server/{ => include}/arch/cc.h         | 14 ++------------
 .../net/net_server/{ => include}/arch/ethernetif.c |  0
 .../net/net_server/{ => include}/arch/ethernetif.h |  0
 .../net/net_server/{ => include}/arch/lwipopts.h   |  0
 .../net/net_server/{ => include}/arch/perf.h       |  0
 .../XiZi_AIoT/services/net/net_server/lwip.mk      |  4 +++-
 .../services/net/net_server/lwip_server.c          |  7 ++++---
 7 files changed, 9 insertions(+), 16 deletions(-)
 rename Ubiquitous/XiZi_AIoT/services/net/net_server/{ => include}/arch/cc.h (88%)
 rename Ubiquitous/XiZi_AIoT/services/net/net_server/{ => include}/arch/ethernetif.c (100%)
 rename Ubiquitous/XiZi_AIoT/services/net/net_server/{ => include}/arch/ethernetif.h (100%)
 rename Ubiquitous/XiZi_AIoT/services/net/net_server/{ => include}/arch/lwipopts.h (100%)
 rename Ubiquitous/XiZi_AIoT/services/net/net_server/{ => include}/arch/perf.h (100%)

diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/cc.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h
similarity index 88%
rename from Ubiquitous/XiZi_AIoT/services/net/net_server/arch/cc.h
rename to Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h
index 76d9c3a0b..d724aaeff 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/cc.h
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/cc.h
@@ -32,7 +32,8 @@
 #ifndef LWIP_ARCH_CC_H
 #define LWIP_ARCH_CC_H
 
-#include "stdio.h"
+// #include "stdio.h"
+
 
 //typedef unsigned   char    u8_t;
 //typedef signed     char    s8_t;
@@ -88,15 +89,4 @@
 
 #define LWIP_RAND() ((u32_t)rand())
 
-static inline u32_t sys_jiffies(void)
-{
-    // lwip_sys_now = CurrentTicksGain();
-    // return lwip_sys_now;
-}
-
-static inline u32_t sys_now(void)
-{
-    // lwip_sys_now = CurrentTicksGain();
-    // return CalculateTimeMsFromTick(lwip_sys_now);
-}
 #endif /* LWIP_ARCH_CC_H */
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/ethernetif.c b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/ethernetif.c
similarity index 100%
rename from Ubiquitous/XiZi_AIoT/services/net/net_server/arch/ethernetif.c
rename to Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/ethernetif.c
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/ethernetif.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/ethernetif.h
similarity index 100%
rename from Ubiquitous/XiZi_AIoT/services/net/net_server/arch/ethernetif.h
rename to Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/ethernetif.h
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/lwipopts.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/lwipopts.h
similarity index 100%
rename from Ubiquitous/XiZi_AIoT/services/net/net_server/arch/lwipopts.h
rename to Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/lwipopts.h
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/arch/perf.h b/Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/perf.h
similarity index 100%
rename from Ubiquitous/XiZi_AIoT/services/net/net_server/arch/perf.h
rename to Ubiquitous/XiZi_AIoT/services/net/net_server/include/arch/perf.h
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk
index 41123bf16..29fab7380 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip.mk
@@ -1,7 +1,7 @@
 ifeq ($(BOARD), imx6q-sabrelite)
 toolchain ?= arm-none-eabi-
 user_ldflags = -N -Ttext 0
-cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie
+cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -ffreestanding -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie
 endif
 ifeq ($(BOARD), zynq7000-zc702)
 toolchain ?= arm-xilinx-eabi-
@@ -16,6 +16,8 @@ objdump = ${toolchain}objdump
 c_useropts = -O2
 
 INC_DIR = 	-I$(KERNEL_ROOT)/services/net/libnet \
+			-I$(KERNEL_ROOT)/services/net/net_server/include/arch \
+			-I$(KERNEL_ROOT)/services/net/net_server/include \
 			-I$(KERNEL_ROOT)/services/net/net_server/include/lwip \
 			-I$(KERNEL_ROOT)/services/net/net_server/include/netif \
 			-I$(KERNEL_ROOT)/services/net/net_server/include/compat \
diff --git a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip_server.c b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip_server.c
index 4062eb8c0..4b698820c 100644
--- a/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip_server.c
+++ b/Ubiquitous/XiZi_AIoT/services/net/net_server/lwip_server.c
@@ -15,11 +15,12 @@
 #include "usyscall.h"
 #include "lwip_service.h"
 
+#include "lwip/init.h"
+#include "lwip/ip4_addr.h"
+#include "lwip/netif.h"
 
-#include "ethernet.h"
+static struct netif gnetif;
 
-
-struct netif gnetif;
 int IPC_DO_SERVE_FUNC(Ipc_LWIP_init)(char* ip, char* mask, char* gw){
 
     ip4_addr_t net_ipaddr, net_netmask, net_gw;