From 7cbd456d22ab1d8a0280caaed6b684bcadff941a Mon Sep 17 00:00:00 2001
From: zhangzheng <1358745329@qq.com>
Date: Mon, 22 Jan 2024 23:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96net=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |   3 +-
 mkrtos_knl/knl/log.c                          |   2 +
 mkrtos_script/stm32f1/stm32f103z.repl         |   3 +
 .../server/drv/dm9000_drv/src/dm9000.c        | 143 ++++--
 .../server/drv/dm9000_drv/src/heap_stack.c    |   2 +-
 mkrtos_user/server/drv/dm9000_drv/src/main.c  |  15 +-
 mkrtos_user/server/net/CMakeLists.txt         |  17 +-
 mkrtos_user/server/net/inc/dm9000.h           | 167 ------
 mkrtos_user/server/net/inc/ethernetif.h       |   5 +-
 mkrtos_user/server/net/inc/mk_sys.h           |  66 +--
 mkrtos_user/server/net/inc/netconf.h          |  38 +-
 mkrtos_user/server/net/src/dm9000.c           | 478 ------------------
 mkrtos_user/server/net/src/ethernetif.c       |  53 +-
 mkrtos_user/server/net/src/main.c             |  20 +-
 mkrtos_user/server/net/src/mk_sys.c           |  26 -
 mkrtos_user/server/net/src/netconf.c          |  35 +-
 setting.cmake                                 |   2 +-
 17 files changed, 157 insertions(+), 918 deletions(-)
 delete mode 100644 mkrtos_user/server/net/inc/dm9000.h
 delete mode 100644 mkrtos_user/server/net/src/dm9000.c

diff --git a/.vscode/settings.json b/.vscode/settings.json
index cb857e826..b7da9d9ca 100755
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -305,7 +305,8 @@
         "map": "c",
         "regex": "c",
         "set": "c",
-        "stack": "c"
+        "stack": "c",
+        "stm32f10x_conf.h": "c"
     },
     "cortex-debug.showRTOS": false,
     "cortex-debug.variableUseNaturalFormat": false,
diff --git a/mkrtos_knl/knl/log.c b/mkrtos_knl/knl/log.c
index 4d247939e..3d147bb78 100755
--- a/mkrtos_knl/knl/log.c
+++ b/mkrtos_knl/knl/log.c
@@ -55,10 +55,12 @@ static msg_tag_t log_write_data(log_t *log, const char *data, int len)
 {
     for (int i = 0; i < len && data[i]; i++)
     {
+#if 0
         if (data[i] == '\n')
         {
             putc('\r');
         }
+#endif
         putc(data[i]);
     }
     return msg_tag_init(0);
diff --git a/mkrtos_script/stm32f1/stm32f103z.repl b/mkrtos_script/stm32f1/stm32f103z.repl
index c13a138a8..51e53dff9 100644
--- a/mkrtos_script/stm32f1/stm32f103z.repl
+++ b/mkrtos_script/stm32f1/stm32f103z.repl
@@ -4,6 +4,9 @@ flash0: Memory.MappedMemory @ sysbus 0x8000000
 sram0: Memory.MappedMemory @ sysbus 0x20000000
     size: 0x10000
 
+sram1: Memory.MappedMemory @ sysbus 0x68000000
+    size: 0x100000
+
 usart2: UART.STM32_UART @ sysbus <0x40004400, +0x400>
     ->nvic@38
 
diff --git a/mkrtos_user/server/drv/dm9000_drv/src/dm9000.c b/mkrtos_user/server/drv/dm9000_drv/src/dm9000.c
index bc537656b..8835c87c2 100644
--- a/mkrtos_user/server/drv/dm9000_drv/src/dm9000.c
+++ b/mkrtos_user/server/drv/dm9000_drv/src/dm9000.c
@@ -5,29 +5,25 @@
 #include <assert.h>
 #include <semaphore.h>
 #include <printf.h>
-struct dm9000_config dm9000cfg; // DM9000配置结构体
 
+struct dm9000_config dm9000cfg; // DM9000配置结构体
 sem_t dm9000input;			// DM9000接收数据信号量
 pthread_mutex_t dm9000lock; // DM9000读写互锁控制信号量
 obj_handler_t irq_obj;
 
-// #define DM9000_PACKET_BUF_SIZE 1526
-// uint8_t dm9000_packet_buf[DM9000_PACKET_BUF_SIZE];
-// int16_t dm9000_packet_len = 0;
-
 #define IRQ_THREAD_PRIO 3
-#define STACK_SIZE (512 + 128)
+#define STACK_SIZE (512 + 512)
 static __attribute__((aligned(8))) uint8_t stack0[STACK_SIZE];
 static uint8_t msg_buf[128];
 
 void EXTI15_10_IRQHandler(void);
 
-// 初始化DM9000
-// mode:0,仅仅读DM9000的ID,看能否读到ID.
-//      1,完全初始化,正常应用时使用
-// 返回值:
-// 0,初始化成功
-// 1，DM9000A ID读取错误
+/**
+ * @brief dm9000的初始化
+ *
+ * @param mode 0:读DM9000的ID,看能否读到ID.
+ * @return 0：初始化成功，1:初始化失败
+ */
 u8 DM9000_Init(u8 mode)
 {
 	u32 temp;
@@ -133,25 +129,34 @@ u8 DM9000_Init(u8 mode)
 	return 0;
 }
 
-// 读取DM9000指定寄存器的值
-// reg:寄存器地址
-// 返回值：DM9000指定寄存器的值
+/**
+ * @brief 读取DM9000指定寄存器的值
+ *
+ * @param reg 寄存器地址
+ * @return u16 DM9000指定寄存器的值
+ */
 u16 DM9000_ReadReg(u16 reg)
 {
 	DM9000->REG = reg;
 	return DM9000->DATA;
 }
-// 向DM9000指定寄存器中写入指定值
-// reg:要写入的寄存器
-// data:要写入的值
+/**
+ * @brief 向DM9000指定寄存器中写入指定值
+ *
+ * @param reg 要写入的寄存器
+ * @param data 要写入的值
+ */
 void DM9000_WriteReg(u16 reg, u16 data)
 {
 	DM9000->REG = reg;
 	DM9000->DATA = data;
 }
-// 读取DM9000的PHY的指定寄存器
-// reg:要读的PHY寄存器
-// 返回值:读取到的PHY寄存器值
+/**
+ * @brief 读取DM9000的PHY的指定寄存器
+ *
+ * @param reg 要读的PHY寄存器
+ * @return u16 读取到的PHY寄存器值
+ */
 u16 DM9000_PHY_ReadReg(u16 reg)
 {
 	u16 temp;
@@ -162,9 +167,12 @@ u16 DM9000_PHY_ReadReg(u16 reg)
 	temp = (DM9000_ReadReg(DM9000_EPDRH) << 8) | (DM9000_ReadReg(DM9000_EPDRL));
 	return temp;
 }
-// 向DM9000的PHY寄存器写入指定值
-// reg:PHY寄存器
-// data:要写入的值
+/**
+ * @brief 向DM9000的PHY寄存器写入指定值
+ *
+ * @param reg PHY寄存器
+ * @param data 要写入的值
+ */
 void DM9000_PHY_WriteReg(u16 reg, u16 data)
 {
 	DM9000_WriteReg(DM9000_EPAR, DM9000_PHY | reg);
@@ -174,8 +182,11 @@ void DM9000_PHY_WriteReg(u16 reg, u16 data)
 	u_sleep_ms(50);
 	DM9000_WriteReg(DM9000_EPCR, 0X00); // 清除写命令
 }
-// 获取DM9000的芯片ID
-// 返回值：DM9000的芯片ID值
+/**
+ * @brief 获取DM9000的芯片ID
+ *
+ * @return u32 DM9000的芯片ID值
+ */
 u32 DM9000_Get_DeiviceID(void)
 {
 	u32 value;
@@ -185,12 +196,15 @@ u32 DM9000_Get_DeiviceID(void)
 	value |= DM9000_ReadReg(DM9000_PIDH) << 24;
 	return value;
 }
-// 获取DM9000的连接速度和双工模式
-// 返回值：	0,100M半双工
-//			1,100M全双工
-//			2,10M半双工
-//			3,10M全双工
-//			0XFF,连接失败！
+/**
+ * @brief 获取DM9000的连接速度和双工模式
+ *
+ * @return u80,100M半双工
+ *	1,100M全双工
+ *	2,10M半双工
+ *	3,10M全双工
+ *	0XFF,连接失败！
+ */
 u8 DM9000_Get_SpeedAndDuplex(void)
 {
 	u8 temp;
@@ -220,8 +234,11 @@ u8 DM9000_Get_SpeedAndDuplex(void)
 	return temp;
 }
 
-// 设置DM900的PHY工作模式
-// mode:PHY模式
+/**
+ * @brief 设置DM900的PHY工作模式
+ *
+ * @param mode PHY模式
+ */
 void DM9000_Set_PHYMode(u8 mode)
 {
 	u16 BMCR_Value, ANAR_Value;
@@ -252,8 +269,11 @@ void DM9000_Set_PHYMode(u8 mode)
 	DM9000_PHY_WriteReg(DM9000_PHY_ANAR, ANAR_Value);
 	DM9000_WriteReg(DM9000_GPR, 0X00); // 使能PHY
 }
-// 设置DM9000的MAC地址
-// macaddr:指向MAC地址
+/**
+ * @brief 设置DM9000的MAC地址
+ *
+ * @param macaddr 指向MAC地址
+ */
 void DM9000_Set_MACAddress(u8 *macaddr)
 {
 	u8 i;
@@ -262,8 +282,11 @@ void DM9000_Set_MACAddress(u8 *macaddr)
 		DM9000_WriteReg(DM9000_PAR + i, macaddr[i]);
 	}
 }
-// 设置DM9000的组播地址
-// multicastaddr:指向多播地址
+/**
+ * @brief 设置DM9000的组播地址
+ *
+ * @param multicastaddr 指向多播地址
+ */
 void DM9000_Set_Multicast(u8 *multicastaddr)
 {
 	u8 i;
@@ -272,7 +295,10 @@ void DM9000_Set_Multicast(u8 *multicastaddr)
 		DM9000_WriteReg(DM9000_MAR + i, multicastaddr[i]);
 	}
 }
-// 复位DM9000
+/**
+ * @brief 复位DM9000
+ *
+ */
 void DM9000_Reset(void)
 {
 	// 复位DM9000,复位步骤参考<DM9000 Application Notes V1.22>手册29页
@@ -295,8 +321,12 @@ void DM9000_Reset(void)
 	} while (DM9000_ReadReg(DM9000_NCR) & 1);
 }
 
-// 通过DM9000发送数据包
-// p:pbuf结构体指针
+/**
+ * @brief 通过DM9000发送数据包
+ *
+ * @param data 发送的数据
+ * @param len 发送的数据长度
+ */
 void DM9000_SendPacket(const u8 *data, size_t len)
 {
 	u16 pbuf_index = 0;
@@ -339,16 +369,22 @@ void DM9000_SendPacket(const u8 *data, size_t len)
 	// DM9000_WriteReg(DM9000_IMR,IMR_POI|IMR_PTI|IMR_PRI);			//DM9000网卡接收中断使能
 	pthread_mutex_unlock(&dm9000lock); // 发送互斥信号量,解锁DM9000
 }
-// DM9000接收数据包
-// 接收到的数据包存放在DM9000的RX FIFO中，地址为0X0C00~0X3FFF
-// 接收到的数据包的前四个字节并不是真实的数据，而是有特定含义的
-// byte1:表明是否接收到数据，为0x00或者0X01，如果两个都不是的话一定要软件复位DM9000
-//		0x01，接收到数据
-//		0x00，未接收到数据
-// byte2:第二个字节表示一些状态信息，和DM9000的RSR(0X06)寄存器一致的
-// byte3:本帧数据长度的低字节
-// byte4:本帧数据长度的高字节
-// 返回值：pbuf格式的接收到的数据包
+
+/**
+ * @brief DM9000接收数据包
+ * 接收到的数据包存放在DM9000的RX FIFO中，地址为0X0C00~0X3FFF
+ * 接收到的数据包的前四个字节并不是真实的数据，而是有特定含义的
+ * byte1:表明是否接收到数据，为0x00或者0X01，如果两个都不是的话一定要软件复位DM9000
+ * 		0x01，接收到数据
+ * 		0x00，未接收到数据
+ * byte2:第二个字节表示一些状态信息，和DM9000的RSR(0X06)寄存器一致的
+ * byte3:本帧数据长度的低字节
+ * byte4:本帧数据长度的高字节
+ *
+ * @param recv_data 接收数据的缓存
+ * @param len 接收数据的缓存大小
+ * @return int <=0失败 >0成功
+ */
 int DM9000_Receive_Packet(u8 *recv_data, size_t len)
 {
 	struct pbuf *p;
@@ -434,7 +470,10 @@ __error_retry:
 	return ret;
 }
 
-// 中断处理函数
+/**
+ * @brief 中断处理函数
+ *
+ */
 void DMA9000_ISRHandler(void)
 {
 	u16 int_status;
diff --git a/mkrtos_user/server/drv/dm9000_drv/src/heap_stack.c b/mkrtos_user/server/drv/dm9000_drv/src/heap_stack.c
index a1d6b5c73..37c359431 100644
--- a/mkrtos_user/server/drv/dm9000_drv/src/heap_stack.c
+++ b/mkrtos_user/server/drv/dm9000_drv/src/heap_stack.c
@@ -1,5 +1,5 @@
 
-#define HEAP_SIZE 2048
+#define HEAP_SIZE 1024
 #define STACK_SIZE (1024 + 256)
 
 #if defined(__CC_ARM)
diff --git a/mkrtos_user/server/drv/dm9000_drv/src/main.c b/mkrtos_user/server/drv/dm9000_drv/src/main.c
index 220b88885..de1db37d1 100644
--- a/mkrtos_user/server/drv/dm9000_drv/src/main.c
+++ b/mkrtos_user/server/drv/dm9000_drv/src/main.c
@@ -13,6 +13,9 @@
 #include <u_share_mem.h>
 #include <rpc_prot.h>
 #include <ns_cli.h>
+
+static net_drv_t net_drv; //!< 网络驱动的协议
+
 int net_drv_write(obj_handler_t obj, int len)
 {
     int ret = -1;
@@ -51,7 +54,6 @@ int net_drv_read(obj_handler_t obj, int len)
     handler_free_umap(obj);
     return ret;
 }
-static net_drv_t net_drv;
 int main(int argc, char *args[])
 {
     msg_tag_t tag;
@@ -61,20 +63,17 @@ int main(int argc, char *args[])
     u_drv_init();
     tag = mm_align_alloc(MM_PROT, (void *)0x64000000, 0x1000000);
     assert(msg_tag_get_val(tag) >= 0);
+
     net_drv_init(&net_drv);
 
     ret = rpc_meta_init(THREAD_MAIN, &hd);
     assert(ret >= 0);
     meta_reg_svr_obj(&net_drv.svr, NET_DRV_PROT);
 
-    ns_register("/dm9000", hd, MOUNT_NODE);
+    assert(ns_register("/dm9000", hd, MOUNT_NODE) >= 0);
     mk_printf("dm9000 reg success\n");
 
-    DM9000_Init(1);
-    rpc_loop();
-    while (1)
-    {
-        // never run this.
-    }
+    assert(DM9000_Init(1) == 0);
+    rpc_loop(); //!< loop
     return 0;
 }
diff --git a/mkrtos_user/server/net/CMakeLists.txt b/mkrtos_user/server/net/CMakeLists.txt
index a237329a7..5a2b767f0 100644
--- a/mkrtos_user/server/net/CMakeLists.txt
+++ b/mkrtos_user/server/net/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.13)
 
 file(GLOB_RECURSE deps *.c *.S)
 
-file(GLOB bsp_src 
-${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/*.c
-)
-list(APPEND deps ${bsp_src})
+# file(GLOB bsp_src 
+# ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/*.c
+# )
+# list(APPEND deps ${bsp_src})
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_STDPERIPH_DRIVER=1 -DSTM32F10X_HD\
 ")
@@ -43,15 +43,16 @@ target_include_directories(
     ${CMAKE_SOURCE_DIR}/mkrtos_user/lib/mlibc/obj/include
     ${CMAKE_SOURCE_DIR}/mkrtos_user/lib/mlibc/include
 
-    ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc
-    ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/Include
-    ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x
-    ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport
+    # ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc
+    # ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/Include
+    # ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x
+    # ${CMAKE_SOURCE_DIR}/mkrtos_bsp/STM32/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport
 
 )
 add_dependencies(net.elf
 muslc
 lwip
+start
 )
 set_target_properties(net.elf PROPERTIES LINK_FLAGS
 "-T ${CMAKE_CURRENT_LIST_DIR}/link.lds -pie --gc-section -no-dynamic-linker "
diff --git a/mkrtos_user/server/net/inc/dm9000.h b/mkrtos_user/server/net/inc/dm9000.h
deleted file mode 100644
index 248022cfb..000000000
--- a/mkrtos_user/server/net/inc/dm9000.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef __DM9000_H
-#define __DM9000_H	 
-#include "mk_sys.h"
-#include "lwip/pbuf.h"
-//////////////////////////////////////////////////////////////////////////////////	 
-//本程序只供学习使用，未经作者许可，不得用于其它任何用途
-//ALIENTEK战舰STM32开发板V3
-//DM9000驱动代码	   
-//正点原子@ALIENTEK
-//技术论坛:www.openedv.com
-//创建日期:2015/3/15
-//版本：V1.0
-//版权所有，盗版必究。
-//Copyright(C) 广州市星翼电子科技有限公司 2009-2019
-//All rights reserved									  
-////////////////////////////////////////////////////////////////////////////////// 
-
-#define DM9000_RST		PGout(8)		//DM9000复位引脚
-#define DM9000_INT		PFin(11)			//DM9000中断引脚
-
-//DM9000地址结构体
-typedef struct
-{
-	vu16 REG;
-	vu16 DATA;
-}DM9000_TypeDef;
-//使用NOR/SRAM的 Bank1.sector2,地址位HADDR[27,26]=01 A7作为数据命令区分线 
-//注意设置时STM32内部会右移一位对其! 			    
-#define DM9000_BASE        ((volatile u32)(0x64000000|0x000000FE))
-#define DM9000             ((DM9000_TypeDef *) DM9000_BASE)
-
-
-#define DM9000_ID			0X90000A46	//DM9000 ID
-#define DM9000_PKT_MAX		1536		//DM9000最大接收包长度
-
-#define DM9000_PHY			0X40		//DM9000 PHY寄存器访问标志
-//DM9000寄存器
-#define DM9000_NCR			0X00
-#define DM9000_NSR			0X01
-#define DM9000_TCR			0X02
-#define DM9000_TSRI			0X03
-#define DM9000_TSRII		0X04
-#define DM9000_RCR			0X05
-#define DM9000_RSR			0X06
-#define DM9000_ROCR			0X07	
-#define DM9000_BPTR			0X08
-#define DM9000_FCTR			0X09
-#define DM9000_FCR			0X0A
-#define DM9000_EPCR			0X0B
-#define DM9000_EPAR			0X0C
-#define DM9000_EPDRL		0X0D	
-#define DM9000_EPDRH		0X0E
-#define DM9000_WCR			0X0F
-#define DM9000_PAR			0X10		//物理地址0X10~0X15
-#define DM9000_MAR			0X16		//多播地址0X16~0X1D
-#define DM9000_GPCR			0X1E
-#define DM9000_GPR			0X1F
-#define DM9000_TRPAL		0X22
-#define DM9000_TRPAH		0X23
-#define DM9000_RWPAL		0X24
-#define DM9000_RWPAH		0X25
-
-#define DM9000_VIDL			0X28
-#define DM9000_VIDH			0X29
-#define DM9000_PIDL			0X2A
-#define DM9000_PIDH			0X2B
-
-#define DM9000_CHIPR		0X2C
-#define DM9000_TCR2			0X2D
-#define DM9000_OCR			0X2E
-#define DM9000_SMCR			0X2F
-#define DM9000_ETXCSR		0X30
-#define DM9000_TCSCR		0X31
-#define DM9000_RCSCSR		0X32
-#define DM9000_MRCMDX		0XF0
-#define DM9000_MRCMDX1		0XF1
-#define DM9000_MRCMD		0XF2
-#define DM9000_MRRL			0XF4
-#define DM9000_MRRH			0XF5
-#define DM9000_MWCMDX		0XF6
-#define DM9000_MWCMD		0XF8
-#define DM9000_MWRL			0XFA
-#define DM9000_MWRH			0XFB
-#define DM9000_TXPLL		0XFC
-#define DM9000_TXPLH		0XFD
-#define DM9000_ISR			0XFE
-#define DM9000_IMR			0XFF
-
-#define NCR_RST             0X01
-#define NSR_SPEED           0X80
-#define NSR_LINKST         	0X40
-#define NSR_WAKEST          0X20
-#define NSR_TX2END          0X08
-#define NSR_TX1END          0X04
-#define NSR_RXOV            0X02
-
-#define RCR_DIS_LONG        0X20
-#define RCR_DIS_CRC         0X10
-#define RCR_ALL             0X08
-#define RCR_RXEN            0X01
-
-#define IMR_PAR             0X80	
-#define IMR_ROOI            0X08	
-#define IMR_POI             0X04		//使能接收溢出中断
-#define IMR_PTI             0X02		//使能发送中断
-#define IMR_PRI             0X01		//使能接收中断
-
-#define ISR_LNKCHGS         (1<<5)
-#define ISR_ROOS            (1<<3)
-#define ISR_ROS             (1<<2)
-#define ISR_PTS             (1<<1)
-#define ISR_PRS             (1<<0)
-#define ISR_CLR_STATUS      (ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS)
-
-//DM9000内部PHY寄存器
-#define DM9000_PHY_BMCR		0X00
-#define DM9000_PHY_BMSR		0X01
-#define DM9000_PHY_PHYID1	0X02
-#define DM9000_PHY_PHYID2	0X03
-#define DM9000_PHY_ANAR		0X04
-#define DM9000_PHY_ANLPAR	0X05
-#define DM9000_PHY_ANER		0X06
-#define DM9000_PHY_DSCR		0X10
-#define DM9000_PHY_DSCSR	0X11
-#define DM9000_PHY_10BTCSR	0X12
-#define DM9000_PHY_PWDOR	0X13
-#define DM9000_PHY_SCR		0X14
-
-//DM9000工作模式定义
-enum DM9000_PHY_mode
-{
-	DM9000_10MHD 	= 	0, 					//10M半双工
-	DM9000_100MHD 	= 	1,					//100M半双工	
-	DM9000_10MFD 	= 	4, 					//10M全双工
-	DM9000_100MFD 	= 	5,					//100M全双工
-	DM9000_AUTO  	= 	8, 					//自动协商
-};
-
-//DM9000配置结构体
-struct dm9000_config
-{
-	enum DM9000_PHY_mode mode;				//工作模式
-	u8  imr_all;							//中断类型 
-	u16 queue_packet_len;					//每个数据包大小
-	u8  mac_addr[6];						//MAC地址
-	u8  multicase_addr[8];					//组播地址
-};
-extern struct dm9000_config dm9000cfg;		//dm9000配置结构体
-
-
-u8 	 DM9000_Init(u8 mode);
-u16  DM9000_ReadReg(u16 reg);
-void DM9000_WriteReg(u16 reg,u16 data);
-u16  DM9000_PHY_ReadReg(u16 reg);
-void DM9000_PHY_WriteReg(u16 reg,u16 data);
-u32  DM9000_Get_DeiviceID(void);
-u8   DM9000_Get_SpeedAndDuplex(void);	
-void DM9000_Set_PHYMode(u8 mode);
-void DM9000_Set_MACAddress(u8 *macaddr);
-void DM9000_Set_Multicast(u8 *multicastaddr);
-void DM9000_Reset(void);
-void DM9000_SendPacket(struct pbuf *p);
-struct pbuf *DM9000_Receive_Packet(void);
-void DMA9000_ISRHandler(void);
-#endif
-
-
diff --git a/mkrtos_user/server/net/inc/ethernetif.h b/mkrtos_user/server/net/inc/ethernetif.h
index d0b0b2ca8..e1e2e7e11 100644
--- a/mkrtos_user/server/net/inc/ethernetif.h
+++ b/mkrtos_user/server/net/inc/ethernetif.h
@@ -3,9 +3,8 @@
 
 #include "lwip/err.h"
 #include "lwip/netif.h"
-
+#include <u_types.h>
 err_t ethernetif_init(struct netif *netif);
-
-err_t ethernetif_input(struct netif *netif);
+err_t ethernetif_input_raw(struct netif *netif, uint8_t *data, int len);
 
 #endif
diff --git a/mkrtos_user/server/net/inc/mk_sys.h b/mkrtos_user/server/net/inc/mk_sys.h
index 40541350f..56e59174a 100755
--- a/mkrtos_user/server/net/inc/mk_sys.h
+++ b/mkrtos_user/server/net/inc/mk_sys.h
@@ -1,66 +1,4 @@
 #pragma once
-#include <stm32f10x.h>
-#include <stm32f10x_conf.h>
 #include "delay.h"
-// IO口操作宏定义
-#define BITBAND(addr, bitnum) ((addr & 0xF0000000) + 0x2000000 + ((addr & 0xFFFFF) << 5) + (bitnum << 2))
-#define MEM_ADDR(addr) *((volatile unsigned long *)(addr))
-#define BIT_ADDR(addr, bitnum) MEM_ADDR(BITBAND(addr, bitnum))
-
-// IO口地址映射
-#define GPIOA_ODR_Addr (GPIOA_BASE + 12) // 0x4001080C
-#define GPIOB_ODR_Addr (GPIOB_BASE + 12) // 0x40010C0C
-#define GPIOC_ODR_Addr (GPIOC_BASE + 12) // 0x4001100C
-#define GPIOD_ODR_Addr (GPIOD_BASE + 12) // 0x4001140C
-#define GPIOE_ODR_Addr (GPIOE_BASE + 12) // 0x4001180C
-#define GPIOF_ODR_Addr (GPIOF_BASE + 12) // 0x40011A0C
-#define GPIOG_ODR_Addr (GPIOG_BASE + 12) // 0x40011E0C
-
-#define GPIOA_IDR_Addr (GPIOA_BASE + 8) // 0x40010808
-#define GPIOB_IDR_Addr (GPIOB_BASE + 8) // 0x40010C08
-#define GPIOC_IDR_Addr (GPIOC_BASE + 8) // 0x40011008
-#define GPIOD_IDR_Addr (GPIOD_BASE + 8) // 0x40011408
-#define GPIOE_IDR_Addr (GPIOE_BASE + 8) // 0x40011808
-#define GPIOF_IDR_Addr (GPIOF_BASE + 8) // 0x40011A08
-#define GPIOG_IDR_Addr (GPIOG_BASE + 8) // 0x40011E08
-
-// IO口操作,只对单一的IO口!
-// 确保n的值小于16!
-#define PAout(n) BIT_ADDR(GPIOA_ODR_Addr, n) // 输出
-#define PAin(n) BIT_ADDR(GPIOA_IDR_Addr, n)  // 输入
-
-#define PBout(n) BIT_ADDR(GPIOB_ODR_Addr, n) // 输出
-#define PBin(n) BIT_ADDR(GPIOB_IDR_Addr, n)  // 输入
-
-#define PCout(n) BIT_ADDR(GPIOC_ODR_Addr, n) // 输出
-#define PCin(n) BIT_ADDR(GPIOC_IDR_Addr, n)  // 输入
-
-#define PDout(n) BIT_ADDR(GPIOD_ODR_Addr, n) // 输出
-#define PDin(n) BIT_ADDR(GPIOD_IDR_Addr, n)  // 输入
-
-#define PEout(n) BIT_ADDR(GPIOE_ODR_Addr, n) // 输出
-#define PEin(n) BIT_ADDR(GPIOE_IDR_Addr, n)  // 输入
-
-#define PFout(n) BIT_ADDR(GPIOF_ODR_Addr, n) // 输出
-#define PFin(n) BIT_ADDR(GPIOF_IDR_Addr, n)  // 输入
-
-#define PGout(n) BIT_ADDR(GPIOG_ODR_Addr, n) // 输出
-#define PGin(n) BIT_ADDR(GPIOG_IDR_Addr, n)  // 输入
-
-// Ex_NVIC_Config专用定义
-#define GPIO_A 0
-#define GPIO_B 1
-#define GPIO_C 2
-#define GPIO_D 3
-#define GPIO_E 4
-#define GPIO_F 5
-#define GPIO_G 6
-#define FTIR 1 // 下降沿触发
-#define RTIR 2 // 上升沿触发
-
-// JTAG模式设置定义
-#define JTAG_SWD_DISABLE 0X02
-#define SWD_ENABLE 0X01
-#define JTAG_SWD_ENABLE 0X00
-
-void Ex_NVIC_Config(u8 GPIOx, u8 BITx, u8 TRIM);
+typedef volatile unsigned int vu32;
+typedef unsigned char u8;
diff --git a/mkrtos_user/server/net/inc/netconf.h b/mkrtos_user/server/net/inc/netconf.h
index 830f14d9f..1b1a485a0 100644
--- a/mkrtos_user/server/net/inc/netconf.h
+++ b/mkrtos_user/server/net/inc/netconf.h
@@ -1,20 +1,40 @@
 /**
  * @file netconf.h
  * @author ATShining (1358745329@qq.com)
- * @brief 
+ * @brief
  * @version 0.1
  * @date 2024-01-06
- * 
+ *
  * @copyright Copyright (c) 2024
- * 
+ *
  */
 #pragma once
-#define MAC_ADDR0 2
-#define MAC_ADDR1 4
-#define MAC_ADDR2 3
-#define MAC_ADDR3 7
-#define MAC_ADDR4 8
-#define MAC_ADDR5 9
+
+#define DEST_IP_ADDR0 192
+#define DEST_IP_ADDR1 168
+#define DEST_IP_ADDR2 2
+#define DEST_IP_ADDR3 20
+
+#define DEST_PORT 77
+
+/*Static IP ADDRESS: IP_ADDR0.IP_ADDR1.IP_ADDR2.IP_ADDR3 */
+#define IP_ADDR0 192
+#define IP_ADDR1 168
+#define IP_ADDR2 3
+#define IP_ADDR3 10
+
+/*NETMASK*/
+#define NETMASK_ADDR0 255
+#define NETMASK_ADDR1 255
+#define NETMASK_ADDR2 255
+#define NETMASK_ADDR3 0
+
+/*Gateway Address*/
+#define GW_ADDR0 192
+#define GW_ADDR1 168
+#define GW_ADDR2 3
+#define GW_ADDR3 1
+
 void net_init(void);
 void LwIP_Pkt_Handle(void);
 void lwip_pkt_handle_raw(uint8_t *data, int len);
diff --git a/mkrtos_user/server/net/src/dm9000.c b/mkrtos_user/server/net/src/dm9000.c
deleted file mode 100644
index 93a504ffb..000000000
--- a/mkrtos_user/server/net/src/dm9000.c
+++ /dev/null
@@ -1,478 +0,0 @@
-#include "dm9000.h"
-#include "delay.h"
-// #include "led.h"
-//  #include "usart.h"
-#include "netconf.h"
-#include "u_intr.h"
-#include <u_intr.h>
-#include <pthread.h>
-#include <assert.h>
-#include <semaphore.h>
-struct dm9000_config dm9000cfg; // DM9000配置结构体
-
-sem_t dm9000input;			// DM9000接收数据信号量
-pthread_mutex_t dm9000lock; // DM9000读写互锁控制信号量
-obj_handler_t irq_obj;
-
-// 初始化DM9000
-// mode:0,仅仅读DM9000的ID,看能否读到ID.
-//      1,完全初始化,正常应用时使用
-// 返回值:
-// 0,初始化成功
-// 1，DM9000A ID读取错误
-u8 DM9000_Init(u8 mode)
-{
-	u32 temp;
-
-	sem_init(&dm9000input, 0, 0);
-	pthread_mutex_init(&dm9000lock, NULL);
-
-	// 先初始化和DM9000连接的IO和FSMC
-	RCC->AHBENR |= 1 << 8;	// 使能FSMC时钟
-	RCC->APB2ENR |= 1 << 5; // 使能PORTD时钟
-	RCC->APB2ENR |= 1 << 6; // 使能PORTE时钟
-	RCC->APB2ENR |= 1 << 7; // 使能PORTF时钟
-	RCC->APB2ENR |= 1 << 8; // 使能PORTG时钟
-
-	// PORTD复用推挽输出
-	GPIOD->CRH = (GPIOD->CRH & 0X00FFF000) | 0XBB000BBB;
-	GPIOD->CRL = (GPIOD->CRH & 0XFF00FF00) | 0X00BB00BB;
-	// PORTE复用推挽输出
-	GPIOE->CRH = (GPIOE->CRH & 0X00000000) | 0XBBBBBBBB;
-	GPIOE->CRL = (GPIOE->CRL & 0X0FFFFFFF) | 0XB0000000;
-	// PORTF复用推挽输出 	PF13-->FSMC_A7 PF11  DM9000中断输入,上拉
-	GPIOF->CRH = (GPIOF->CRH & 0XFF0F0FFF) | 0X00B08000;
-	// PORTG复用推挽输出 PG9->NE2 PG8 推挽输出--> DM9000_RST
-	GPIOG->CRH = (GPIOG->CRH & 0XFFFFFF00) | 0X000000B3;
-
-	GPIOF->ODR |= 1 << 11; // PF11 上拉
-	// DM9000_IO_Init();
-	Ex_NVIC_Config(GPIO_F, 11, FTIR); // 下降沿触发
-	// MY_NVIC_Init(1,0,EXTI15_10_IRQn,2);		//抢占2，子优先级3，组2
-	assert(u_intr_bind(EXTI15_10_IRQn, u_irq_prio_create(1, 0), 0,
-					   NULL, NULL, NULL, &irq_obj) >= 0);
-
-	// 寄存器清零
-	// bank1有NE1~4,每一个有一个BCR+TCR，所以总共八个寄存器。
-	// 这里我们使用NE2 ，也就对应BTCR[2],[3]。
-	FSMC_Bank1->BTCR[2] = 0X00000000;
-	FSMC_Bank1->BTCR[3] = 0X00000000;
-	FSMC_Bank1E->BWTR[2] = 0X00000000;
-	// 操作BCR寄存器	使用异步模式,模式A(读写共用一个时序寄存器)
-	// BTCR[偶数]:BCR寄存器;BTCR[奇数]:BTR寄存器
-	FSMC_Bank1->BTCR[2] |= 1 << 12; // 存储器写使能
-	FSMC_Bank1->BTCR[2] |= 1 << 4;	// 存储器数据宽度为16bit
-	// 操作BTR寄存器
-	FSMC_Bank1->BTCR[3] |= 3 << 8; // 数据保持时间（DATAST）为3个HCLK 4/72M=55ns(对DM9000芯片)
-	FSMC_Bank1->BTCR[3] |= 0 << 4; // 地址保持时间（ADDHLD）未用到
-	FSMC_Bank1->BTCR[3] |= 1 << 0; // 地址建立时间（ADDSET）为2个HCLK 2/72M=27ns
-	// 闪存写时序寄存器
-	FSMC_Bank1E->BWTR[2] = 0x0FFFFFFF; // 默认值
-	// 使能BANK1区域2
-	FSMC_Bank1->BTCR[2] |= 1 << 0;
-
-	temp = *(vu32 *)(0x1FFFF7E8); // 获取STM32的唯一ID的前24位作为MAC地址后三字节
-	dm9000cfg.mode = DM9000_AUTO;
-	dm9000cfg.queue_packet_len = 0;
-	// DM9000的SRAM的发送和接收指针自动返回到开始地址，并且开启接收中断
-	dm9000cfg.imr_all = IMR_PAR | IMR_PRI;
-	// 初始化MAC地址
-	dm9000cfg.mac_addr[0] = 2;
-	dm9000cfg.mac_addr[1] = 0;
-	dm9000cfg.mac_addr[2] = 0;
-	dm9000cfg.mac_addr[3] = (temp >> 16) & 0XFF; // 低三字节用STM32的唯一ID
-	dm9000cfg.mac_addr[4] = (temp >> 8) & 0XFF;
-	dm9000cfg.mac_addr[5] = temp & 0XFF;
-	// 初始化组播地址
-	dm9000cfg.multicase_addr[0] = 0Xff;
-	dm9000cfg.multicase_addr[1] = 0Xff;
-	dm9000cfg.multicase_addr[2] = 0Xff;
-	dm9000cfg.multicase_addr[3] = 0Xff;
-	dm9000cfg.multicase_addr[4] = 0Xff;
-	dm9000cfg.multicase_addr[5] = 0Xff;
-	dm9000cfg.multicase_addr[6] = 0Xff;
-	dm9000cfg.multicase_addr[7] = 0Xff;
-
-	DM9000_Reset(); // 复位DM9000
-	delay_ms(100);
-	temp = DM9000_Get_DeiviceID(); // 获取DM9000ID
-	// printf("DM9000 ID:%#x\r\n",temp);
-	if (temp != DM9000_ID)
-		return 1; // 读取ID错误
-	if (mode == 0)
-		return 0;						// 仅仅读ID,任务完成
-	DM9000_Set_PHYMode(dm9000cfg.mode); // 设置PHY工作模式
-
-	DM9000_WriteReg(DM9000_NCR, 0X00);
-	DM9000_WriteReg(DM9000_TCR, 0X00); // 发送控制寄存器清零
-	DM9000_WriteReg(DM9000_BPTR, 0X3F);
-	DM9000_WriteReg(DM9000_FCTR, 0X38);
-	DM9000_WriteReg(DM9000_FCR, 0X00);
-	DM9000_WriteReg(DM9000_SMCR, 0X00);								   // 特殊模式
-	DM9000_WriteReg(DM9000_NSR, NSR_WAKEST | NSR_TX2END | NSR_TX1END); // 清除发送状态
-	DM9000_WriteReg(DM9000_ISR, 0X0F);								   // 清除中断状态
-	DM9000_WriteReg(DM9000_TCR2, 0X80);								   // 切换LED到mode1
-	// 设置MAC地址和组播地址
-	DM9000_Set_MACAddress(dm9000cfg.mac_addr);		// 设置MAC地址
-	DM9000_Set_Multicast(dm9000cfg.multicase_addr); // 设置组播地址
-	DM9000_WriteReg(DM9000_RCR, RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN);
-	DM9000_WriteReg(DM9000_IMR, IMR_PAR);
-	temp = DM9000_Get_SpeedAndDuplex(); // 获取DM9000的连接速度和双工状态
-	if (temp != 0XFF)					// 连接成功，通过串口显示连接速度和双工状态
-	{
-		printf("DM9000 Speed:%dMbps,Duplex:%s duplex mode\r\n", (temp & 0x02) ? 10 : 100, (temp & 0x01) ? "Full" : "Half");
-	}
-	// else printf("DM9000 Establish Link Failed!\r\n");
-	DM9000_WriteReg(DM9000_IMR, dm9000cfg.imr_all); // 设置中断
-	return 0;
-}
-
-// 读取DM9000指定寄存器的值
-// reg:寄存器地址
-// 返回值：DM9000指定寄存器的值
-u16 DM9000_ReadReg(u16 reg)
-{
-	DM9000->REG = reg;
-	return DM9000->DATA;
-}
-// 向DM9000指定寄存器中写入指定值
-// reg:要写入的寄存器
-// data:要写入的值
-void DM9000_WriteReg(u16 reg, u16 data)
-{
-	DM9000->REG = reg;
-	DM9000->DATA = data;
-}
-// 读取DM9000的PHY的指定寄存器
-// reg:要读的PHY寄存器
-// 返回值:读取到的PHY寄存器值
-u16 DM9000_PHY_ReadReg(u16 reg)
-{
-	u16 temp;
-	DM9000_WriteReg(DM9000_EPAR, DM9000_PHY | reg);
-	DM9000_WriteReg(DM9000_EPCR, 0X0C); // 选中PHY，发送读命令
-	delay_ms(10);
-	DM9000_WriteReg(DM9000_EPCR, 0X00); // 清除读命令
-	temp = (DM9000_ReadReg(DM9000_EPDRH) << 8) | (DM9000_ReadReg(DM9000_EPDRL));
-	return temp;
-}
-// 向DM9000的PHY寄存器写入指定值
-// reg:PHY寄存器
-// data:要写入的值
-void DM9000_PHY_WriteReg(u16 reg, u16 data)
-{
-	DM9000_WriteReg(DM9000_EPAR, DM9000_PHY | reg);
-	DM9000_WriteReg(DM9000_EPDRL, (data & 0xff));		 // 写入低字节
-	DM9000_WriteReg(DM9000_EPDRH, ((data >> 8) & 0xff)); // 写入高字节
-	DM9000_WriteReg(DM9000_EPCR, 0X0A);					 // 选中PHY,发送写命令
-	delay_ms(50);
-	DM9000_WriteReg(DM9000_EPCR, 0X00); // 清除写命令
-}
-// 获取DM9000的芯片ID
-// 返回值：DM9000的芯片ID值
-u32 DM9000_Get_DeiviceID(void)
-{
-	u32 value;
-	value = DM9000_ReadReg(DM9000_VIDL);
-	value |= DM9000_ReadReg(DM9000_VIDH) << 8;
-	value |= DM9000_ReadReg(DM9000_PIDL) << 16;
-	value |= DM9000_ReadReg(DM9000_PIDH) << 24;
-	return value;
-}
-// 获取DM9000的连接速度和双工模式
-// 返回值：	0,100M半双工
-//			1,100M全双工
-//			2,10M半双工
-//			3,10M全双工
-//			0XFF,连接失败！
-u8 DM9000_Get_SpeedAndDuplex(void)
-{
-	u8 temp;
-	u8 i = 0;
-	if (dm9000cfg.mode == DM9000_AUTO) // 如果开启了自动协商模式一定要等待协商完成
-	{
-		while (!(DM9000_PHY_ReadReg(0X01) & 0X0020)) // 等待自动协商完成
-		{
-			delay_ms(100);
-			i++;
-			if (i > 100)
-				return 0XFF; // 自动协商失败
-		}
-	}
-	else // 自定义模式,一定要等待连接成功
-	{
-		while (!(DM9000_ReadReg(DM9000_NSR) & 0X40)) // 等待连接成功
-		{
-			delay_ms(100);
-			i++;
-			if (i > 100)
-				return 0XFF; // 连接失败
-		}
-	}
-	temp = ((DM9000_ReadReg(DM9000_NSR) >> 6) & 0X02);	// 获取DM9000的连接速度
-	temp |= ((DM9000_ReadReg(DM9000_NCR) >> 3) & 0X01); // 获取DM9000的双工状态
-	return temp;
-}
-
-// 设置DM900的PHY工作模式
-// mode:PHY模式
-void DM9000_Set_PHYMode(u8 mode)
-{
-	u16 BMCR_Value, ANAR_Value;
-	switch (mode)
-	{
-	case DM9000_10MHD: // 10M半双工
-		BMCR_Value = 0X0000;
-		ANAR_Value = 0X21;
-		break;
-	case DM9000_10MFD: // 10M全双工
-		BMCR_Value = 0X0100;
-		ANAR_Value = 0X41;
-		break;
-	case DM9000_100MHD: // 100M半双工
-		BMCR_Value = 0X2000;
-		ANAR_Value = 0X81;
-		break;
-	case DM9000_100MFD: // 100M全双工
-		BMCR_Value = 0X2100;
-		ANAR_Value = 0X101;
-		break;
-	case DM9000_AUTO: // 自动协商模式
-		BMCR_Value = 0X1000;
-		ANAR_Value = 0X01E1;
-		break;
-	}
-	DM9000_PHY_WriteReg(DM9000_PHY_BMCR, BMCR_Value);
-	DM9000_PHY_WriteReg(DM9000_PHY_ANAR, ANAR_Value);
-	DM9000_WriteReg(DM9000_GPR, 0X00); // 使能PHY
-}
-// 设置DM9000的MAC地址
-// macaddr:指向MAC地址
-void DM9000_Set_MACAddress(u8 *macaddr)
-{
-	u8 i;
-	for (i = 0; i < 6; i++)
-	{
-		DM9000_WriteReg(DM9000_PAR + i, macaddr[i]);
-	}
-}
-// 设置DM9000的组播地址
-// multicastaddr:指向多播地址
-void DM9000_Set_Multicast(u8 *multicastaddr)
-{
-	u8 i;
-	for (i = 0; i < 8; i++)
-	{
-		DM9000_WriteReg(DM9000_MAR + i, multicastaddr[i]);
-	}
-}
-// 复位DM9000
-void DM9000_Reset(void)
-{
-	// 复位DM9000,复位步骤参考<DM9000 Application Notes V1.22>手册29页
-	DM9000_RST = 0; // DM9000硬件复位
-	delay_ms(10);
-	DM9000_RST = 1;								   // DM9000硬件复位结束
-	delay_ms(100);								   // 一定要有这个延时，让DM9000准备就绪！
-	DM9000_WriteReg(DM9000_GPCR, 0x01);			   // 第一步:设置GPCR寄存器(0X1E)的bit0为1
-	DM9000_WriteReg(DM9000_GPR, 0);				   // 第二步:设置GPR寄存器(0X1F)的bit1为0，DM9000内部的PHY上电
-	DM9000_WriteReg(DM9000_NCR, (0x02 | NCR_RST)); // 第三步:软件复位DM9000
-	do
-	{
-		delay_ms(25);
-	} while (DM9000_ReadReg(DM9000_NCR) & 1); // 等待DM9000软复位完成
-	DM9000_WriteReg(DM9000_NCR, 0);
-	DM9000_WriteReg(DM9000_NCR, (0x02 | NCR_RST)); // DM9000第二次软复位
-	do
-	{
-		delay_ms(25);
-	} while (DM9000_ReadReg(DM9000_NCR) & 1);
-}
-
-// 通过DM9000发送数据包
-// p:pbuf结构体指针
-void DM9000_SendPacket(struct pbuf *p)
-{
-	struct pbuf *q;
-	u16 pbuf_index = 0;
-	u8 word[2], word_index = 0;
-	u8 err;
-	// printf("send len:%d\r\n",p->tot_len);
-	pthread_mutex_lock(&dm9000lock);	  // 请求互斥信号量,锁定DM9000
-	DM9000_WriteReg(DM9000_IMR, IMR_PAR); // 关闭网卡中断
-	DM9000->REG = DM9000_MWCMD;			  // 发送此命令后就可以将要发送的数据搬到DM9000 TX SRAM中
-	q = p;
-	// 向DM9000的TX SRAM中写入数据，一次写入两个字节数据
-	// 当要发送的数据长度为奇数的时候，我们需要将最后一个字节单独写入DM9000的TX SRAM中
-	while (q)
-	{
-		if (pbuf_index < q->len)
-		{
-			word[word_index++] = ((u8_t *)q->payload)[pbuf_index++];
-			if (word_index == 2)
-			{
-				DM9000->DATA = ((u16)word[1] << 8) | word[0];
-				word_index = 0;
-			}
-		}
-		else
-		{
-			q = q->next;
-			pbuf_index = 0;
-		}
-	}
-	// 还有一个字节未写入TX SRAM
-	if (word_index == 1)
-		DM9000->DATA = word[0];
-	// 向DM9000写入发送长度
-	DM9000_WriteReg(DM9000_TXPLL, p->tot_len & 0XFF);
-	DM9000_WriteReg(DM9000_TXPLH, (p->tot_len >> 8) & 0XFF); // 设置要发送数据的数据长度
-	DM9000_WriteReg(DM9000_TCR, 0X01);						 // 启动发送
-	while ((DM9000_ReadReg(DM9000_ISR) & 0X02) == 0)
-		;											// 等待发送完成
-	DM9000_WriteReg(DM9000_ISR, 0X02);				// 清除发送完成中断
-	DM9000_WriteReg(DM9000_IMR, dm9000cfg.imr_all); // DM9000网卡接收中断使能
-	// DM9000_WriteReg(DM9000_IMR,IMR_POI|IMR_PTI|IMR_PRI);			//DM9000网卡接收中断使能
-	pthread_mutex_unlock(&dm9000lock); // 发送互斥信号量,解锁DM9000
-}
-// DM9000接收数据包
-// 接收到的数据包存放在DM9000的RX FIFO中，地址为0X0C00~0X3FFF
-// 接收到的数据包的前四个字节并不是真实的数据，而是有特定含义的
-// byte1:表明是否接收到数据，为0x00或者0X01，如果两个都不是的话一定要软件复位DM9000
-//		0x01，接收到数据
-//		0x00，未接收到数据
-// byte2:第二个字节表示一些状态信息，和DM9000的RSR(0X06)寄存器一致的
-// byte3:本帧数据长度的低字节
-// byte4:本帧数据长度的高字节
-// 返回值：pbuf格式的接收到的数据包
-struct pbuf *DM9000_Receive_Packet(void)
-{
-	struct pbuf *p;
-	struct pbuf *q;
-	u32 rxbyte;
-	vu16 rx_status, rx_length;
-	u16 *data;
-	u16 dummy;
-	int len;
-	u8 err;
-
-	p = NULL;
-	pthread_mutex_lock(&dm9000lock); // 请求互斥信号量,锁定DM9000
-__error_retry:
-	DM9000_ReadReg(DM9000_MRCMDX); // 假读
-	rxbyte = (u8)DM9000->DATA;	   // 进行第二次读取
-	if (rxbyte)					   // 接收到数据
-	{
-		if (rxbyte > 1) // rxbyte大于1，接收到的数据错误,挂了
-		{
-			printf("dm9000 rx: rx error, stop device\r\n");
-			DM9000_WriteReg(DM9000_RCR, 0x00);
-			DM9000_WriteReg(DM9000_ISR, 0x80);
-			pthread_mutex_unlock(&dm9000lock); // 发送互斥信号量,解锁DM9000
-			return (struct pbuf *)p;
-		}
-		DM9000->REG = DM9000_MRCMD;
-		rx_status = DM9000->DATA;
-		rx_length = DM9000->DATA;
-		// if(rx_length>512)printf("rxlen:%d\r\n",rx_length);
-		p = pbuf_alloc(PBUF_RAW, rx_length, PBUF_POOL); // pbufs内存池分配pbuf
-		if (p != NULL)									// 内存申请成功
-		{
-			for (q = p; q != NULL; q = q->next)
-			{
-				data = (u16 *)q->payload;
-				len = q->len;
-				while (len > 0)
-				{
-					*data = DM9000->DATA;
-					data++;
-					len -= 2;
-				}
-			}
-		}
-		else // 内存申请失败
-		{
-			printf("pbuf内存申请失败:%d\r\n", rx_length);
-			data = &dummy;
-			len = rx_length;
-			while (len)
-			{
-				*data = DM9000->DATA;
-				len -= 2;
-			}
-		}
-		// 根据rx_status判断接收数据是否出现如下错误：FIFO溢出、CRC错误
-		// 对齐错误、物理层错误，如果有任何一个出现的话丢弃该数据帧，
-		// 当rx_length小于64或者大于最大数据长度的时候也丢弃该数据帧
-		if ((rx_status & 0XBF00) || (rx_length < 0X40) || (rx_length > DM9000_PKT_MAX))
-		{
-			printf("rx_status:%#x\r\n", rx_status);
-			if (rx_status & 0x100)
-				printf("rx fifo error\r\n");
-			if (rx_status & 0x200)
-				printf("rx crc error\r\n");
-			if (rx_status & 0x8000)
-				printf("rx length error\r\n");
-			if (rx_length > DM9000_PKT_MAX)
-			{
-				printf("rx length too big\r\n");
-				DM9000_WriteReg(DM9000_NCR, NCR_RST); // 复位DM9000
-				delay_ms(5);
-			}
-			if (p != NULL)
-				pbuf_free((struct pbuf *)p); // 释放内存
-			p = NULL;
-			goto __error_retry;
-		}
-	}
-	else
-	{
-		DM9000_WriteReg(DM9000_ISR, ISR_PTS);  // 清除所有中断标志位
-		dm9000cfg.imr_all = IMR_PAR | IMR_PRI; // 重新接收中断
-		DM9000_WriteReg(DM9000_IMR, dm9000cfg.imr_all);
-	}
-	pthread_mutex_unlock(&dm9000lock); // 发送互斥信号量,解锁DM9000
-	return (struct pbuf *)p;
-}
-// 中断处理函数
-void DMA9000_ISRHandler(void)
-{
-	u16 int_status;
-	u16 last_io;
-	last_io = DM9000->REG;
-	int_status = DM9000_ReadReg(DM9000_ISR);
-	DM9000_WriteReg(DM9000_ISR, int_status); // 清除中断标志位，DM9000的ISR寄存器的bit0~bit5写1清零
-	// if(int_status & ISR_ROS)printf("overflow \r\n");
-	//  if(int_status & ISR_ROOS)printf("overflow counter overflow \r\n");
-	if (int_status & ISR_PRS) // 接收中断
-	{
-		// sem_post(&dm9000input); // 处理接收到数据帧
-		extern void lwip_pkt_handle(void);
-		lwip_pkt_handle();
-	}
-	if (int_status & ISR_PTS) // 发送中断
-	{
-		// 接收中断处理,这里没用到
-	}
-	DM9000->REG = last_io;
-}
-// 外部中断5~9服务程序
-void EXTI15_10_IRQHandler(void)
-{
-	while (1)
-	{
-		msg_tag_t tag = uirq_wait(irq_obj, 0);
-		if (msg_tag_get_val(tag) >= 0)
-		{
-			if (EXTI_GetITStatus(EXTI_Line11) != RESET)
-			{
-				EXTI_ClearITPendingBit(EXTI_Line11);
-				while (DM9000_INT == 0)
-				{
-					DMA9000_ISRHandler();
-				}
-			}
-		}
-		uirq_ack(irq_obj, EXTI15_10_IRQn);
-	}
-}
diff --git a/mkrtos_user/server/net/src/ethernetif.c b/mkrtos_user/server/net/src/ethernetif.c
index addbb37c5..e8e0ea90c 100644
--- a/mkrtos_user/server/net/src/ethernetif.c
+++ b/mkrtos_user/server/net/src/ethernetif.c
@@ -1,15 +1,12 @@
 #include "ethernetif.h"
-// #include "lwip_comm.h"
-// #include "malloc.h"
 #include "netif/etharp.h"
 #include "string.h"
-// #include "includes.h"
 #include "lwip/timeouts.h"
 #include "netconf.h"
+#include "mk_sys.h"
 #include <semaphore.h>
 #include <pthread.h>
 #include <cons_cli.h>
-#include "dm9000.h"
 #include <net_drv_cli.h>
 #include <u_hd_man.h>
 #include <u_factory.h>
@@ -17,9 +14,7 @@
 #include <u_task.h>
 #include <ns_cli.h>
 #include <assert.h>
-static obj_handler_t net_drv_hd;
-extern sem_t dm9000input;		   // DM9000接收数据信号量
-extern pthread_mutex_t dm9000lock; // DM9000读写互锁控制信号量
+extern obj_handler_t net_drv_hd;
 obj_handler_t send_shm_hd;
 
 umword_t send_shm_addr;
@@ -46,8 +41,6 @@ static err_t low_level_init(struct netif *netif)
 	netif->mtu = 1500; // 最大允许传输单元,允许该网卡广播和ARP功能
 	netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
 
-	assert(ns_query("/dm9000", &net_drv_hd) >= 0);
-
 	msg_tag_t tag;
 	send_shm_hd = handler_alloc();
 	assert(send_shm_hd != HANDLER_INVALID);
@@ -66,50 +59,12 @@ static err_t low_level_init(struct netif *netif)
 static err_t low_level_output(struct netif *netif, struct pbuf *p)
 {
 	int ret;
-	// DM9000_SendPacket(p); // 发送数据
+
 	memcpy((void *)send_shm_addr, p->payload, p->len);
 	ret = net_drv_cli_write(net_drv_hd, send_shm_hd, p->len);
 	return ret >= 0 ? ERR_OK : ERR_IF;
 }
-// 用于接收数据包的最底层函数
-// neitif:网卡结构体指针
-// 返回值:pbuf数据结构体指针
-static struct pbuf *low_level_input(struct netif *netif)
-{
-	struct pbuf *p;
-	p = DM9000_Receive_Packet();
-	return p;
-}
-err_t ethernetif_input(struct netif *netif)
-{
-	uint32_t _err;
-	err_t err = 0;
-	struct pbuf *p;
-	// while (1)
-	{
-		// _err = sem_wait(&dm9000input); // 请求信号量
-		// cons_write_str("*\n");
-		if (_err == 0)
-		{
-			while (1)
-			{
-				p = low_level_input(netif); // 调用low_level_input函数接收数据
-				if (p != NULL)
-				{
-					err = netif->input(p, netif); // 调用netif结构体中的input字段(一个函数)来处理数据包
-					if (err != ERR_OK)
-					{
-						LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_input: IP input error\n"));
-						pbuf_free(p);
-						p = NULL;
-					}
-				}
-				else
-					break;
-			}
-		}
-	}
-}
+
 err_t ethernetif_input_raw(struct netif *netif, uint8_t *data, int len)
 {
 	err_t err = ERR_MEM;
diff --git a/mkrtos_user/server/net/src/main.c b/mkrtos_user/server/net/src/main.c
index 196bae398..3013a0c15 100644
--- a/mkrtos_user/server/net/src/main.c
+++ b/mkrtos_user/server/net/src/main.c
@@ -7,7 +7,6 @@
 #include <assert.h>
 #include "u_sleep.h"
 #include "libc.h"
-#include "dm9000.h"
 #include "lwiperf.h"
 #include "u_prot.h"
 #include "u_mm.h"
@@ -26,24 +25,16 @@ int main(int args, char *argv[])
 {
     int ret;
     msg_tag_t tag;
-    // struct __libc *lc = &libc;
-    // printf("libc:0x%x\n", lc);
 
-    assert(u_drv_init() >= 0);
-    tag = mm_align_alloc(MM_PROT, (void *)0x64000000, 0x1000000);
-    assert(msg_tag_get_val(tag) >= 0);
+    ret = ns_query("/dm9000", &net_drv_hd);
+    assert(ret >= 0);
 
     cons_write_str("net init..\n");
-    // if (DM9000_Init(1))
-    // {
-    //     cons_write_str("err.\n");
-    //     return 2; // 初始化DM9000AEP
-    // }
     net_init();
     cons_write_str("net start success..\n");
     ip_addr_t perf_server_ip;
 
-    IP_ADDR4(&perf_server_ip, 192, 168, 3, 10);
+    IP_ADDR4(&perf_server_ip, IP_ADDR0, IP_ADDR1, IP_ADDR2, IP_ADDR3);
     lwiperf_start_tcp_server(&perf_server_ip, 9527, NULL, NULL);
 
     obj_handler_t shm_hd = handler_alloc();
@@ -53,13 +44,8 @@ int main(int args, char *argv[])
     tag = share_mem_map(shm_hd, 3, &addr, &size);
     assert(msg_tag_get_prot(tag) >= 0);
 
-    ret = ns_query("/dm9000", &net_drv_hd);
-    assert(ret >= 0);
-
     while (1)
     {
-        // EXTI15_10_IRQHandler();
-
         int ret = net_drv_cli_read(net_drv_hd, shm_hd);
 
         if (ret > 0)
diff --git a/mkrtos_user/server/net/src/mk_sys.c b/mkrtos_user/server/net/src/mk_sys.c
index 74a366720..b93f69d99 100644
--- a/mkrtos_user/server/net/src/mk_sys.c
+++ b/mkrtos_user/server/net/src/mk_sys.c
@@ -1,27 +1 @@
 #include "mk_sys.h"
-
-// 外部中断配置函数
-// 只针对GPIOA~G;不包括PVD,RTC和USB唤醒这三个
-// 参数:
-// GPIOx:0~6,代表GPIOA~G
-// BITx:需要使能的位;
-// TRIM:触发模式,1,下升沿;2,上降沿;3，任意电平触发
-// 该函数一次只能配置1个IO口,多个IO口,需多次调用
-// 该函数会自动开启对应中断,以及屏蔽线
-void Ex_NVIC_Config(u8 GPIOx, u8 BITx, u8 TRIM)
-{
-    u8 EXTADDR;
-    u8 EXTOFFSET;
-    EXTADDR = BITx / 4; // 得到中断寄存器组的编号
-    EXTOFFSET = (BITx % 4) * 4;
-    RCC->APB2ENR |= 0x01;                            // 使能io复用时钟
-    AFIO->EXTICR[EXTADDR] &= ~(0x000F << EXTOFFSET); // 清除原来设置！！！
-    AFIO->EXTICR[EXTADDR] |= GPIOx << EXTOFFSET;     // EXTI.BITx映射到GPIOx.BITx
-    // 自动设置
-    EXTI->IMR |= 1 << BITx; //  开启line BITx上的中断
-                            // EXTI->EMR|=1<<BITx;//不屏蔽line BITx上的事件 (如果不屏蔽这句,在硬件上是可以的,但是在软件仿真的时候无法进入中断!)
-    if (TRIM & 0x01)
-        EXTI->FTSR |= 1 << BITx; // line BITx上事件下降沿触发
-    if (TRIM & 0x02)
-        EXTI->RTSR |= 1 << BITx; // line BITx上事件上升降沿触发
-}
diff --git a/mkrtos_user/server/net/src/netconf.c b/mkrtos_user/server/net/src/netconf.c
index b4cf736a6..ebc644133 100644
--- a/mkrtos_user/server/net/src/netconf.c
+++ b/mkrtos_user/server/net/src/netconf.c
@@ -51,45 +51,18 @@
 #include <stdio.h>
 #include "cons_cli.h"
 #include "ethernetif.h"
-#include "dm9000.h"
+#include "netconf.h"
 #include <pthread.h>
 #include <semaphore.h>
 /* Private typedef -----------------------------------------------------------*/
 #define MAX_DHCP_TRIES 4
 struct netif gnetif;
-uint32_t IPaddress = 0;
-
-#define DEST_IP_ADDR0 192
-#define DEST_IP_ADDR1 168
-#define DEST_IP_ADDR2 2
-#define DEST_IP_ADDR3 20
-
-#define DEST_PORT 77
-
-/*Static IP ADDRESS: IP_ADDR0.IP_ADDR1.IP_ADDR2.IP_ADDR3 */
-#define IP_ADDR0 192
-#define IP_ADDR1 168
-#define IP_ADDR2 3
-#define IP_ADDR3 10
-
-/*NETMASK*/
-#define NETMASK_ADDR0 255
-#define NETMASK_ADDR1 255
-#define NETMASK_ADDR2 255
-#define NETMASK_ADDR3 0
-
-/*Gateway Address*/
-#define GW_ADDR0 192
-#define GW_ADDR1 168
-#define GW_ADDR2 3
-#define GW_ADDR3 1
 
 #ifdef USE_DHCP
 uint32_t DHCPfineTimer = 0;
 uint32_t DHCPcoarseTimer = 0;
 DHCP_State_TypeDef DHCP_state = DHCP_START;
 #endif
-extern __IO uint32_t EthStatus;
 /**
  * @brief  Initializes the lwIP stack
  * @param  None
@@ -175,13 +148,7 @@ void net_init(void)
     // netif_set_link_callback(&gnetif, ETH_link_callback);
     sys_unlock_tcpip_core();
 }
-err_t ethernetif_input(struct netif *netif);
 
-// 用于以太网中断调用
-void lwip_pkt_handle(void)
-{
-    ethernetif_input(&gnetif);
-}
 void lwip_pkt_handle_raw(uint8_t *data, int len)
 {
     ethernetif_input_raw(&gnetif, data, len);
diff --git a/setting.cmake b/setting.cmake
index a42ba47bf..a177dc4c9 100755
--- a/setting.cmake
+++ b/setting.cmake
@@ -34,7 +34,7 @@ endif()
 
 
 # -mfloat-abi=soft  -u _printf_float 
-set(CMAKE_C_FLAGS "-mcpu=${CONFIG_ARCH}  -O2 -g3 -lc -lrdimon -mfloat-abi=${FLOAT_TYPE} -u _printf_float -D=MKRTOS \
+set(CMAKE_C_FLAGS "-mcpu=${CONFIG_ARCH}  -O0 -g3 -lc -lrdimon -mfloat-abi=${FLOAT_TYPE} -u _printf_float -D=MKRTOS \
 -std=gnu11 -ffunction-sections -fdata-sections -fno-builtin \
 -nostartfiles -nodefaultlibs -nostdlib -nostdinc -Xlinker  \
 -fno-stack-protector -Wl,--gc-sections \