https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1734f2972143d90d8fa6d53593c1828b6ad31b63
commit 1734f2972143d90d8fa6d53593c1828b6ad31b63 Author: Victor Perevertkin <[email protected]> AuthorDate: Mon Jan 30 23:08:38 2023 +0300 Commit: Victor Perevertkin <[email protected]> CommitDate: Wed Feb 1 02:31:14 2023 +0300 [IP][LWIP][TCPIP] Move ip and lwip libraries to drivers/network/tcpip These libraries are used only inside tcpip.sys driver so move them close to it. --- drivers/network/tcpip/CMakeLists.txt | 14 +++++++++----- .../network/tcpip}/chew/workqueue.c | 6 +----- .../chew => drivers/network/tcpip/include}/chew.h | 0 drivers/network/tcpip/include/precomp.h | 2 +- .../network/tcpip}/ip/CMakeLists.txt | 10 +++++++--- .../network/tcpip}/ip/network/address.c | 0 .../network/tcpip}/ip/network/arp.c | 0 .../network/tcpip}/ip/network/checksum.c | 0 .../network/tcpip}/ip/network/i386/checksum.S | 0 .../network/tcpip}/ip/network/icmp.c | 0 .../network/tcpip}/ip/network/interface.c | 0 .../network/tcpip}/ip/network/ip.c | 0 .../network/tcpip}/ip/network/loopback.c | 0 .../network/tcpip}/ip/network/neighbor.c | 0 .../network/tcpip}/ip/network/ports.c | 0 .../network/tcpip}/ip/network/receive.c | 0 .../network/tcpip}/ip/network/router.c | 0 .../network/tcpip}/ip/network/routines.c | 0 .../network/tcpip}/ip/network/transmit.c | 0 .../drivers => drivers/network/tcpip}/ip/precomp.h | 2 +- .../network/tcpip}/ip/transport/datagram/datagram.c | 0 .../network/tcpip}/ip/transport/rawip/rawip.c | 0 .../network/tcpip}/ip/transport/tcp/accept.c | 0 .../network/tcpip}/ip/transport/tcp/event.c | 0 .../network/tcpip}/ip/transport/tcp/if.c | 0 .../network/tcpip}/ip/transport/tcp/tcp.c | 0 .../network/tcpip}/ip/transport/udp/udp.c | 0 .../network/tcpip}/lwip/CHANGELOG | 0 .../network/tcpip}/lwip/CMakeLists.txt | 21 ++++++++------------- .../drivers => drivers/network/tcpip}/lwip/COPYING | 0 .../drivers => drivers/network/tcpip}/lwip/FILES | 0 .../drivers => drivers/network/tcpip}/lwip/README | 0 .../network/tcpip}/lwip/UPGRADING | 0 .../network/tcpip}/lwip/doc/FILES | 0 .../network/tcpip}/lwip/doc/contrib.txt | 0 .../network/tcpip}/lwip/doc/rawapi.txt | 0 .../network/tcpip}/lwip/doc/savannah.txt | 0 .../network/tcpip}/lwip/doc/snmp_agent.txt | 0 .../network/tcpip}/lwip/doc/sys_arch.txt | 0 .../network/tcpip}/lwip/precomp.h | 0 .../network/tcpip}/lwip/src/FILES | 0 .../network/tcpip}/lwip/src/api/api_lib.c | 0 .../network/tcpip}/lwip/src/api/api_msg.c | 0 .../network/tcpip}/lwip/src/api/err.c | 0 .../network/tcpip}/lwip/src/api/netbuf.c | 0 .../network/tcpip}/lwip/src/api/netdb.c | 0 .../network/tcpip}/lwip/src/api/netifapi.c | 0 .../network/tcpip}/lwip/src/api/sockets.c | 0 .../network/tcpip}/lwip/src/api/tcpip.c | 0 .../network/tcpip}/lwip/src/core/def.c | 0 .../network/tcpip}/lwip/src/core/dhcp.c | 0 .../network/tcpip}/lwip/src/core/dns.c | 0 .../network/tcpip}/lwip/src/core/init.c | 0 .../network/tcpip}/lwip/src/core/ipv4/autoip.c | 0 .../network/tcpip}/lwip/src/core/ipv4/icmp.c | 0 .../network/tcpip}/lwip/src/core/ipv4/igmp.c | 0 .../network/tcpip}/lwip/src/core/ipv4/inet.c | 0 .../network/tcpip}/lwip/src/core/ipv4/inet_chksum.c | 0 .../network/tcpip}/lwip/src/core/ipv4/ip.c | 0 .../network/tcpip}/lwip/src/core/ipv4/ip_addr.c | 0 .../network/tcpip}/lwip/src/core/ipv4/ip_frag.c | 0 .../network/tcpip}/lwip/src/core/ipv6/README | 0 .../network/tcpip}/lwip/src/core/ipv6/icmp6.c | 0 .../network/tcpip}/lwip/src/core/ipv6/inet6.c | 0 .../network/tcpip}/lwip/src/core/ipv6/ip6.c | 0 .../network/tcpip}/lwip/src/core/ipv6/ip6_addr.c | 0 .../network/tcpip}/lwip/src/core/mem.c | 0 .../network/tcpip}/lwip/src/core/memp.c | 0 .../network/tcpip}/lwip/src/core/netif.c | 0 .../network/tcpip}/lwip/src/core/pbuf.c | 0 .../network/tcpip}/lwip/src/core/raw.c | 0 .../network/tcpip}/lwip/src/core/snmp/asn1_dec.c | 0 .../network/tcpip}/lwip/src/core/snmp/asn1_enc.c | 0 .../network/tcpip}/lwip/src/core/snmp/mib2.c | 0 .../network/tcpip}/lwip/src/core/snmp/mib_structs.c | 0 .../network/tcpip}/lwip/src/core/snmp/msg_in.c | 0 .../network/tcpip}/lwip/src/core/snmp/msg_out.c | 0 .../network/tcpip}/lwip/src/core/stats.c | 0 .../network/tcpip}/lwip/src/core/sys.c | 0 .../network/tcpip}/lwip/src/core/tcp.c | 0 .../network/tcpip}/lwip/src/core/tcp_in.c | 0 .../network/tcpip}/lwip/src/core/tcp_out.c | 0 .../network/tcpip}/lwip/src/core/timers.c | 0 .../network/tcpip}/lwip/src/core/udp.c | 0 .../network/tcpip}/lwip/src/include/arch/bpstruct.h | 0 .../network/tcpip}/lwip/src/include/arch/cc.h | 0 .../network/tcpip}/lwip/src/include/arch/epstruct.h | 0 .../network/tcpip}/lwip/src/include/arch/perf.h | 0 .../network/tcpip}/lwip/src/include/arch/sys_arch.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/autoip.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/icmp.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/igmp.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/inet.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/inet_chksum.h | 0 .../network/tcpip}/lwip/src/include/ipv4/lwip/ip.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/ip_addr.h | 0 .../tcpip}/lwip/src/include/ipv4/lwip/ip_frag.h | 0 .../tcpip}/lwip/src/include/ipv6/lwip/icmp.h | 0 .../tcpip}/lwip/src/include/ipv6/lwip/inet.h | 0 .../network/tcpip}/lwip/src/include/ipv6/lwip/ip.h | 0 .../tcpip}/lwip/src/include/ipv6/lwip/ip_addr.h | 0 .../network/tcpip}/lwip/src/include/lwip/api.h | 0 .../network/tcpip}/lwip/src/include/lwip/api_msg.h | 0 .../network/tcpip}/lwip/src/include/lwip/arch.h | 0 .../network/tcpip}/lwip/src/include/lwip/debug.h | 0 .../network/tcpip}/lwip/src/include/lwip/def.h | 0 .../network/tcpip}/lwip/src/include/lwip/dhcp.h | 0 .../network/tcpip}/lwip/src/include/lwip/dns.h | 0 .../network/tcpip}/lwip/src/include/lwip/err.h | 0 .../network/tcpip}/lwip/src/include/lwip/init.h | 0 .../network/tcpip}/lwip/src/include/lwip/mem.h | 0 .../network/tcpip}/lwip/src/include/lwip/memp.h | 0 .../network/tcpip}/lwip/src/include/lwip/memp_std.h | 0 .../network/tcpip}/lwip/src/include/lwip/netbuf.h | 0 .../network/tcpip}/lwip/src/include/lwip/netdb.h | 0 .../network/tcpip}/lwip/src/include/lwip/netif.h | 0 .../network/tcpip}/lwip/src/include/lwip/netifapi.h | 0 .../network/tcpip}/lwip/src/include/lwip/opt.h | 0 .../network/tcpip}/lwip/src/include/lwip/pbuf.h | 0 .../network/tcpip}/lwip/src/include/lwip/raw.h | 0 .../network/tcpip}/lwip/src/include/lwip/sio.h | 0 .../network/tcpip}/lwip/src/include/lwip/snmp.h | 0 .../tcpip}/lwip/src/include/lwip/snmp_asn1.h | 0 .../network/tcpip}/lwip/src/include/lwip/snmp_msg.h | 0 .../tcpip}/lwip/src/include/lwip/snmp_structs.h | 0 .../network/tcpip}/lwip/src/include/lwip/sockets.h | 0 .../network/tcpip}/lwip/src/include/lwip/stats.h | 0 .../network/tcpip}/lwip/src/include/lwip/sys.h | 0 .../network/tcpip}/lwip/src/include/lwip/tcp.h | 0 .../network/tcpip}/lwip/src/include/lwip/tcp_impl.h | 0 .../network/tcpip}/lwip/src/include/lwip/tcpip.h | 0 .../network/tcpip}/lwip/src/include/lwip/timers.h | 0 .../network/tcpip}/lwip/src/include/lwip/udp.h | 0 .../network/tcpip}/lwip/src/include/lwipopts.h | 0 .../network/tcpip}/lwip/src/include/netif/etharp.h | 0 .../network/tcpip}/lwip/src/include/netif/loopif.h | 0 .../network/tcpip}/lwip/src/include/netif/ppp_oe.h | 0 .../network/tcpip}/lwip/src/include/netif/slipif.h | 0 .../network/tcpip}/lwip/src/include/rosip.h | 0 .../network/tcpip}/lwip/src/netif/FILES | 0 .../network/tcpip}/lwip/src/netif/etharp.c | 0 .../network/tcpip}/lwip/src/netif/ethernetif.c | 0 .../network/tcpip}/lwip/src/netif/ppp/auth.c | 0 .../network/tcpip}/lwip/src/netif/ppp/auth.h | 0 .../network/tcpip}/lwip/src/netif/ppp/chap.c | 0 .../network/tcpip}/lwip/src/netif/ppp/chap.h | 0 .../network/tcpip}/lwip/src/netif/ppp/chpms.c | 0 .../network/tcpip}/lwip/src/netif/ppp/chpms.h | 0 .../network/tcpip}/lwip/src/netif/ppp/fsm.c | 0 .../network/tcpip}/lwip/src/netif/ppp/fsm.h | 0 .../network/tcpip}/lwip/src/netif/ppp/ipcp.c | 0 .../network/tcpip}/lwip/src/netif/ppp/ipcp.h | 0 .../network/tcpip}/lwip/src/netif/ppp/lcp.c | 0 .../network/tcpip}/lwip/src/netif/ppp/lcp.h | 0 .../network/tcpip}/lwip/src/netif/ppp/magic.c | 0 .../network/tcpip}/lwip/src/netif/ppp/magic.h | 0 .../network/tcpip}/lwip/src/netif/ppp/md5.c | 0 .../network/tcpip}/lwip/src/netif/ppp/md5.h | 0 .../network/tcpip}/lwip/src/netif/ppp/pap.c | 0 .../network/tcpip}/lwip/src/netif/ppp/pap.h | 0 .../network/tcpip}/lwip/src/netif/ppp/ppp.c | 0 .../network/tcpip}/lwip/src/netif/ppp/ppp.h | 0 .../network/tcpip}/lwip/src/netif/ppp/ppp_oe.c | 0 .../network/tcpip}/lwip/src/netif/ppp/pppdebug.h | 0 .../network/tcpip}/lwip/src/netif/ppp/randm.c | 0 .../network/tcpip}/lwip/src/netif/ppp/randm.h | 0 .../network/tcpip}/lwip/src/netif/ppp/vj.c | 0 .../network/tcpip}/lwip/src/netif/ppp/vj.h | 0 .../network/tcpip}/lwip/src/netif/slipif.c | 0 .../network/tcpip}/lwip/src/rosip.c | 0 .../network/tcpip}/lwip/src/rosmem.c | 0 .../network/tcpip}/lwip/src/rostcp.c | 0 .../network/tcpip}/lwip/src/sys_arch.c | 0 .../network/tcpip}/lwip/test/unit/lwip_check.h | 0 .../network/tcpip}/lwip/test/unit/lwip_unittests.c | 0 .../network/tcpip}/lwip/test/unit/tcp/tcp_helper.c | 0 .../network/tcpip}/lwip/test/unit/tcp/tcp_helper.h | 0 .../network/tcpip}/lwip/test/unit/tcp/test_tcp.c | 0 .../network/tcpip}/lwip/test/unit/tcp/test_tcp.h | 0 .../tcpip}/lwip/test/unit/tcp/test_tcp_oos.c | 0 .../tcpip}/lwip/test/unit/tcp/test_tcp_oos.h | 0 .../network/tcpip}/lwip/test/unit/udp/test_udp.c | 0 .../network/tcpip}/lwip/test/unit/udp/test_udp.h | 0 media/doc/3rd Party Files.txt | 4 ++-- sdk/lib/drivers/CMakeLists.txt | 3 --- sdk/lib/drivers/chew/CMakeLists.txt | 4 ---- 186 files changed, 29 insertions(+), 37 deletions(-) diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt index 53b2c571cff..7e6426d24f3 100644 --- a/drivers/network/tcpip/CMakeLists.txt +++ b/drivers/network/tcpip/CMakeLists.txt @@ -1,8 +1,6 @@ -include_directories( - BEFORE include - ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include - ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include/ipv4) +add_subdirectory(lwip) +add_subdirectory(ip) add_definitions( -DNDIS40 @@ -11,6 +9,7 @@ add_definitions( spec2def(tcpip.sys tcpip.spec) list(APPEND SOURCE + chew/workqueue.c datalink/lan.c tcpip/ainfo.c tcpip/buffer.c @@ -33,7 +32,12 @@ add_library(tcpip MODULE tcpip.rc ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def) -target_link_libraries(tcpip ip lwip ${PSEH_LIB} chew) +target_include_directories(tcpip BEFORE + PRIVATE include + PRIVATE lwip/src/include + PRIVATE lwip/src/include/ipv4) + +target_link_libraries(tcpip ip lwip ${PSEH_LIB}) set_module_type(tcpip kernelmodedriver) add_importlibs(tcpip ndis ntoskrnl hal) add_pch(tcpip include/precomp.h SOURCE) diff --git a/sdk/lib/drivers/chew/workqueue.c b/drivers/network/tcpip/chew/workqueue.c similarity index 96% rename from sdk/lib/drivers/chew/workqueue.c rename to drivers/network/tcpip/chew/workqueue.c index 81c0467e4b5..82f0993f60b 100644 --- a/sdk/lib/drivers/chew/workqueue.c +++ b/drivers/network/tcpip/chew/workqueue.c @@ -7,11 +7,7 @@ * PROGRAMMERS: arty ([email protected]) */ -#include <ntddk.h> -#include <chew/chew.h> - -#define NDEBUG -//#include <debug.h> +#include <wdm.h> #define FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z)) #define CHEW_TAG FOURCC('C','H','E','W') diff --git a/sdk/include/reactos/chew/chew.h b/drivers/network/tcpip/include/chew.h similarity index 100% rename from sdk/include/reactos/chew/chew.h rename to drivers/network/tcpip/include/chew.h diff --git a/drivers/network/tcpip/include/precomp.h b/drivers/network/tcpip/include/precomp.h index 3055bc57bd3..e56ec785f8e 100644 --- a/drivers/network/tcpip/include/precomp.h +++ b/drivers/network/tcpip/include/precomp.h @@ -16,7 +16,7 @@ #include <lock.h> #include <interface.h> #include <fileobjs.h> -#include <chew/chew.h> +#include "chew.h" #include <pseh/pseh2.h> #include <psdk/ipexport.h> diff --git a/sdk/lib/drivers/ip/CMakeLists.txt b/drivers/network/tcpip/ip/CMakeLists.txt similarity index 74% rename from sdk/lib/drivers/ip/CMakeLists.txt rename to drivers/network/tcpip/ip/CMakeLists.txt index 8065abe96d5..65488a5df19 100644 --- a/sdk/lib/drivers/ip/CMakeLists.txt +++ b/drivers/network/tcpip/ip/CMakeLists.txt @@ -28,9 +28,13 @@ list(APPEND SOURCE transport/tcp/event.c transport/tcp/if.c transport/tcp/tcp.c - transport/udp/udp.c - precomp.h) + transport/udp/udp.c) add_library(ip ${SOURCE} ${ip_asm}) + +target_include_directories(ip BEFORE + PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include + PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include + PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include/ipv4) + add_pch(ip precomp.h SOURCE) -add_dependencies(ip asm) diff --git a/sdk/lib/drivers/ip/network/address.c b/drivers/network/tcpip/ip/network/address.c similarity index 100% rename from sdk/lib/drivers/ip/network/address.c rename to drivers/network/tcpip/ip/network/address.c diff --git a/sdk/lib/drivers/ip/network/arp.c b/drivers/network/tcpip/ip/network/arp.c similarity index 100% rename from sdk/lib/drivers/ip/network/arp.c rename to drivers/network/tcpip/ip/network/arp.c diff --git a/sdk/lib/drivers/ip/network/checksum.c b/drivers/network/tcpip/ip/network/checksum.c similarity index 100% rename from sdk/lib/drivers/ip/network/checksum.c rename to drivers/network/tcpip/ip/network/checksum.c diff --git a/sdk/lib/drivers/ip/network/i386/checksum.S b/drivers/network/tcpip/ip/network/i386/checksum.S similarity index 100% rename from sdk/lib/drivers/ip/network/i386/checksum.S rename to drivers/network/tcpip/ip/network/i386/checksum.S diff --git a/sdk/lib/drivers/ip/network/icmp.c b/drivers/network/tcpip/ip/network/icmp.c similarity index 100% rename from sdk/lib/drivers/ip/network/icmp.c rename to drivers/network/tcpip/ip/network/icmp.c diff --git a/sdk/lib/drivers/ip/network/interface.c b/drivers/network/tcpip/ip/network/interface.c similarity index 100% rename from sdk/lib/drivers/ip/network/interface.c rename to drivers/network/tcpip/ip/network/interface.c diff --git a/sdk/lib/drivers/ip/network/ip.c b/drivers/network/tcpip/ip/network/ip.c similarity index 100% rename from sdk/lib/drivers/ip/network/ip.c rename to drivers/network/tcpip/ip/network/ip.c diff --git a/sdk/lib/drivers/ip/network/loopback.c b/drivers/network/tcpip/ip/network/loopback.c similarity index 100% rename from sdk/lib/drivers/ip/network/loopback.c rename to drivers/network/tcpip/ip/network/loopback.c diff --git a/sdk/lib/drivers/ip/network/neighbor.c b/drivers/network/tcpip/ip/network/neighbor.c similarity index 100% rename from sdk/lib/drivers/ip/network/neighbor.c rename to drivers/network/tcpip/ip/network/neighbor.c diff --git a/sdk/lib/drivers/ip/network/ports.c b/drivers/network/tcpip/ip/network/ports.c similarity index 100% rename from sdk/lib/drivers/ip/network/ports.c rename to drivers/network/tcpip/ip/network/ports.c diff --git a/sdk/lib/drivers/ip/network/receive.c b/drivers/network/tcpip/ip/network/receive.c similarity index 100% rename from sdk/lib/drivers/ip/network/receive.c rename to drivers/network/tcpip/ip/network/receive.c diff --git a/sdk/lib/drivers/ip/network/router.c b/drivers/network/tcpip/ip/network/router.c similarity index 100% rename from sdk/lib/drivers/ip/network/router.c rename to drivers/network/tcpip/ip/network/router.c diff --git a/sdk/lib/drivers/ip/network/routines.c b/drivers/network/tcpip/ip/network/routines.c similarity index 100% rename from sdk/lib/drivers/ip/network/routines.c rename to drivers/network/tcpip/ip/network/routines.c diff --git a/sdk/lib/drivers/ip/network/transmit.c b/drivers/network/tcpip/ip/network/transmit.c similarity index 100% rename from sdk/lib/drivers/ip/network/transmit.c rename to drivers/network/tcpip/ip/network/transmit.c diff --git a/sdk/lib/drivers/ip/precomp.h b/drivers/network/tcpip/ip/precomp.h similarity index 94% rename from sdk/lib/drivers/ip/precomp.h rename to drivers/network/tcpip/ip/precomp.h index dd194da3558..85f756ecc64 100644 --- a/sdk/lib/drivers/ip/precomp.h +++ b/drivers/network/tcpip/ip/precomp.h @@ -19,6 +19,6 @@ #include <lock.h> #include <interface.h> #include <ports.h> -#include <chew/chew.h> +#include <chew.h> #endif /* _IP_PCH_ */ diff --git a/sdk/lib/drivers/ip/transport/datagram/datagram.c b/drivers/network/tcpip/ip/transport/datagram/datagram.c similarity index 100% rename from sdk/lib/drivers/ip/transport/datagram/datagram.c rename to drivers/network/tcpip/ip/transport/datagram/datagram.c diff --git a/sdk/lib/drivers/ip/transport/rawip/rawip.c b/drivers/network/tcpip/ip/transport/rawip/rawip.c similarity index 100% rename from sdk/lib/drivers/ip/transport/rawip/rawip.c rename to drivers/network/tcpip/ip/transport/rawip/rawip.c diff --git a/sdk/lib/drivers/ip/transport/tcp/accept.c b/drivers/network/tcpip/ip/transport/tcp/accept.c similarity index 100% rename from sdk/lib/drivers/ip/transport/tcp/accept.c rename to drivers/network/tcpip/ip/transport/tcp/accept.c diff --git a/sdk/lib/drivers/ip/transport/tcp/event.c b/drivers/network/tcpip/ip/transport/tcp/event.c similarity index 100% rename from sdk/lib/drivers/ip/transport/tcp/event.c rename to drivers/network/tcpip/ip/transport/tcp/event.c diff --git a/sdk/lib/drivers/ip/transport/tcp/if.c b/drivers/network/tcpip/ip/transport/tcp/if.c similarity index 100% rename from sdk/lib/drivers/ip/transport/tcp/if.c rename to drivers/network/tcpip/ip/transport/tcp/if.c diff --git a/sdk/lib/drivers/ip/transport/tcp/tcp.c b/drivers/network/tcpip/ip/transport/tcp/tcp.c similarity index 100% rename from sdk/lib/drivers/ip/transport/tcp/tcp.c rename to drivers/network/tcpip/ip/transport/tcp/tcp.c diff --git a/sdk/lib/drivers/ip/transport/udp/udp.c b/drivers/network/tcpip/ip/transport/udp/udp.c similarity index 100% rename from sdk/lib/drivers/ip/transport/udp/udp.c rename to drivers/network/tcpip/ip/transport/udp/udp.c diff --git a/sdk/lib/drivers/lwip/CHANGELOG b/drivers/network/tcpip/lwip/CHANGELOG similarity index 100% rename from sdk/lib/drivers/lwip/CHANGELOG rename to drivers/network/tcpip/lwip/CHANGELOG diff --git a/sdk/lib/drivers/lwip/CMakeLists.txt b/drivers/network/tcpip/lwip/CMakeLists.txt similarity index 78% rename from sdk/lib/drivers/lwip/CMakeLists.txt rename to drivers/network/tcpip/lwip/CMakeLists.txt index f2faa8db92e..c9d799914dd 100644 --- a/sdk/lib/drivers/lwip/CMakeLists.txt +++ b/drivers/network/tcpip/lwip/CMakeLists.txt @@ -1,14 +1,4 @@ -include_directories( - BEFORE include - ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include - ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include - ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include/ipv4) - -include_directories( - src/include - src/include/ipv4) - list(APPEND SOURCE src/rosip.c src/rostcp.c @@ -55,13 +45,18 @@ list(APPEND SOURCE src/core/snmp/mib_structs.c src/core/snmp/mib2.c src/core/snmp/msg_in.c - src/core/snmp/msg_out.c - precomp.h) + src/core/snmp/msg_out.c) add_library(lwip ${SOURCE}) + +target_include_directories(lwip BEFORE + PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include + PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include + PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include/ipv4) + add_dependencies(lwip bugcodes xdk) add_pch(lwip precomp.h SOURCE) -if((NOT MSVC) AND LTCG) +if(NOT MSVC) target_compile_options(lwip PRIVATE -fno-builtin-malloc -fno-builtin-free) endif() diff --git a/sdk/lib/drivers/lwip/COPYING b/drivers/network/tcpip/lwip/COPYING similarity index 100% rename from sdk/lib/drivers/lwip/COPYING rename to drivers/network/tcpip/lwip/COPYING diff --git a/sdk/lib/drivers/lwip/FILES b/drivers/network/tcpip/lwip/FILES similarity index 100% rename from sdk/lib/drivers/lwip/FILES rename to drivers/network/tcpip/lwip/FILES diff --git a/sdk/lib/drivers/lwip/README b/drivers/network/tcpip/lwip/README similarity index 100% rename from sdk/lib/drivers/lwip/README rename to drivers/network/tcpip/lwip/README diff --git a/sdk/lib/drivers/lwip/UPGRADING b/drivers/network/tcpip/lwip/UPGRADING similarity index 100% rename from sdk/lib/drivers/lwip/UPGRADING rename to drivers/network/tcpip/lwip/UPGRADING diff --git a/sdk/lib/drivers/lwip/doc/FILES b/drivers/network/tcpip/lwip/doc/FILES similarity index 100% rename from sdk/lib/drivers/lwip/doc/FILES rename to drivers/network/tcpip/lwip/doc/FILES diff --git a/sdk/lib/drivers/lwip/doc/contrib.txt b/drivers/network/tcpip/lwip/doc/contrib.txt similarity index 100% rename from sdk/lib/drivers/lwip/doc/contrib.txt rename to drivers/network/tcpip/lwip/doc/contrib.txt diff --git a/sdk/lib/drivers/lwip/doc/rawapi.txt b/drivers/network/tcpip/lwip/doc/rawapi.txt similarity index 100% rename from sdk/lib/drivers/lwip/doc/rawapi.txt rename to drivers/network/tcpip/lwip/doc/rawapi.txt diff --git a/sdk/lib/drivers/lwip/doc/savannah.txt b/drivers/network/tcpip/lwip/doc/savannah.txt similarity index 100% rename from sdk/lib/drivers/lwip/doc/savannah.txt rename to drivers/network/tcpip/lwip/doc/savannah.txt diff --git a/sdk/lib/drivers/lwip/doc/snmp_agent.txt b/drivers/network/tcpip/lwip/doc/snmp_agent.txt similarity index 100% rename from sdk/lib/drivers/lwip/doc/snmp_agent.txt rename to drivers/network/tcpip/lwip/doc/snmp_agent.txt diff --git a/sdk/lib/drivers/lwip/doc/sys_arch.txt b/drivers/network/tcpip/lwip/doc/sys_arch.txt similarity index 100% rename from sdk/lib/drivers/lwip/doc/sys_arch.txt rename to drivers/network/tcpip/lwip/doc/sys_arch.txt diff --git a/sdk/lib/drivers/lwip/precomp.h b/drivers/network/tcpip/lwip/precomp.h similarity index 100% rename from sdk/lib/drivers/lwip/precomp.h rename to drivers/network/tcpip/lwip/precomp.h diff --git a/sdk/lib/drivers/lwip/src/FILES b/drivers/network/tcpip/lwip/src/FILES similarity index 100% rename from sdk/lib/drivers/lwip/src/FILES rename to drivers/network/tcpip/lwip/src/FILES diff --git a/sdk/lib/drivers/lwip/src/api/api_lib.c b/drivers/network/tcpip/lwip/src/api/api_lib.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/api_lib.c rename to drivers/network/tcpip/lwip/src/api/api_lib.c diff --git a/sdk/lib/drivers/lwip/src/api/api_msg.c b/drivers/network/tcpip/lwip/src/api/api_msg.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/api_msg.c rename to drivers/network/tcpip/lwip/src/api/api_msg.c diff --git a/sdk/lib/drivers/lwip/src/api/err.c b/drivers/network/tcpip/lwip/src/api/err.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/err.c rename to drivers/network/tcpip/lwip/src/api/err.c diff --git a/sdk/lib/drivers/lwip/src/api/netbuf.c b/drivers/network/tcpip/lwip/src/api/netbuf.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/netbuf.c rename to drivers/network/tcpip/lwip/src/api/netbuf.c diff --git a/sdk/lib/drivers/lwip/src/api/netdb.c b/drivers/network/tcpip/lwip/src/api/netdb.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/netdb.c rename to drivers/network/tcpip/lwip/src/api/netdb.c diff --git a/sdk/lib/drivers/lwip/src/api/netifapi.c b/drivers/network/tcpip/lwip/src/api/netifapi.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/netifapi.c rename to drivers/network/tcpip/lwip/src/api/netifapi.c diff --git a/sdk/lib/drivers/lwip/src/api/sockets.c b/drivers/network/tcpip/lwip/src/api/sockets.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/sockets.c rename to drivers/network/tcpip/lwip/src/api/sockets.c diff --git a/sdk/lib/drivers/lwip/src/api/tcpip.c b/drivers/network/tcpip/lwip/src/api/tcpip.c similarity index 100% rename from sdk/lib/drivers/lwip/src/api/tcpip.c rename to drivers/network/tcpip/lwip/src/api/tcpip.c diff --git a/sdk/lib/drivers/lwip/src/core/def.c b/drivers/network/tcpip/lwip/src/core/def.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/def.c rename to drivers/network/tcpip/lwip/src/core/def.c diff --git a/sdk/lib/drivers/lwip/src/core/dhcp.c b/drivers/network/tcpip/lwip/src/core/dhcp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/dhcp.c rename to drivers/network/tcpip/lwip/src/core/dhcp.c diff --git a/sdk/lib/drivers/lwip/src/core/dns.c b/drivers/network/tcpip/lwip/src/core/dns.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/dns.c rename to drivers/network/tcpip/lwip/src/core/dns.c diff --git a/sdk/lib/drivers/lwip/src/core/init.c b/drivers/network/tcpip/lwip/src/core/init.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/init.c rename to drivers/network/tcpip/lwip/src/core/init.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/autoip.c b/drivers/network/tcpip/lwip/src/core/ipv4/autoip.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/autoip.c rename to drivers/network/tcpip/lwip/src/core/ipv4/autoip.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/icmp.c b/drivers/network/tcpip/lwip/src/core/ipv4/icmp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/icmp.c rename to drivers/network/tcpip/lwip/src/core/ipv4/icmp.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/igmp.c b/drivers/network/tcpip/lwip/src/core/ipv4/igmp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/igmp.c rename to drivers/network/tcpip/lwip/src/core/ipv4/igmp.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/inet.c b/drivers/network/tcpip/lwip/src/core/ipv4/inet.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/inet.c rename to drivers/network/tcpip/lwip/src/core/ipv4/inet.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c b/drivers/network/tcpip/lwip/src/core/ipv4/inet_chksum.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c rename to drivers/network/tcpip/lwip/src/core/ipv4/inet_chksum.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/ip.c b/drivers/network/tcpip/lwip/src/core/ipv4/ip.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/ip.c rename to drivers/network/tcpip/lwip/src/core/ipv4/ip.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c b/drivers/network/tcpip/lwip/src/core/ipv4/ip_addr.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c rename to drivers/network/tcpip/lwip/src/core/ipv4/ip_addr.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c b/drivers/network/tcpip/lwip/src/core/ipv4/ip_frag.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c rename to drivers/network/tcpip/lwip/src/core/ipv4/ip_frag.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/README b/drivers/network/tcpip/lwip/src/core/ipv6/README similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv6/README rename to drivers/network/tcpip/lwip/src/core/ipv6/README diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/icmp6.c b/drivers/network/tcpip/lwip/src/core/ipv6/icmp6.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv6/icmp6.c rename to drivers/network/tcpip/lwip/src/core/ipv6/icmp6.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/inet6.c b/drivers/network/tcpip/lwip/src/core/ipv6/inet6.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv6/inet6.c rename to drivers/network/tcpip/lwip/src/core/ipv6/inet6.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/ip6.c b/drivers/network/tcpip/lwip/src/core/ipv6/ip6.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv6/ip6.c rename to drivers/network/tcpip/lwip/src/core/ipv6/ip6.c diff --git a/sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c b/drivers/network/tcpip/lwip/src/core/ipv6/ip6_addr.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c rename to drivers/network/tcpip/lwip/src/core/ipv6/ip6_addr.c diff --git a/sdk/lib/drivers/lwip/src/core/mem.c b/drivers/network/tcpip/lwip/src/core/mem.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/mem.c rename to drivers/network/tcpip/lwip/src/core/mem.c diff --git a/sdk/lib/drivers/lwip/src/core/memp.c b/drivers/network/tcpip/lwip/src/core/memp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/memp.c rename to drivers/network/tcpip/lwip/src/core/memp.c diff --git a/sdk/lib/drivers/lwip/src/core/netif.c b/drivers/network/tcpip/lwip/src/core/netif.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/netif.c rename to drivers/network/tcpip/lwip/src/core/netif.c diff --git a/sdk/lib/drivers/lwip/src/core/pbuf.c b/drivers/network/tcpip/lwip/src/core/pbuf.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/pbuf.c rename to drivers/network/tcpip/lwip/src/core/pbuf.c diff --git a/sdk/lib/drivers/lwip/src/core/raw.c b/drivers/network/tcpip/lwip/src/core/raw.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/raw.c rename to drivers/network/tcpip/lwip/src/core/raw.c diff --git a/sdk/lib/drivers/lwip/src/core/snmp/asn1_dec.c b/drivers/network/tcpip/lwip/src/core/snmp/asn1_dec.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/snmp/asn1_dec.c rename to drivers/network/tcpip/lwip/src/core/snmp/asn1_dec.c diff --git a/sdk/lib/drivers/lwip/src/core/snmp/asn1_enc.c b/drivers/network/tcpip/lwip/src/core/snmp/asn1_enc.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/snmp/asn1_enc.c rename to drivers/network/tcpip/lwip/src/core/snmp/asn1_enc.c diff --git a/sdk/lib/drivers/lwip/src/core/snmp/mib2.c b/drivers/network/tcpip/lwip/src/core/snmp/mib2.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/snmp/mib2.c rename to drivers/network/tcpip/lwip/src/core/snmp/mib2.c diff --git a/sdk/lib/drivers/lwip/src/core/snmp/mib_structs.c b/drivers/network/tcpip/lwip/src/core/snmp/mib_structs.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/snmp/mib_structs.c rename to drivers/network/tcpip/lwip/src/core/snmp/mib_structs.c diff --git a/sdk/lib/drivers/lwip/src/core/snmp/msg_in.c b/drivers/network/tcpip/lwip/src/core/snmp/msg_in.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/snmp/msg_in.c rename to drivers/network/tcpip/lwip/src/core/snmp/msg_in.c diff --git a/sdk/lib/drivers/lwip/src/core/snmp/msg_out.c b/drivers/network/tcpip/lwip/src/core/snmp/msg_out.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/snmp/msg_out.c rename to drivers/network/tcpip/lwip/src/core/snmp/msg_out.c diff --git a/sdk/lib/drivers/lwip/src/core/stats.c b/drivers/network/tcpip/lwip/src/core/stats.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/stats.c rename to drivers/network/tcpip/lwip/src/core/stats.c diff --git a/sdk/lib/drivers/lwip/src/core/sys.c b/drivers/network/tcpip/lwip/src/core/sys.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/sys.c rename to drivers/network/tcpip/lwip/src/core/sys.c diff --git a/sdk/lib/drivers/lwip/src/core/tcp.c b/drivers/network/tcpip/lwip/src/core/tcp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/tcp.c rename to drivers/network/tcpip/lwip/src/core/tcp.c diff --git a/sdk/lib/drivers/lwip/src/core/tcp_in.c b/drivers/network/tcpip/lwip/src/core/tcp_in.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/tcp_in.c rename to drivers/network/tcpip/lwip/src/core/tcp_in.c diff --git a/sdk/lib/drivers/lwip/src/core/tcp_out.c b/drivers/network/tcpip/lwip/src/core/tcp_out.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/tcp_out.c rename to drivers/network/tcpip/lwip/src/core/tcp_out.c diff --git a/sdk/lib/drivers/lwip/src/core/timers.c b/drivers/network/tcpip/lwip/src/core/timers.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/timers.c rename to drivers/network/tcpip/lwip/src/core/timers.c diff --git a/sdk/lib/drivers/lwip/src/core/udp.c b/drivers/network/tcpip/lwip/src/core/udp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/core/udp.c rename to drivers/network/tcpip/lwip/src/core/udp.c diff --git a/sdk/lib/drivers/lwip/src/include/arch/bpstruct.h b/drivers/network/tcpip/lwip/src/include/arch/bpstruct.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/arch/bpstruct.h rename to drivers/network/tcpip/lwip/src/include/arch/bpstruct.h diff --git a/sdk/lib/drivers/lwip/src/include/arch/cc.h b/drivers/network/tcpip/lwip/src/include/arch/cc.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/arch/cc.h rename to drivers/network/tcpip/lwip/src/include/arch/cc.h diff --git a/sdk/lib/drivers/lwip/src/include/arch/epstruct.h b/drivers/network/tcpip/lwip/src/include/arch/epstruct.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/arch/epstruct.h rename to drivers/network/tcpip/lwip/src/include/arch/epstruct.h diff --git a/sdk/lib/drivers/lwip/src/include/arch/perf.h b/drivers/network/tcpip/lwip/src/include/arch/perf.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/arch/perf.h rename to drivers/network/tcpip/lwip/src/include/arch/perf.h diff --git a/sdk/lib/drivers/lwip/src/include/arch/sys_arch.h b/drivers/network/tcpip/lwip/src/include/arch/sys_arch.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/arch/sys_arch.h rename to drivers/network/tcpip/lwip/src/include/arch/sys_arch.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/autoip.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/autoip.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/autoip.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/icmp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/icmp.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/igmp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/igmp.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/inet.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/inet.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet_chksum.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/inet_chksum.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet_chksum.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/inet_chksum.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/ip.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/ip.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_addr.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/ip_addr.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_addr.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/ip_addr.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_frag.h b/drivers/network/tcpip/lwip/src/include/ipv4/lwip/ip_frag.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip_frag.h rename to drivers/network/tcpip/lwip/src/include/ipv4/lwip/ip_frag.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h b/drivers/network/tcpip/lwip/src/include/ipv6/lwip/icmp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h rename to drivers/network/tcpip/lwip/src/include/ipv6/lwip/icmp.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h b/drivers/network/tcpip/lwip/src/include/ipv6/lwip/inet.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h rename to drivers/network/tcpip/lwip/src/include/ipv6/lwip/inet.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h b/drivers/network/tcpip/lwip/src/include/ipv6/lwip/ip.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h rename to drivers/network/tcpip/lwip/src/include/ipv6/lwip/ip.h diff --git a/sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip_addr.h b/drivers/network/tcpip/lwip/src/include/ipv6/lwip/ip_addr.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip_addr.h rename to drivers/network/tcpip/lwip/src/include/ipv6/lwip/ip_addr.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/api.h b/drivers/network/tcpip/lwip/src/include/lwip/api.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/api.h rename to drivers/network/tcpip/lwip/src/include/lwip/api.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/api_msg.h b/drivers/network/tcpip/lwip/src/include/lwip/api_msg.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/api_msg.h rename to drivers/network/tcpip/lwip/src/include/lwip/api_msg.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/arch.h b/drivers/network/tcpip/lwip/src/include/lwip/arch.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/arch.h rename to drivers/network/tcpip/lwip/src/include/lwip/arch.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/debug.h b/drivers/network/tcpip/lwip/src/include/lwip/debug.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/debug.h rename to drivers/network/tcpip/lwip/src/include/lwip/debug.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/def.h b/drivers/network/tcpip/lwip/src/include/lwip/def.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/def.h rename to drivers/network/tcpip/lwip/src/include/lwip/def.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/dhcp.h b/drivers/network/tcpip/lwip/src/include/lwip/dhcp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/dhcp.h rename to drivers/network/tcpip/lwip/src/include/lwip/dhcp.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/dns.h b/drivers/network/tcpip/lwip/src/include/lwip/dns.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/dns.h rename to drivers/network/tcpip/lwip/src/include/lwip/dns.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/err.h b/drivers/network/tcpip/lwip/src/include/lwip/err.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/err.h rename to drivers/network/tcpip/lwip/src/include/lwip/err.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/init.h b/drivers/network/tcpip/lwip/src/include/lwip/init.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/init.h rename to drivers/network/tcpip/lwip/src/include/lwip/init.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/mem.h b/drivers/network/tcpip/lwip/src/include/lwip/mem.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/mem.h rename to drivers/network/tcpip/lwip/src/include/lwip/mem.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/memp.h b/drivers/network/tcpip/lwip/src/include/lwip/memp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/memp.h rename to drivers/network/tcpip/lwip/src/include/lwip/memp.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/memp_std.h b/drivers/network/tcpip/lwip/src/include/lwip/memp_std.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/memp_std.h rename to drivers/network/tcpip/lwip/src/include/lwip/memp_std.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netbuf.h b/drivers/network/tcpip/lwip/src/include/lwip/netbuf.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/netbuf.h rename to drivers/network/tcpip/lwip/src/include/lwip/netbuf.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netdb.h b/drivers/network/tcpip/lwip/src/include/lwip/netdb.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/netdb.h rename to drivers/network/tcpip/lwip/src/include/lwip/netdb.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netif.h b/drivers/network/tcpip/lwip/src/include/lwip/netif.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/netif.h rename to drivers/network/tcpip/lwip/src/include/lwip/netif.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/netifapi.h b/drivers/network/tcpip/lwip/src/include/lwip/netifapi.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/netifapi.h rename to drivers/network/tcpip/lwip/src/include/lwip/netifapi.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/opt.h b/drivers/network/tcpip/lwip/src/include/lwip/opt.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/opt.h rename to drivers/network/tcpip/lwip/src/include/lwip/opt.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/pbuf.h b/drivers/network/tcpip/lwip/src/include/lwip/pbuf.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/pbuf.h rename to drivers/network/tcpip/lwip/src/include/lwip/pbuf.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/raw.h b/drivers/network/tcpip/lwip/src/include/lwip/raw.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/raw.h rename to drivers/network/tcpip/lwip/src/include/lwip/raw.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/sio.h b/drivers/network/tcpip/lwip/src/include/lwip/sio.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/sio.h rename to drivers/network/tcpip/lwip/src/include/lwip/sio.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp.h b/drivers/network/tcpip/lwip/src/include/lwip/snmp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/snmp.h rename to drivers/network/tcpip/lwip/src/include/lwip/snmp.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h b/drivers/network/tcpip/lwip/src/include/lwip/snmp_asn1.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h rename to drivers/network/tcpip/lwip/src/include/lwip/snmp_asn1.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp_msg.h b/drivers/network/tcpip/lwip/src/include/lwip/snmp_msg.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/snmp_msg.h rename to drivers/network/tcpip/lwip/src/include/lwip/snmp_msg.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/snmp_structs.h b/drivers/network/tcpip/lwip/src/include/lwip/snmp_structs.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/snmp_structs.h rename to drivers/network/tcpip/lwip/src/include/lwip/snmp_structs.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/sockets.h b/drivers/network/tcpip/lwip/src/include/lwip/sockets.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/sockets.h rename to drivers/network/tcpip/lwip/src/include/lwip/sockets.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/stats.h b/drivers/network/tcpip/lwip/src/include/lwip/stats.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/stats.h rename to drivers/network/tcpip/lwip/src/include/lwip/stats.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/sys.h b/drivers/network/tcpip/lwip/src/include/lwip/sys.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/sys.h rename to drivers/network/tcpip/lwip/src/include/lwip/sys.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/tcp.h b/drivers/network/tcpip/lwip/src/include/lwip/tcp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/tcp.h rename to drivers/network/tcpip/lwip/src/include/lwip/tcp.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h b/drivers/network/tcpip/lwip/src/include/lwip/tcp_impl.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h rename to drivers/network/tcpip/lwip/src/include/lwip/tcp_impl.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/tcpip.h b/drivers/network/tcpip/lwip/src/include/lwip/tcpip.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/tcpip.h rename to drivers/network/tcpip/lwip/src/include/lwip/tcpip.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/timers.h b/drivers/network/tcpip/lwip/src/include/lwip/timers.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/timers.h rename to drivers/network/tcpip/lwip/src/include/lwip/timers.h diff --git a/sdk/lib/drivers/lwip/src/include/lwip/udp.h b/drivers/network/tcpip/lwip/src/include/lwip/udp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwip/udp.h rename to drivers/network/tcpip/lwip/src/include/lwip/udp.h diff --git a/sdk/lib/drivers/lwip/src/include/lwipopts.h b/drivers/network/tcpip/lwip/src/include/lwipopts.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/lwipopts.h rename to drivers/network/tcpip/lwip/src/include/lwipopts.h diff --git a/sdk/lib/drivers/lwip/src/include/netif/etharp.h b/drivers/network/tcpip/lwip/src/include/netif/etharp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/netif/etharp.h rename to drivers/network/tcpip/lwip/src/include/netif/etharp.h diff --git a/sdk/lib/drivers/lwip/src/include/netif/loopif.h b/drivers/network/tcpip/lwip/src/include/netif/loopif.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/netif/loopif.h rename to drivers/network/tcpip/lwip/src/include/netif/loopif.h diff --git a/sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h b/drivers/network/tcpip/lwip/src/include/netif/ppp_oe.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h rename to drivers/network/tcpip/lwip/src/include/netif/ppp_oe.h diff --git a/sdk/lib/drivers/lwip/src/include/netif/slipif.h b/drivers/network/tcpip/lwip/src/include/netif/slipif.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/netif/slipif.h rename to drivers/network/tcpip/lwip/src/include/netif/slipif.h diff --git a/sdk/lib/drivers/lwip/src/include/rosip.h b/drivers/network/tcpip/lwip/src/include/rosip.h similarity index 100% rename from sdk/lib/drivers/lwip/src/include/rosip.h rename to drivers/network/tcpip/lwip/src/include/rosip.h diff --git a/sdk/lib/drivers/lwip/src/netif/FILES b/drivers/network/tcpip/lwip/src/netif/FILES similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/FILES rename to drivers/network/tcpip/lwip/src/netif/FILES diff --git a/sdk/lib/drivers/lwip/src/netif/etharp.c b/drivers/network/tcpip/lwip/src/netif/etharp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/etharp.c rename to drivers/network/tcpip/lwip/src/netif/etharp.c diff --git a/sdk/lib/drivers/lwip/src/netif/ethernetif.c b/drivers/network/tcpip/lwip/src/netif/ethernetif.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ethernetif.c rename to drivers/network/tcpip/lwip/src/netif/ethernetif.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/auth.c b/drivers/network/tcpip/lwip/src/netif/ppp/auth.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/auth.c rename to drivers/network/tcpip/lwip/src/netif/ppp/auth.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/auth.h b/drivers/network/tcpip/lwip/src/netif/ppp/auth.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/auth.h rename to drivers/network/tcpip/lwip/src/netif/ppp/auth.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chap.c b/drivers/network/tcpip/lwip/src/netif/ppp/chap.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/chap.c rename to drivers/network/tcpip/lwip/src/netif/ppp/chap.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chap.h b/drivers/network/tcpip/lwip/src/netif/ppp/chap.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/chap.h rename to drivers/network/tcpip/lwip/src/netif/ppp/chap.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chpms.c b/drivers/network/tcpip/lwip/src/netif/ppp/chpms.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/chpms.c rename to drivers/network/tcpip/lwip/src/netif/ppp/chpms.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/chpms.h b/drivers/network/tcpip/lwip/src/netif/ppp/chpms.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/chpms.h rename to drivers/network/tcpip/lwip/src/netif/ppp/chpms.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/fsm.c b/drivers/network/tcpip/lwip/src/netif/ppp/fsm.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/fsm.c rename to drivers/network/tcpip/lwip/src/netif/ppp/fsm.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/fsm.h b/drivers/network/tcpip/lwip/src/netif/ppp/fsm.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/fsm.h rename to drivers/network/tcpip/lwip/src/netif/ppp/fsm.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c b/drivers/network/tcpip/lwip/src/netif/ppp/ipcp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c rename to drivers/network/tcpip/lwip/src/netif/ppp/ipcp.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h b/drivers/network/tcpip/lwip/src/netif/ppp/ipcp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h rename to drivers/network/tcpip/lwip/src/netif/ppp/ipcp.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/lcp.c b/drivers/network/tcpip/lwip/src/netif/ppp/lcp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/lcp.c rename to drivers/network/tcpip/lwip/src/netif/ppp/lcp.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/lcp.h b/drivers/network/tcpip/lwip/src/netif/ppp/lcp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/lcp.h rename to drivers/network/tcpip/lwip/src/netif/ppp/lcp.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/magic.c b/drivers/network/tcpip/lwip/src/netif/ppp/magic.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/magic.c rename to drivers/network/tcpip/lwip/src/netif/ppp/magic.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/magic.h b/drivers/network/tcpip/lwip/src/netif/ppp/magic.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/magic.h rename to drivers/network/tcpip/lwip/src/netif/ppp/magic.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/md5.c b/drivers/network/tcpip/lwip/src/netif/ppp/md5.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/md5.c rename to drivers/network/tcpip/lwip/src/netif/ppp/md5.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/md5.h b/drivers/network/tcpip/lwip/src/netif/ppp/md5.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/md5.h rename to drivers/network/tcpip/lwip/src/netif/ppp/md5.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/pap.c b/drivers/network/tcpip/lwip/src/netif/ppp/pap.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/pap.c rename to drivers/network/tcpip/lwip/src/netif/ppp/pap.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/pap.h b/drivers/network/tcpip/lwip/src/netif/ppp/pap.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/pap.h rename to drivers/network/tcpip/lwip/src/netif/ppp/pap.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ppp.c b/drivers/network/tcpip/lwip/src/netif/ppp/ppp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/ppp.c rename to drivers/network/tcpip/lwip/src/netif/ppp/ppp.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ppp.h b/drivers/network/tcpip/lwip/src/netif/ppp/ppp.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/ppp.h rename to drivers/network/tcpip/lwip/src/netif/ppp/ppp.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c b/drivers/network/tcpip/lwip/src/netif/ppp/ppp_oe.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c rename to drivers/network/tcpip/lwip/src/netif/ppp/ppp_oe.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h b/drivers/network/tcpip/lwip/src/netif/ppp/pppdebug.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h rename to drivers/network/tcpip/lwip/src/netif/ppp/pppdebug.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/randm.c b/drivers/network/tcpip/lwip/src/netif/ppp/randm.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/randm.c rename to drivers/network/tcpip/lwip/src/netif/ppp/randm.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/randm.h b/drivers/network/tcpip/lwip/src/netif/ppp/randm.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/randm.h rename to drivers/network/tcpip/lwip/src/netif/ppp/randm.h diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/vj.c b/drivers/network/tcpip/lwip/src/netif/ppp/vj.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/vj.c rename to drivers/network/tcpip/lwip/src/netif/ppp/vj.c diff --git a/sdk/lib/drivers/lwip/src/netif/ppp/vj.h b/drivers/network/tcpip/lwip/src/netif/ppp/vj.h similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/ppp/vj.h rename to drivers/network/tcpip/lwip/src/netif/ppp/vj.h diff --git a/sdk/lib/drivers/lwip/src/netif/slipif.c b/drivers/network/tcpip/lwip/src/netif/slipif.c similarity index 100% rename from sdk/lib/drivers/lwip/src/netif/slipif.c rename to drivers/network/tcpip/lwip/src/netif/slipif.c diff --git a/sdk/lib/drivers/lwip/src/rosip.c b/drivers/network/tcpip/lwip/src/rosip.c similarity index 100% rename from sdk/lib/drivers/lwip/src/rosip.c rename to drivers/network/tcpip/lwip/src/rosip.c diff --git a/sdk/lib/drivers/lwip/src/rosmem.c b/drivers/network/tcpip/lwip/src/rosmem.c similarity index 100% rename from sdk/lib/drivers/lwip/src/rosmem.c rename to drivers/network/tcpip/lwip/src/rosmem.c diff --git a/sdk/lib/drivers/lwip/src/rostcp.c b/drivers/network/tcpip/lwip/src/rostcp.c similarity index 100% rename from sdk/lib/drivers/lwip/src/rostcp.c rename to drivers/network/tcpip/lwip/src/rostcp.c diff --git a/sdk/lib/drivers/lwip/src/sys_arch.c b/drivers/network/tcpip/lwip/src/sys_arch.c similarity index 100% rename from sdk/lib/drivers/lwip/src/sys_arch.c rename to drivers/network/tcpip/lwip/src/sys_arch.c diff --git a/sdk/lib/drivers/lwip/test/unit/lwip_check.h b/drivers/network/tcpip/lwip/test/unit/lwip_check.h similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/lwip_check.h rename to drivers/network/tcpip/lwip/test/unit/lwip_check.h diff --git a/sdk/lib/drivers/lwip/test/unit/lwip_unittests.c b/drivers/network/tcpip/lwip/test/unit/lwip_unittests.c similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/lwip_unittests.c rename to drivers/network/tcpip/lwip/test/unit/lwip_unittests.c diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/tcp_helper.c b/drivers/network/tcpip/lwip/test/unit/tcp/tcp_helper.c similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/tcp/tcp_helper.c rename to drivers/network/tcpip/lwip/test/unit/tcp/tcp_helper.c diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/tcp_helper.h b/drivers/network/tcpip/lwip/test/unit/tcp/tcp_helper.h similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/tcp/tcp_helper.h rename to drivers/network/tcpip/lwip/test/unit/tcp/tcp_helper.h diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c b/drivers/network/tcpip/lwip/test/unit/tcp/test_tcp.c similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c rename to drivers/network/tcpip/lwip/test/unit/tcp/test_tcp.c diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.h b/drivers/network/tcpip/lwip/test/unit/tcp/test_tcp.h similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.h rename to drivers/network/tcpip/lwip/test/unit/tcp/test_tcp.h diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c b/drivers/network/tcpip/lwip/test/unit/tcp/test_tcp_oos.c similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.c rename to drivers/network/tcpip/lwip/test/unit/tcp/test_tcp_oos.c diff --git a/sdk/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.h b/drivers/network/tcpip/lwip/test/unit/tcp/test_tcp_oos.h similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/tcp/test_tcp_oos.h rename to drivers/network/tcpip/lwip/test/unit/tcp/test_tcp_oos.h diff --git a/sdk/lib/drivers/lwip/test/unit/udp/test_udp.c b/drivers/network/tcpip/lwip/test/unit/udp/test_udp.c similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/udp/test_udp.c rename to drivers/network/tcpip/lwip/test/unit/udp/test_udp.c diff --git a/sdk/lib/drivers/lwip/test/unit/udp/test_udp.h b/drivers/network/tcpip/lwip/test/unit/udp/test_udp.h similarity index 100% rename from sdk/lib/drivers/lwip/test/unit/udp/test_udp.h rename to drivers/network/tcpip/lwip/test/unit/udp/test_udp.h diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index d135337ab31..72ff6992cf6 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -202,9 +202,9 @@ License: URL: http://www.catch22.net/tuts/cardlib Title: lwIP - A Lightweight TCP/IP stack -Path: sdk/lib/drivers/lwip +Path: drivers/network/tcpip/lwip Used Version: 1.4.1 -License: Modified BSD License (sdk/lib/drivers/lwip/COPYING) +License: Modified BSD License (drivers/network/tcpip/lwip/COPYING) URL: https://savannah.nongnu.org/projects/lwip/ Title: FreeType diff --git a/sdk/lib/drivers/CMakeLists.txt b/sdk/lib/drivers/CMakeLists.txt index cbbbf2efb58..2dd4251706e 100644 --- a/sdk/lib/drivers/CMakeLists.txt +++ b/sdk/lib/drivers/CMakeLists.txt @@ -1,12 +1,9 @@ add_subdirectory(arbiter) add_subdirectory(aux_klib) -add_subdirectory(chew) add_subdirectory(copysup) add_subdirectory(csq) add_subdirectory(hidparser) -add_subdirectory(ip) -add_subdirectory(lwip) add_subdirectory(ntoskrnl_vista) add_subdirectory(rdbsslib) add_subdirectory(rtlver) diff --git a/sdk/lib/drivers/chew/CMakeLists.txt b/sdk/lib/drivers/chew/CMakeLists.txt deleted file mode 100644 index 62af9476935..00000000000 --- a/sdk/lib/drivers/chew/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ - -add_definitions(-D_NTOSKRNL_) -add_library(chew workqueue.c) -add_dependencies(chew bugcodes xdk)
