diff options
| author | Wenhui Xie <[email protected]> | 2023-12-01 10:59:30 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-01 10:59:30 +0800 |
| commit | 685dafbba390bfd5fbc89e3bbe341feb6a1e4bce (patch) | |
| tree | e78b336cf4ae24079284e226b398874d00b48281 /test | |
| parent | c44950d3f4723fe8ce7b550478c5ddfdbc18b90c (diff) | |
Improved test cases. (#210)
Diffstat (limited to 'test')
207 files changed, 0 insertions, 933 deletions
diff --git a/test/regression/bsd_test/netx_bsd_aton_test.c b/test/regression/bsd_test/netx_bsd_aton_test.c index 6ac48238..de2bb5aa 100644 --- a/test/regression/bsd_test/netx_bsd_aton_test.c +++ b/test/regression/bsd_test/netx_bsd_aton_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_getaddrinfo_test.c b/test/regression/bsd_test/netx_bsd_getaddrinfo_test.c index 2c89d554..876b552d 100644 --- a/test/regression/bsd_test/netx_bsd_getaddrinfo_test.c +++ b/test/regression/bsd_test/netx_bsd_getaddrinfo_test.c @@ -4,14 +4,9 @@ #include "tx_api.h" #include "nx_api.h" #ifdef NX_BSD_ENABLE -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" #include "nxd_dns.h" -#else -#include "nx_bsd.h" -#include "nx_dns.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_ioctl_nonblocking_test.c b/test/regression/bsd_test/netx_bsd_ioctl_nonblocking_test.c index 8a5b0839..5bf761b3 100644 --- a/test/regression/bsd_test/netx_bsd_ioctl_nonblocking_test.c +++ b/test/regression/bsd_test/netx_bsd_ioctl_nonblocking_test.c @@ -3,12 +3,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_multicast_test.c b/test/regression/bsd_test/netx_bsd_multicast_test.c index 3a7c8cfe..cc9e5094 100644 --- a/test/regression/bsd_test/netx_bsd_multicast_test.c +++ b/test/regression/bsd_test/netx_bsd_multicast_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_bsd.h" -#else -#include "nx_ip.h" -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_ntoa_test.c b/test/regression/bsd_test/netx_bsd_ntoa_test.c index 78c59ad8..5a80dcfb 100644 --- a/test/regression/bsd_test/netx_bsd_ntoa_test.c +++ b/test/regression/bsd_test/netx_bsd_ntoa_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_raw_bind_connect_test.c b/test/regression/bsd_test/netx_bsd_raw_bind_connect_test.c index 38ecb829..b1f11b6a 100644 --- a/test/regression/bsd_test/netx_bsd_raw_bind_connect_test.c +++ b/test/regression/bsd_test/netx_bsd_raw_bind_connect_test.c @@ -5,11 +5,7 @@ #include "nx_api.h" #if defined(__PRODUCT_NETXDUO__) && !defined(NX_DISABLE_IPV4) #ifdef NX_BSD_ENABLE -#ifdef __PRODUCT_NETX__ -#include "nx_bsd.h" -#else #include "nxd_bsd.h" -#endif #ifdef FEATURE_NX_IPV6 #include "nx_ipv6.h" diff --git a/test/regression/bsd_test/netx_bsd_tcp_2nd_bind_test.c b/test/regression/bsd_test/netx_bsd_tcp_2nd_bind_test.c index b524a257..a064905b 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_2nd_bind_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_2nd_bind_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_test.c b/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_test.c index 11117b9c..68f183bd 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_test.c @@ -3,12 +3,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_timeout_test.c b/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_timeout_test.c index a039d49e..a8ccbbee 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_timeout_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_accept_blocking_timeout_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_test.c b/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_test.c index 8a278eca..bb56d837 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_timeout_test.c b/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_timeout_test.c index d3a76bab..0af9d755 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_timeout_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_accept_nonblocking_timeout_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_accept_noselect_test.c b/test/regression/bsd_test/netx_bsd_tcp_accept_noselect_test.c index 23885de5..c2fd97d7 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_accept_noselect_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_accept_noselect_test.c @@ -3,11 +3,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_basic_blocking_test.c b/test/regression/bsd_test/netx_bsd_tcp_basic_blocking_test.c index 49bba72a..4b98ff64 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_basic_blocking_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_basic_blocking_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_basic_nonblocking_test.c b/test/regression/bsd_test/netx_bsd_tcp_basic_nonblocking_test.c index 875d9811..90208a3e 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_basic_nonblocking_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_basic_nonblocking_test.c @@ -3,12 +3,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_bind_test.c b/test/regression/bsd_test/netx_bsd_tcp_bind_test.c index 2ffd285a..76c80432 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_bind_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_bind_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_blocking_bidirection_test.c b/test/regression/bsd_test/netx_bsd_tcp_blocking_bidirection_test.c index 386cc51a..cb592509 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_blocking_bidirection_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_blocking_bidirection_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 #define NUM_MESSAGES 20 diff --git a/test/regression/bsd_test/netx_bsd_tcp_disconnect_test.c b/test/regression/bsd_test/netx_bsd_tcp_disconnect_test.c index 5c95e666..ebd8317e 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_disconnect_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_disconnect_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 1024 diff --git a/test/regression/bsd_test/netx_bsd_tcp_fionread_test.c b/test/regression/bsd_test/netx_bsd_tcp_fionread_test.c index 52fd72cc..63c33155 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_fionread_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_fionread_test.c @@ -3,12 +3,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_getsockname_test.c b/test/regression/bsd_test/netx_bsd_tcp_getsockname_test.c index 559c3d3f..d742e704 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_getsockname_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_getsockname_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_getsockname_without_bind_test.c b/test/regression/bsd_test/netx_bsd_tcp_getsockname_without_bind_test.c index 7ddd1b4f..a78e3ff3 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_getsockname_without_bind_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_getsockname_without_bind_test.c @@ -1,12 +1,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_multiple_accept_test.c b/test/regression/bsd_test/netx_bsd_tcp_multiple_accept_test.c index 18a5a5fe..09268039 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_multiple_accept_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_multiple_accept_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 #define notify(v) diff --git a/test/regression/bsd_test/netx_bsd_tcp_sendto_recvfrom_test.c b/test/regression/bsd_test/netx_bsd_tcp_sendto_recvfrom_test.c index 2d65b0c1..fcb776b3 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_sendto_recvfrom_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_sendto_recvfrom_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_tcp_two_blocking_test.c b/test/regression/bsd_test/netx_bsd_tcp_two_blocking_test.c index 2153f448..b40c6152 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_two_blocking_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_two_blocking_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 #define BSD_THREAD_PRIORITY 2 diff --git a/test/regression/bsd_test/netx_bsd_tcp_udp_select_test.c b/test/regression/bsd_test/netx_bsd_tcp_udp_select_test.c index ac30affe..e34ac2c6 100644 --- a/test/regression/bsd_test/netx_bsd_tcp_udp_select_test.c +++ b/test/regression/bsd_test/netx_bsd_tcp_udp_select_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_udp_basic_blocking_test.c b/test/regression/bsd_test/netx_bsd_udp_basic_blocking_test.c index 6538b691..e8810de1 100644 --- a/test/regression/bsd_test/netx_bsd_udp_basic_blocking_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_basic_blocking_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_udp_basic_nonblocking_test.c b/test/regression/bsd_test/netx_bsd_udp_basic_nonblocking_test.c index 26bd977d..2f476d4d 100644 --- a/test/regression/bsd_test/netx_bsd_udp_basic_nonblocking_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_basic_nonblocking_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #ifdef FEATURE_NX_IPV6 #include "nx_icmpv6.h" #endif diff --git a/test/regression/bsd_test/netx_bsd_udp_bind_connect_test.c b/test/regression/bsd_test/netx_bsd_udp_bind_connect_test.c index aca76d19..b43e5944 100644 --- a/test/regression/bsd_test/netx_bsd_udp_bind_connect_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_bind_connect_test.c @@ -8,14 +8,9 @@ #ifdef FEATURE_NX_IPV6 #include "nx_ipv6.h" #endif -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nx_ipv4.h" #include "nxd_bsd.h" -#else -#include "nx_ip.h" -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_udp_bind_test.c b/test/regression/bsd_test/netx_bsd_udp_bind_test.c index c8c41cfb..ba12267e 100644 --- a/test/regression/bsd_test/netx_bsd_udp_bind_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_bind_test.c @@ -5,12 +5,8 @@ #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/bsd_test/netx_bsd_udp_blocking_bidirection_test.c b/test/regression/bsd_test/netx_bsd_udp_blocking_bidirection_test.c index 5576e3be..8694ec88 100644 --- a/test/regression/bsd_test/netx_bsd_udp_blocking_bidirection_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_blocking_bidirection_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 #define NUM_MESSAGES 20 diff --git a/test/regression/bsd_test/netx_bsd_udp_checksum_corrupt_test.c b/test/regression/bsd_test/netx_bsd_udp_checksum_corrupt_test.c index a287b114..4f820958 100644 --- a/test/regression/bsd_test/netx_bsd_udp_checksum_corrupt_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_checksum_corrupt_test.c @@ -4,11 +4,7 @@ #include "nx_api.h" #ifdef NX_BSD_ENABLE #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 #define BSD_THREAD_PRIORITY 2 diff --git a/test/regression/bsd_test/netx_bsd_udp_connect_test.c b/test/regression/bsd_test/netx_bsd_udp_connect_test.c index abf73212..91692621 100644 --- a/test/regression/bsd_test/netx_bsd_udp_connect_test.c +++ b/test/regression/bsd_test/netx_bsd_udp_connect_test.c @@ -4,12 +4,8 @@ #include "tx_api.h" #include "nx_api.h" #if defined(NX_BSD_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nx_icmpv6.h" #include "nxd_bsd.h" -#else -#include "nx_bsd.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/dhcp_test/netx_dhcp_03_01_01_test.c b/test/regression/dhcp_test/netx_dhcp_03_01_01_test.c index 9f43d26e..e62c13de 100644 --- a/test/regression/dhcp_test/netx_dhcp_03_01_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_03_01_01_test.c @@ -4,13 +4,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_03_02_01_test.c b/test/regression/dhcp_test/netx_dhcp_03_02_01_test.c index e81209b4..8634d65c 100644 --- a/test/regression/dhcp_test/netx_dhcp_03_02_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_03_02_01_test.c @@ -6,13 +6,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_03_02_02_test.c b/test/regression/dhcp_test/netx_dhcp_03_02_02_test.c index 68bbb84d..8c8f240e 100644 --- a/test/regression/dhcp_test/netx_dhcp_03_02_02_test.c +++ b/test/regression/dhcp_test/netx_dhcp_03_02_02_test.c @@ -7,15 +7,9 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_ip.h" -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_03_02_03_test.c b/test/regression/dhcp_test/netx_dhcp_03_02_03_test.c index 100f8f84..7d00c235 100644 --- a/test/regression/dhcp_test/netx_dhcp_03_02_03_test.c +++ b/test/regression/dhcp_test/netx_dhcp_03_02_03_test.c @@ -4,13 +4,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_03_05_01_test.c b/test/regression/dhcp_test/netx_dhcp_03_05_01_test.c index 18abd865..ecb43c1b 100644 --- a/test/regression/dhcp_test/netx_dhcp_03_05_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_03_05_01_test.c @@ -5,15 +5,9 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" #include "nx_ipv4.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_04_01_01_test.c b/test/regression/dhcp_test/netx_dhcp_04_01_01_test.c index ec0ac539..0e890c49 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_01_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_01_01_test.c @@ -6,13 +6,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_04_03_02_01_test.c b/test/regression/dhcp_test/netx_dhcp_04_03_02_01_test.c index ebadb095..4fb052fd 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_03_02_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_03_02_01_test.c @@ -4,13 +4,8 @@ */ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_04_03_02_02_test.c b/test/regression/dhcp_test/netx_dhcp_04_03_02_02_test.c index 52b81450..b0a54766 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_03_02_02_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_03_02_02_test.c @@ -7,16 +7,10 @@ #include "nx_api.h" #include "netx_dhcp_clone_function.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nx_ip.h" #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_04_03_02_03_test.c b/test/regression/dhcp_test/netx_dhcp_04_03_02_03_test.c index 74738aa7..35dc1bb1 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_03_02_03_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_03_02_03_test.c @@ -6,16 +6,10 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nx_ip.h" #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_ip.h" -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "nx_ram_network_driver_test_1500.h" #include "netx_dhcp_clone_function.h" diff --git a/test/regression/dhcp_test/netx_dhcp_04_03_05_01_test.c b/test/regression/dhcp_test/netx_dhcp_04_03_05_01_test.c index fce440a6..881f3335 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_03_05_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_03_05_01_test.c @@ -8,13 +8,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_04_04_01_01_test.c b/test/regression/dhcp_test/netx_dhcp_04_04_01_01_test.c index caa75594..2f970972 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_04_01_01_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_04_01_01_test.c @@ -4,15 +4,9 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" #include "nx_ipv4.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_04_04_01_02_test.c b/test/regression/dhcp_test/netx_dhcp_04_04_01_02_test.c index fbe0b264..b468210d 100644 --- a/test/regression/dhcp_test/netx_dhcp_04_04_01_02_test.c +++ b/test/regression/dhcp_test/netx_dhcp_04_04_01_02_test.c @@ -5,16 +5,10 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nx_ip.h" #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_ip.h" -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_basic_restore_test.c b/test/regression/dhcp_test/netx_dhcp_basic_restore_test.c index 39449b28..3b2ec42f 100644 --- a/test/regression/dhcp_test/netx_dhcp_basic_restore_test.c +++ b/test/regression/dhcp_test/netx_dhcp_basic_restore_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_basic_test.c b/test/regression/dhcp_test/netx_dhcp_basic_test.c index 211ea524..fadc5fc0 100644 --- a/test/regression/dhcp_test/netx_dhcp_basic_test.c +++ b/test/regression/dhcp_test/netx_dhcp_basic_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_client_activate_interfaces_test.c b/test/regression/dhcp_test/netx_dhcp_client_activate_interfaces_test.c index e6318731..368e3c3b 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_activate_interfaces_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_activate_interfaces_test.c @@ -14,11 +14,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif extern void test_control_return(UINT status); @@ -176,11 +172,7 @@ static int ack_response0_size = 300; static char offer_response1[300] = { -#ifdef __PRODUCT_NETXDUO__ 0x02, 0x01, 0x06, 0x00, 0x2a, 0x3e, 0xF0, 0x1D, -#else -0x02, 0x01, 0x06, 0x00, 0x08, 0x0d, 0xB4, 0x55, -#endif 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ........ */ 0x00, 0x00, 0xc0, 0x01, 0x01, 0xF7, 0xc0, 0x01, /* ........ */ 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, /* ........ */ diff --git a/test/regression/dhcp_test/netx_dhcp_client_interface_0_only_test.c b/test/regression/dhcp_test/netx_dhcp_client_interface_0_only_test.c index 6ba73da3..2ec65ce7 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_interface_0_only_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_interface_0_only_test.c @@ -5,11 +5,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif #define DEMO_STACK_SIZE 4096 #define PACKET_PAYLOAD 1518 diff --git a/test/regression/dhcp_test/netx_dhcp_client_interface_1_only_test.c b/test/regression/dhcp_test/netx_dhcp_client_interface_1_only_test.c index ae256b70..c6fd3b1a 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_interface_1_only_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_interface_1_only_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif #define DEMO_STACK_SIZE 4096 #define PACKET_PAYLOAD 1518 diff --git a/test/regression/dhcp_test/netx_dhcp_client_interface_order_test.c b/test/regression/dhcp_test/netx_dhcp_client_interface_order_test.c index d10ea65c..1f4c73e4 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_interface_order_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_interface_order_test.c @@ -14,11 +14,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_client_ip_mutex_test.c b/test/regression/dhcp_test/netx_dhcp_client_ip_mutex_test.c index 317a7133..fd9c3374 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_ip_mutex_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_ip_mutex_test.c @@ -16,11 +16,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_client_ntp_option_test.c b/test/regression/dhcp_test/netx_dhcp_client_ntp_option_test.c index 2c7fea20..3d30dccb 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_ntp_option_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_ntp_option_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_client_parameter_request_test.c b/test/regression/dhcp_test/netx_dhcp_client_parameter_request_test.c index 7fd08e0c..c2f62d7f 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_parameter_request_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_parameter_request_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_client_secondary_interface_test.c b/test/regression/dhcp_test/netx_dhcp_client_secondary_interface_test.c index c94b6180..9320fc9e 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_secondary_interface_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_secondary_interface_test.c @@ -11,11 +11,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/dhcp_test/netx_dhcp_client_send_with_zero_source_address_test.c b/test/regression/dhcp_test/netx_dhcp_client_send_with_zero_source_address_test.c index f521c999..8db6a9f8 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_send_with_zero_source_address_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_send_with_zero_source_address_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "tx_timer.h" #include "tx_thread.h" #include "tx_mutex.h" diff --git a/test/regression/dhcp_test/netx_dhcp_client_server_source_port_test.c b/test/regression/dhcp_test/netx_dhcp_client_server_source_port_test.c index 51ef54a6..0869186f 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_server_source_port_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_server_source_port_test.c @@ -5,11 +5,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_client_special_attributes_test.c b/test/regression/dhcp_test/netx_dhcp_client_special_attributes_test.c index ea7d21dc..20b5d206 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_special_attributes_test.c +++ b/test/regression/dhcp_test/netx_dhcp_client_special_attributes_test.c @@ -8,11 +8,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif #define DEMO_STACK_SIZE 4096 #define PACKET_PAYLOAD 1518 diff --git a/test/regression/dhcp_test/netx_dhcp_client_two_interfaces.c b/test/regression/dhcp_test/netx_dhcp_client_two_interfaces.c index 845404ee..9d4ac7d7 100644 --- a/test/regression/dhcp_test/netx_dhcp_client_two_interfaces.c +++ b/test/regression/dhcp_test/netx_dhcp_client_two_interfaces.c @@ -8,11 +8,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif #include "nx_ram_network_driver_test_1500.h" diff --git a/test/regression/dhcp_test/netx_dhcp_clone_function.c b/test/regression/dhcp_test/netx_dhcp_clone_function.c index b681df35..7a47130f 100644 --- a/test/regression/dhcp_test/netx_dhcp_clone_function.c +++ b/test/regression/dhcp_test/netx_dhcp_clone_function.c @@ -1,12 +1,7 @@ #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif UINT dhcp_get_option_value(UCHAR *bootp_message, UINT option, ULONG *value, UINT length) diff --git a/test/regression/dhcp_test/netx_dhcp_delete_test.c b/test/regression/dhcp_test/netx_dhcp_delete_test.c index 18990056..8b221ca3 100644 --- a/test/regression/dhcp_test/netx_dhcp_delete_test.c +++ b/test/regression/dhcp_test/netx_dhcp_delete_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_enable_test.c b/test/regression/dhcp_test/netx_dhcp_enable_test.c index c380f18b..badc5f59 100644 --- a/test/regression/dhcp_test/netx_dhcp_enable_test.c +++ b/test/regression/dhcp_test/netx_dhcp_enable_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_extract_information_test.c b/test/regression/dhcp_test/netx_dhcp_extract_information_test.c index d4f0f781..b1e9fd3e 100644 --- a/test/regression/dhcp_test/netx_dhcp_extract_information_test.c +++ b/test/regression/dhcp_test/netx_dhcp_extract_information_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_get_option_value_test.c b/test/regression/dhcp_test/netx_dhcp_get_option_value_test.c index 8a42ddc5..a9b6bb76 100644 --- a/test/regression/dhcp_test/netx_dhcp_get_option_value_test.c +++ b/test/regression/dhcp_test/netx_dhcp_get_option_value_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_multiple_instances_test.c b/test/regression/dhcp_test/netx_dhcp_multiple_instances_test.c index 358108f7..0be53c6a 100644 --- a/test/regression/dhcp_test/netx_dhcp_multiple_instances_test.c +++ b/test/regression/dhcp_test/netx_dhcp_multiple_instances_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_packet_process_test.c b/test/regression/dhcp_test/netx_dhcp_packet_process_test.c index 347903ab..ce205ba9 100644 --- a/test/regression/dhcp_test/netx_dhcp_packet_process_test.c +++ b/test/regression/dhcp_test/netx_dhcp_packet_process_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_reinitialize_test.c b/test/regression/dhcp_test/netx_dhcp_reinitialize_test.c index 631a8cff..1bd72efe 100644 --- a/test/regression/dhcp_test/netx_dhcp_reinitialize_test.c +++ b/test/regression/dhcp_test/netx_dhcp_reinitialize_test.c @@ -6,13 +6,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_release_test.c b/test/regression/dhcp_test/netx_dhcp_release_test.c index 544b4952..03f5e494 100644 --- a/test/regression/dhcp_test/netx_dhcp_release_test.c +++ b/test/regression/dhcp_test/netx_dhcp_release_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_send_request_internal_test.c b/test/regression/dhcp_test/netx_dhcp_send_request_internal_test.c index 1301b012..8dacc96b 100644 --- a/test/regression/dhcp_test/netx_dhcp_send_request_internal_test.c +++ b/test/regression/dhcp_test/netx_dhcp_send_request_internal_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "netx_dhcp_clone_function.h" -#ifdef __PRODUCT_NETXDUO__ #include "nx_ipv4.h" #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#include "nx_ip.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_server_improper_term_test.c b/test/regression/dhcp_test/netx_dhcp_server_improper_term_test.c index 53d0bcd2..f733d059 100644 --- a/test/regression/dhcp_test/netx_dhcp_server_improper_term_test.c +++ b/test/regression/dhcp_test/netx_dhcp_server_improper_term_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_server_options_test.c b/test/regression/dhcp_test/netx_dhcp_server_options_test.c index fbd510be..eb215ef9 100644 --- a/test/regression/dhcp_test/netx_dhcp_server_options_test.c +++ b/test/regression/dhcp_test/netx_dhcp_server_options_test.c @@ -4,13 +4,8 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) && defined(NX_DISABLE_UDP_RX_CHECKSUM) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #define DEMO_STACK_SIZE 4096 #define NX_PACKET_SIZE 1536 diff --git a/test/regression/dhcp_test/netx_dhcp_server_second_interface_test.c b/test/regression/dhcp_test/netx_dhcp_server_second_interface_test.c index e57740ef..c21ee415 100644 --- a/test/regression/dhcp_test/netx_dhcp_server_second_interface_test.c +++ b/test/regression/dhcp_test/netx_dhcp_server_second_interface_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_server_small_packet_payload_test.c b/test/regression/dhcp_test/netx_dhcp_server_small_packet_payload_test.c index cda5e1ee..e5399745 100644 --- a/test/regression/dhcp_test/netx_dhcp_server_small_packet_payload_test.c +++ b/test/regression/dhcp_test/netx_dhcp_server_small_packet_payload_test.c @@ -3,13 +3,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_server_test.c b/test/regression/dhcp_test/netx_dhcp_server_test.c index e8aecf6e..85bc3bbf 100644 --- a/test/regression/dhcp_test/netx_dhcp_server_test.c +++ b/test/regression/dhcp_test/netx_dhcp_server_test.c @@ -4,13 +4,8 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_UDP_TX_CHECKSUM) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #define DEMO_STACK_SIZE 4096 #define NX_PACKET_SIZE 1536 diff --git a/test/regression/dhcp_test/netx_dhcp_skip_discover_test.c b/test/regression/dhcp_test/netx_dhcp_skip_discover_test.c index 172e6783..8e150411 100644 --- a/test/regression/dhcp_test/netx_dhcp_skip_discover_test.c +++ b/test/regression/dhcp_test/netx_dhcp_skip_discover_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_start_test.c b/test/regression/dhcp_test/netx_dhcp_start_test.c index 219a75a4..d724ba24 100644 --- a/test/regression/dhcp_test/netx_dhcp_start_test.c +++ b/test/regression/dhcp_test/netx_dhcp_start_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "tx_thread.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_stop_test.c b/test/regression/dhcp_test/netx_dhcp_stop_test.c index 0768c2d5..e5147b4f 100644 --- a/test/regression/dhcp_test/netx_dhcp_stop_test.c +++ b/test/regression/dhcp_test/netx_dhcp_stop_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_unicast_test.c b/test/regression/dhcp_test/netx_dhcp_unicast_test.c index e1c34f40..e03bb6e4 100644 --- a/test/regression/dhcp_test/netx_dhcp_unicast_test.c +++ b/test/regression/dhcp_test/netx_dhcp_unicast_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" -#else -#include "nx_dhcp.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dhcp_test/netx_dhcp_user_option_add_test.c b/test/regression/dhcp_test/netx_dhcp_user_option_add_test.c index dd440a60..01ef8b7d 100644 --- a/test/regression/dhcp_test/netx_dhcp_user_option_add_test.c +++ b/test/regression/dhcp_test/netx_dhcp_user_option_add_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dhcp_client.h" #include "nxd_dhcp_server.h" -#else -#include "nx_dhcp.h" -#include "nx_dhcp_server.h" -#endif #include "netx_dhcp_clone_function.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_abnormal_packet_test.c b/test/regression/dns_test/netx_dns_abnormal_packet_test.c index 26c0dce0..aa0138b0 100644 --- a/test/regression/dns_test/netx_dns_abnormal_packet_test.c +++ b/test/regression/dns_test/netx_dns_abnormal_packet_test.c @@ -126,11 +126,7 @@ static unsigned char invalid_response_txt[] = #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_coverage_test.c b/test/regression/dns_test/netx_dns_coverage_test.c index a8d10499..647dbb9c 100644 --- a/test/regression/dns_test/netx_dns_coverage_test.c +++ b/test/regression/dns_test/netx_dns_coverage_test.c @@ -5,11 +5,7 @@ #include "nx_api.h" #include "nx_udp.h" #include "tx_mutex.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_fake_response_test.c b/test/regression/dns_test/netx_dns_fake_response_test.c index c421daf8..4e26c182 100644 --- a/test/regression/dns_test/netx_dns_fake_response_test.c +++ b/test/regression/dns_test/netx_dns_fake_response_test.c @@ -3,11 +3,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_function_test.c b/test/regression/dns_test/netx_dns_function_test.c index 65fb4190..bc356be1 100644 --- a/test/regression/dns_test/netx_dns_function_test.c +++ b/test/regression/dns_test/netx_dns_function_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_invalid_name_unencode_test.c b/test/regression/dns_test/netx_dns_invalid_name_unencode_test.c index 9c0e8127..a516ad24 100644 --- a/test/regression/dns_test/netx_dns_invalid_name_unencode_test.c +++ b/test/regression/dns_test/netx_dns_invalid_name_unencode_test.c @@ -43,11 +43,7 @@ static unsigned char invalid_ptr_response_1[128] = { #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_invalid_resource_get_test.c b/test/regression/dns_test/netx_dns_invalid_resource_get_test.c index c3b5fdc8..1edd176c 100644 --- a/test/regression/dns_test/netx_dns_invalid_resource_get_test.c +++ b/test/regression/dns_test/netx_dns_invalid_resource_get_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif extern char invalid_response_ptr_0[119]; extern UINT invalid_response_size_0; diff --git a/test/regression/dns_test/netx_dns_non_blocking_a_test.c b/test/regression/dns_test/netx_dns_non_blocking_a_test.c index 57551580..7d7b5f74 100644 --- a/test/regression/dns_test/netx_dns_non_blocking_a_test.c +++ b/test/regression/dns_test/netx_dns_non_blocking_a_test.c @@ -3,11 +3,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_nxe_api_test.c b/test/regression/dns_test/netx_dns_nxe_api_test.c index 100d10a7..98cddb30 100644 --- a/test/regression/dns_test/netx_dns_nxe_api_test.c +++ b/test/regression/dns_test/netx_dns_nxe_api_test.c @@ -4,11 +4,7 @@ #include "nx_api.h" #include "nx_udp.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_packet_double_release_test.c b/test/regression/dns_test/netx_dns_packet_double_release_test.c index 3edcf0e6..f6e845ba 100644 --- a/test/regression/dns_test/netx_dns_packet_double_release_test.c +++ b/test/regression/dns_test/netx_dns_packet_double_release_test.c @@ -4,11 +4,7 @@ #include "tx_timer.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_request_a_response_cname_a_smtp_live_com_test.c b/test/regression/dns_test/netx_dns_request_a_response_cname_a_smtp_live_com_test.c index b35819d2..98e9e417 100644 --- a/test/regression/dns_test/netx_dns_request_a_response_cname_a_smtp_live_com_test.c +++ b/test/regression/dns_test/netx_dns_request_a_response_cname_a_smtp_live_com_test.c @@ -88,11 +88,7 @@ char response_cname_a[294] = { #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/dns_test/netx_dns_source_port_test.c b/test/regression/dns_test/netx_dns_source_port_test.c index 888f5182..6dd2ff1b 100644 --- a/test/regression/dns_test/netx_dns_source_port_test.c +++ b/test/regression/dns_test/netx_dns_source_port_test.c @@ -3,11 +3,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_dns.h" -#else -#include "nx_dns.h" -#endif #include "nx_ram_network_driver_test_1500.h" extern void test_control_return(UINT status); diff --git a/test/regression/ftp_test/netx_ftp_access_control_commands_01_test.c b/test/regression/ftp_test/netx_ftp_access_control_commands_01_test.c index bf3e1345..3eb5323a 100644 --- a/test/regression/ftp_test/netx_ftp_access_control_commands_01_test.c +++ b/test/regression/ftp_test/netx_ftp_access_control_commands_01_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_access_control_commands_02_test.c b/test/regression/ftp_test/netx_ftp_access_control_commands_02_test.c index 78e0a9a6..c9cd13ec 100644 --- a/test/regression/ftp_test/netx_ftp_access_control_commands_02_test.c +++ b/test/regression/ftp_test/netx_ftp_access_control_commands_02_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_access_control_commands_03_test.c b/test/regression/ftp_test/netx_ftp_access_control_commands_03_test.c index d603e15a..65f58124 100644 --- a/test/regression/ftp_test/netx_ftp_access_control_commands_03_test.c +++ b/test/regression/ftp_test/netx_ftp_access_control_commands_03_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_access_control_commands_04_test.c b/test/regression/ftp_test/netx_ftp_access_control_commands_04_test.c index ada3a8af..1e99d14e 100644 --- a/test/regression/ftp_test/netx_ftp_access_control_commands_04_test.c +++ b/test/regression/ftp_test/netx_ftp_access_control_commands_04_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_basic_test.c b/test/regression/ftp_test/netx_ftp_basic_test.c index 6c053c01..f1920cb7 100644 --- a/test/regression/ftp_test/netx_ftp_basic_test.c +++ b/test/regression/ftp_test/netx_ftp_basic_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_buffer_overflow_test.c b/test/regression/ftp_test/netx_ftp_client_buffer_overflow_test.c index f7130db2..fffd5bb2 100644 --- a/test/regression/ftp_test/netx_ftp_client_buffer_overflow_test.c +++ b/test/regression/ftp_test/netx_ftp_client_buffer_overflow_test.c @@ -1,10 +1,6 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" -#else -#include "nx_ftp_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_file_write_fail_test.c b/test/regression/ftp_test/netx_ftp_client_file_write_fail_test.c index 9a9829a5..06926dfd 100644 --- a/test/regression/ftp_test/netx_ftp_client_file_write_fail_test.c +++ b/test/regression/ftp_test/netx_ftp_client_file_write_fail_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" -#else -#include "nx_ftp_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_invalid_username_password_length_test.c b/test/regression/ftp_test/netx_ftp_client_invalid_username_password_length_test.c index 1755076c..d87ac302 100644 --- a/test/regression/ftp_test/netx_ftp_client_invalid_username_password_length_test.c +++ b/test/regression/ftp_test/netx_ftp_client_invalid_username_password_length_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_multiple_connection_responses_test.c b/test/regression/ftp_test/netx_ftp_client_multiple_connection_responses_test.c index f185f795..bc0185c8 100644 --- a/test/regression/ftp_test/netx_ftp_client_multiple_connection_responses_test.c +++ b/test/regression/ftp_test/netx_ftp_client_multiple_connection_responses_test.c @@ -1,10 +1,6 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" -#else -#include "nx_ftp_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_packet_leak_test.c b/test/regression/ftp_test/netx_ftp_client_packet_leak_test.c index 3ce89cb3..7ab16d94 100644 --- a/test/regression/ftp_test/netx_ftp_client_packet_leak_test.c +++ b/test/regression/ftp_test/netx_ftp_client_packet_leak_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_pasv_denied.c b/test/regression/ftp_test/netx_ftp_client_pasv_denied.c index 0f7be20c..5c9dcd94 100644 --- a/test/regression/ftp_test/netx_ftp_client_pasv_denied.c +++ b/test/regression/ftp_test/netx_ftp_client_pasv_denied.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" -#else -#include "nx_ftp_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_pasv_file_read_test.c b/test/regression/ftp_test/netx_ftp_client_pasv_file_read_test.c index 376383a0..610e33a1 100644 --- a/test/regression/ftp_test/netx_ftp_client_pasv_file_read_test.c +++ b/test/regression/ftp_test/netx_ftp_client_pasv_file_read_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" -#else -#include "nx_ftp_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_client_pasv_file_write_test.c b/test/regression/ftp_test/netx_ftp_client_pasv_file_write_test.c index 3dd74158..b63f87f5 100644 --- a/test/regression/ftp_test/netx_ftp_client_pasv_file_write_test.c +++ b/test/regression/ftp_test/netx_ftp_client_pasv_file_write_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" -#else -#include "nx_ftp_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_commands_characters_test.c b/test/regression/ftp_test/netx_ftp_commands_characters_test.c index 09cf55c5..5f5a4ba7 100644 --- a/test/regression/ftp_test/netx_ftp_commands_characters_test.c +++ b/test/regression/ftp_test/netx_ftp_commands_characters_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_commands_replys_test.c b/test/regression/ftp_test/netx_ftp_commands_replys_test.c index ab3e3dc9..24ea994b 100644 --- a/test/regression/ftp_test/netx_ftp_commands_replys_test.c +++ b/test/regression/ftp_test/netx_ftp_commands_replys_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_control_connection_test.c b/test/regression/ftp_test/netx_ftp_control_connection_test.c index e5f1bc74..6253f82d 100644 --- a/test/regression/ftp_test/netx_ftp_control_connection_test.c +++ b/test/regression/ftp_test/netx_ftp_control_connection_test.c @@ -3,13 +3,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_data_connection_test.c b/test/regression/ftp_test/netx_ftp_data_connection_test.c index 07bcdfbf..a4917d1b 100644 --- a/test/regression/ftp_test/netx_ftp_data_connection_test.c +++ b/test/regression/ftp_test/netx_ftp_data_connection_test.c @@ -3,13 +3,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_disconnection_event_test.c b/test/regression/ftp_test/netx_ftp_disconnection_event_test.c index 34517904..cf5d3cc9 100644 --- a/test/regression/ftp_test/netx_ftp_disconnection_event_test.c +++ b/test/regression/ftp_test/netx_ftp_disconnection_event_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_establish_data_connection_03_test.c b/test/regression/ftp_test/netx_ftp_establish_data_connection_03_test.c index b8e6a62b..cdc342c3 100644 --- a/test/regression/ftp_test/netx_ftp_establish_data_connection_03_test.c +++ b/test/regression/ftp_test/netx_ftp_establish_data_connection_03_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_establish_data_connection_05_test.c b/test/regression/ftp_test/netx_ftp_establish_data_connection_05_test.c index 633409e6..5a6564f3 100644 --- a/test/regression/ftp_test/netx_ftp_establish_data_connection_05_test.c +++ b/test/regression/ftp_test/netx_ftp_establish_data_connection_05_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_establish_data_connection_06_test.c b/test/regression/ftp_test/netx_ftp_establish_data_connection_06_test.c index c9236e4a..9edffcdd 100644 --- a/test/regression/ftp_test/netx_ftp_establish_data_connection_06_test.c +++ b/test/regression/ftp_test/netx_ftp_establish_data_connection_06_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_establish_data_connection_08_test.c b/test/regression/ftp_test/netx_ftp_establish_data_connection_08_test.c index ce852f94..88afde56 100644 --- a/test/regression/ftp_test/netx_ftp_establish_data_connection_08_test.c +++ b/test/regression/ftp_test/netx_ftp_establish_data_connection_08_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_ipv6_epsv_test.c b/test/regression/ftp_test/netx_ftp_ipv6_epsv_test.c index a0f131cf..42f0afaa 100644 --- a/test/regression/ftp_test/netx_ftp_ipv6_epsv_test.c +++ b/test/regression/ftp_test/netx_ftp_ipv6_epsv_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_parse_ipv6_address_test.c b/test/regression/ftp_test/netx_ftp_parse_ipv6_address_test.c index 32534225..9c160d89 100644 --- a/test/regression/ftp_test/netx_ftp_parse_ipv6_address_test.c +++ b/test/regression/ftp_test/netx_ftp_parse_ipv6_address_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_server.h" -#else -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_pasv_port_test.c b/test/regression/ftp_test/netx_ftp_pasv_port_test.c index 3e8733a4..e576892e 100644 --- a/test/regression/ftp_test/netx_ftp_pasv_port_test.c +++ b/test/regression/ftp_test/netx_ftp_pasv_port_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_pasv_stor_test.c b/test/regression/ftp_test/netx_ftp_pasv_stor_test.c index 874e4588..f4b685a0 100644 --- a/test/regression/ftp_test/netx_ftp_pasv_stor_test.c +++ b/test/regression/ftp_test/netx_ftp_pasv_stor_test.c @@ -7,13 +7,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_pasv_twice_test.c b/test/regression/ftp_test/netx_ftp_pasv_twice_test.c index 31a1fb65..d75fd1fc 100644 --- a/test/regression/ftp_test/netx_ftp_pasv_twice_test.c +++ b/test/regression/ftp_test/netx_ftp_pasv_twice_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_rst_test.c b/test/regression/ftp_test/netx_ftp_rst_test.c index 2c6b72af..69368d2b 100644 --- a/test/regression/ftp_test/netx_ftp_rst_test.c +++ b/test/regression/ftp_test/netx_ftp_rst_test.c @@ -11,11 +11,7 @@ extern void test_control_return(UINT); -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_server.h" -#else -#include "nx_ftp_server.h" -#endif #define DEMO_STACK_SIZE 4096 #define LOOP 100 diff --git a/test/regression/ftp_test/netx_ftp_server_abnormal_packet_test.c b/test/regression/ftp_test/netx_ftp_server_abnormal_packet_test.c index eab6f20e..4bd5f0fb 100644 --- a/test/regression/ftp_test/netx_ftp_server_abnormal_packet_test.c +++ b/test/regression/ftp_test/netx_ftp_server_abnormal_packet_test.c @@ -3,13 +3,8 @@ #include "fx_api.h" #include "nx_api.h" #include "nx_tcp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_server_dangling_pointer_test.c b/test/regression/ftp_test/netx_ftp_server_dangling_pointer_test.c index d09dc458..1039c4ba 100644 --- a/test/regression/ftp_test/netx_ftp_server_dangling_pointer_test.c +++ b/test/regression/ftp_test/netx_ftp_server_dangling_pointer_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_server.h" -#else -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_server_invalid_month_crash_test.c b/test/regression/ftp_test/netx_ftp_server_invalid_month_crash_test.c index 7d5f3297..c6deab96 100644 --- a/test/regression/ftp_test/netx_ftp_server_invalid_month_crash_test.c +++ b/test/regression/ftp_test/netx_ftp_server_invalid_month_crash_test.c @@ -3,13 +3,8 @@ #include "fx_api.h" #include "fx_system.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_server_list_command_test.c b/test/regression/ftp_test/netx_ftp_server_list_command_test.c index bfee4265..75f2d866 100644 --- a/test/regression/ftp_test/netx_ftp_server_list_command_test.c +++ b/test/regression/ftp_test/netx_ftp_server_list_command_test.c @@ -3,13 +3,8 @@ #include "fx_api.h" #include "nx_api.h" #include "nx_tcp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_server_mss_too_small_test.c b/test/regression/ftp_test/netx_ftp_server_mss_too_small_test.c index 59479d14..81c4a495 100644 --- a/test/regression/ftp_test/netx_ftp_server_mss_too_small_test.c +++ b/test/regression/ftp_test/netx_ftp_server_mss_too_small_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_server.h" -#else -#include "nx_ftp_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_service_commands_RETR_STOR_test.c b/test/regression/ftp_test/netx_ftp_service_commands_RETR_STOR_test.c index 141d7b82..63472ff9 100644 --- a/test/regression/ftp_test/netx_ftp_service_commands_RETR_STOR_test.c +++ b/test/regression/ftp_test/netx_ftp_service_commands_RETR_STOR_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_service_commands_file_write_test.c b/test/regression/ftp_test/netx_ftp_service_commands_file_write_test.c index d723ea3c..00c17c2b 100644 --- a/test/regression/ftp_test/netx_ftp_service_commands_file_write_test.c +++ b/test/regression/ftp_test/netx_ftp_service_commands_file_write_test.c @@ -11,13 +11,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_service_commands_nlist_test.c b/test/regression/ftp_test/netx_ftp_service_commands_nlist_test.c index a651ce99..429694ba 100644 --- a/test/regression/ftp_test/netx_ftp_service_commands_nlist_test.c +++ b/test/regression/ftp_test/netx_ftp_service_commands_nlist_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_service_commands_rename_test.c b/test/regression/ftp_test/netx_ftp_service_commands_rename_test.c index 99ff8b2d..b025877c 100644 --- a/test/regression/ftp_test/netx_ftp_service_commands_rename_test.c +++ b/test/regression/ftp_test/netx_ftp_service_commands_rename_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/ftp_test/netx_ftp_two_listen_test.c b/test/regression/ftp_test/netx_ftp_two_listen_test.c index d6b8d598..9c3ce4df 100644 --- a/test/regression/ftp_test/netx_ftp_two_listen_test.c +++ b/test/regression/ftp_test/netx_ftp_two_listen_test.c @@ -10,11 +10,7 @@ extern void test_control_return(UINT); -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_server.h" -#else -#include "nx_ftp_server.h" -#endif #define DEMO_STACK_SIZE 4096 #define LOOP 100 diff --git a/test/regression/ftp_test/netx_ftp_user_data_type_test.c b/test/regression/ftp_test/netx_ftp_user_data_type_test.c index 3b8dbf32..7eb90173 100644 --- a/test/regression/ftp_test/netx_ftp_user_data_type_test.c +++ b/test/regression/ftp_test/netx_ftp_user_data_type_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "fx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_ftp_client.h" #include "nxd_ftp_server.h" -#else -#include "nx_ftp_client.h" -#include "nx_ftp_server.h" -#endif #include "nx_tcp.h" extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_basic_authenticate_test.c b/test/regression/http_test/netx_http_basic_authenticate_test.c index 769204e6..3e9bc8f7 100644 --- a/test/regression/http_test/netx_http_basic_authenticate_test.c +++ b/test/regression/http_test/netx_http_basic_authenticate_test.c @@ -6,13 +6,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_basic_test.c b/test/regression/http_test/netx_http_basic_test.c index 27aa8a3a..551f10a6 100644 --- a/test/regression/http_test/netx_http_basic_test.c +++ b/test/regression/http_test/netx_http_basic_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_client_change_connect_port_test.c b/test/regression/http_test/netx_http_client_change_connect_port_test.c index 5e69d7f1..9d989e97 100644 --- a/test/regression/http_test/netx_http_client_change_connect_port_test.c +++ b/test/regression/http_test/netx_http_client_change_connect_port_test.c @@ -6,11 +6,7 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" -#else -#include "nx_http_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_delete_basic_test.c b/test/regression/http_test/netx_http_delete_basic_test.c index aa035d37..e905e1d2 100644 --- a/test/regression/http_test/netx_http_delete_basic_test.c +++ b/test/regression/http_test/netx_http_delete_basic_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_digest_authenticate_test.c b/test/regression/http_test/netx_http_digest_authenticate_test.c index 6f021a2b..ea1238c7 100644 --- a/test/regression/http_test/netx_http_digest_authenticate_test.c +++ b/test/regression/http_test/netx_http_digest_authenticate_test.c @@ -11,13 +11,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_digest_authenticate_timeout_test.c b/test/regression/http_test/netx_http_digest_authenticate_timeout_test.c index d99a8abb..6556c0e0 100644 --- a/test/regression/http_test/netx_http_digest_authenticate_timeout_test.c +++ b/test/regression/http_test/netx_http_digest_authenticate_timeout_test.c @@ -11,13 +11,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_get_content_length_test.c b/test/regression/http_test/netx_http_get_content_length_test.c index 9e05ab43..0a5ffd82 100644 --- a/test/regression/http_test/netx_http_get_content_length_test.c +++ b/test/regression/http_test/netx_http_get_content_length_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_get_contentlength_packetleak_test.c b/test/regression/http_test/netx_http_get_contentlength_packetleak_test.c index 8099aa57..fde0e285 100644 --- a/test/regression/http_test/netx_http_get_contentlength_packetleak_test.c +++ b/test/regression/http_test/netx_http_get_contentlength_packetleak_test.c @@ -5,13 +5,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); #if !defined(NX_DISABLE_IPV4) diff --git a/test/regression/http_test/netx_http_get_put_referred_URI_test.c b/test/regression/http_test/netx_http_get_put_referred_URI_test.c index 1e594ebb..743e10ab 100644 --- a/test/regression/http_test/netx_http_get_put_referred_URI_test.c +++ b/test/regression/http_test/netx_http_get_put_referred_URI_test.c @@ -8,11 +8,7 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" -#else -#include "nx_http_client.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_head_basic_test.c b/test/regression/http_test/netx_http_head_basic_test.c index c0a085ab..ea79310f 100644 --- a/test/regression/http_test/netx_http_head_basic_test.c +++ b/test/regression/http_test/netx_http_head_basic_test.c @@ -3,13 +3,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_if_modified_since_test.c b/test/regression/http_test/netx_http_if_modified_since_test.c index 5c91897a..8cd6e29d 100644 --- a/test/regression/http_test/netx_http_if_modified_since_test.c +++ b/test/regression/http_test/netx_http_if_modified_since_test.c @@ -10,13 +10,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif #if defined(WIN32) || defined(__linux__) diff --git a/test/regression/http_test/netx_http_multipart_fragment_test.c b/test/regression/http_test/netx_http_multipart_fragment_test.c index fdbf8381..97232ecf 100644 --- a/test/regression/http_test/netx_http_multipart_fragment_test.c +++ b/test/regression/http_test/netx_http_multipart_fragment_test.c @@ -42,13 +42,8 @@ test5(repeat 54times) extern void test_control_return(UINT); #if defined(NX_HTTP_MULTIPART_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/http_test/netx_http_multipart_underflow_test.c b/test/regression/http_test/netx_http_multipart_underflow_test.c index b35bffe2..352a2c46 100644 --- a/test/regression/http_test/netx_http_multipart_underflow_test.c +++ b/test/regression/http_test/netx_http_multipart_underflow_test.c @@ -44,13 +44,8 @@ test5(repeat 54times) extern void test_control_return(UINT); #if defined(NX_HTTP_MULTIPART_ENABLE) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/http_test/netx_http_post_basic_test.c b/test/regression/http_test/netx_http_post_basic_test.c index 2a8f1a3f..5b5cb622 100644 --- a/test/regression/http_test/netx_http_post_basic_test.c +++ b/test/regression/http_test/netx_http_post_basic_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_request_in_multiple_packets_test.c b/test/regression/http_test/netx_http_request_in_multiple_packets_test.c index c4656796..32926727 100644 --- a/test/regression/http_test/netx_http_request_in_multiple_packets_test.c +++ b/test/regression/http_test/netx_http_request_in_multiple_packets_test.c @@ -11,13 +11,8 @@ #include "fx_api.h" extern void test_control_return(UINT); #ifndef NX_DISABLE_IPV4 -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_PORT 80 diff --git a/test/regression/http_test/netx_http_server_type_retrieve_test.c b/test/regression/http_test/netx_http_server_type_retrieve_test.c index a3fca24e..22693f18 100644 --- a/test/regression/http_test/netx_http_server_type_retrieve_test.c +++ b/test/regression/http_test/netx_http_server_type_retrieve_test.c @@ -2,11 +2,7 @@ #include "tx_api.h" #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_server.h" -#else -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/http_test/netx_http_status_404_test.c b/test/regression/http_test/netx_http_status_404_test.c index f02cff6a..2a8a434d 100644 --- a/test/regression/http_test/netx_http_status_404_test.c +++ b/test/regression/http_test/netx_http_status_404_test.c @@ -3,13 +3,8 @@ #include "nx_api.h" #include "fx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_http_client.h" #include "nxd_http_server.h" -#else -#include "nx_http_client.h" -#include "nx_http_server.h" -#endif extern void test_control_return(UINT); diff --git a/test/regression/pop3_test/netx_pop3_abnormal_packet_test.c b/test/regression/pop3_test/netx_pop3_abnormal_packet_test.c index aa9e990e..d51e91ec 100644 --- a/test/regression/pop3_test/netx_pop3_abnormal_packet_test.c +++ b/test/regression/pop3_test/netx_pop3_abnormal_packet_test.c @@ -5,11 +5,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_pop3_client.h" -#else -#include "nx_pop3_client.h" -#endif extern void test_control_return(UINT); #if !defined(NX_DISABLE_IPV4) diff --git a/test/regression/pop3_test/netx_pop3_mail_receive_test.c b/test/regression/pop3_test/netx_pop3_mail_receive_test.c index 6e23d0da..01e62020 100644 --- a/test/regression/pop3_test/netx_pop3_mail_receive_test.c +++ b/test/regression/pop3_test/netx_pop3_mail_receive_test.c @@ -10,11 +10,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_pop3_client.h" -#else -#include "nx_pop3_client.h" -#endif extern void test_control_return(UINT); #if !defined(NX_DISABLE_IPV4) diff --git a/test/regression/pop3_test/netx_pop3_packet_with_endmarker_test.c b/test/regression/pop3_test/netx_pop3_packet_with_endmarker_test.c index ad1f8268..56b70944 100644 --- a/test/regression/pop3_test/netx_pop3_packet_with_endmarker_test.c +++ b/test/regression/pop3_test/netx_pop3_packet_with_endmarker_test.c @@ -11,11 +11,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_pop3_client.h" -#else -#include "nx_pop3_client.h" -#endif extern void test_control_return(UINT); #if !defined(NX_DISABLE_IPV4) diff --git a/test/regression/pop3_test/netx_pop3_two_mails_received_test.c b/test/regression/pop3_test/netx_pop3_two_mails_received_test.c index 41f2ae31..9c964662 100644 --- a/test/regression/pop3_test/netx_pop3_two_mails_received_test.c +++ b/test/regression/pop3_test/netx_pop3_two_mails_received_test.c @@ -10,11 +10,7 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_ram_network_driver_test_1500.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_pop3_client.h" -#else -#include "nx_pop3_client.h" -#endif extern void test_control_return(UINT); #if !defined(NX_DISABLE_IPV4) diff --git a/test/regression/smtp_test/netx_smtp_abnormal_packet_test.c b/test/regression/smtp_test/netx_smtp_abnormal_packet_test.c index ddd21517..8ef0a47c 100644 --- a/test/regression/smtp_test/netx_smtp_abnormal_packet_test.c +++ b/test/regression/smtp_test/netx_smtp_abnormal_packet_test.c @@ -9,11 +9,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_auth_logon_function_test.c b/test/regression/smtp_test/netx_smtp_auth_logon_function_test.c index 50e82e87..5fc07863 100644 --- a/test/regression/smtp_test/netx_smtp_auth_logon_function_test.c +++ b/test/regression/smtp_test/netx_smtp_auth_logon_function_test.c @@ -11,11 +11,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_auth_no_type_function_test.c b/test/regression/smtp_test/netx_smtp_auth_no_type_function_test.c index 2dd4db63..f7198571 100644 --- a/test/regression/smtp_test/netx_smtp_auth_no_type_function_test.c +++ b/test/regression/smtp_test/netx_smtp_auth_no_type_function_test.c @@ -11,11 +11,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_auth_no_type_test.c b/test/regression/smtp_test/netx_smtp_auth_no_type_test.c index 120be6e9..66e17fcb 100644 --- a/test/regression/smtp_test/netx_smtp_auth_no_type_test.c +++ b/test/regression/smtp_test/netx_smtp_auth_no_type_test.c @@ -11,11 +11,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_auth_none_test.c b/test/regression/smtp_test/netx_smtp_auth_none_test.c index 6b9771c7..9dc41e10 100644 --- a/test/regression/smtp_test/netx_smtp_auth_none_test.c +++ b/test/regression/smtp_test/netx_smtp_auth_none_test.c @@ -16,11 +16,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_basic_function_test.c b/test/regression/smtp_test/netx_smtp_basic_function_test.c index bb4cd4b8..6e73d0c1 100644 --- a/test/regression/smtp_test/netx_smtp_basic_function_test.c +++ b/test/regression/smtp_test/netx_smtp_basic_function_test.c @@ -11,11 +11,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_invalid_release_test.c b/test/regression/smtp_test/netx_smtp_invalid_release_test.c index d2b81ab1..f70786a0 100644 --- a/test/regression/smtp_test/netx_smtp_invalid_release_test.c +++ b/test/regression/smtp_test/netx_smtp_invalid_release_test.c @@ -10,11 +10,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 0, 0, 1) diff --git a/test/regression/smtp_test/netx_smtp_missing_last_250_EHLO_message_test.c b/test/regression/smtp_test/netx_smtp_missing_last_250_EHLO_message_test.c index 99ac9814..dae680e4 100644 --- a/test/regression/smtp_test/netx_smtp_missing_last_250_EHLO_message_test.c +++ b/test/regression/smtp_test/netx_smtp_missing_last_250_EHLO_message_test.c @@ -13,11 +13,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 2, 41, 1) diff --git a/test/regression/smtp_test/netx_smtp_two_packet_EHLO_auth_last_message_test.c b/test/regression/smtp_test/netx_smtp_two_packet_EHLO_auth_last_message_test.c index 6a44c09b..5f91e06a 100644 --- a/test/regression/smtp_test/netx_smtp_two_packet_EHLO_auth_last_message_test.c +++ b/test/regression/smtp_test/netx_smtp_two_packet_EHLO_auth_last_message_test.c @@ -12,11 +12,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 2, 41, 1) diff --git a/test/regression/smtp_test/netx_smtp_two_packet_EHLO_message_test.c b/test/regression/smtp_test/netx_smtp_two_packet_EHLO_message_test.c index 3b771b05..bc294129 100644 --- a/test/regression/smtp_test/netx_smtp_two_packet_EHLO_message_test.c +++ b/test/regression/smtp_test/netx_smtp_two_packet_EHLO_message_test.c @@ -12,11 +12,7 @@ extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) -#if defined(__PRODUCT_NETXDUO__) #include "nxd_smtp_client.h" -#else -#include "nx_smtp_client.h" -#endif #define DEMO_STACK_SIZE 2048 #define SERVER_IPADR IP_ADDRESS(10, 2, 41, 1) diff --git a/test/regression/snmp_test/netx_snmp_abnormal_packet_test.c b/test/regression/snmp_test/netx_snmp_abnormal_packet_test.c index 2645860a..ace2e572 100644 --- a/test/regression/snmp_test/netx_snmp_abnormal_packet_test.c +++ b/test/regression/snmp_test/netx_snmp_abnormal_packet_test.c @@ -3,11 +3,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_basic_v2_test.c b/test/regression/snmp_test/netx_snmp_basic_v2_test.c index a45d297e..03c8dabe 100644 --- a/test/regression/snmp_test/netx_snmp_basic_v2_test.c +++ b/test/regression/snmp_test/netx_snmp_basic_v2_test.c @@ -8,11 +8,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "small_mib_helper.h" // was demo_snmp_helper.h in the old MIB extern void test_control_return(UINT); diff --git a/test/regression/snmp_test/netx_snmp_no_security_function_test.c b/test/regression/snmp_test/netx_snmp_no_security_function_test.c index a1b37c9c..883c9582 100644 --- a/test/regression/snmp_test/netx_snmp_no_security_function_test.c +++ b/test/regression/snmp_test/netx_snmp_no_security_function_test.c @@ -5,11 +5,7 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" diff --git a/test/regression/snmp_test/netx_snmp_setget_integers_test.c b/test/regression/snmp_test/netx_snmp_setget_integers_test.c index aab54a81..2519f6da 100644 --- a/test/regression/snmp_test/netx_snmp_setget_integers_test.c +++ b/test/regression/snmp_test/netx_snmp_setget_integers_test.c @@ -10,11 +10,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_setget_ip_address_test.c b/test/regression/snmp_test/netx_snmp_setget_ip_address_test.c index 1ad3dd31..7163199e 100644 --- a/test/regression/snmp_test/netx_snmp_setget_ip_address_test.c +++ b/test/regression/snmp_test/netx_snmp_setget_ip_address_test.c @@ -10,11 +10,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_setget_misc_test.c b/test/regression/snmp_test/netx_snmp_setget_misc_test.c index d83aca4e..e5a85044 100644 --- a/test/regression/snmp_test/netx_snmp_setget_misc_test.c +++ b/test/regression/snmp_test/netx_snmp_setget_misc_test.c @@ -10,11 +10,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_setget_octet_strings_test.c b/test/regression/snmp_test/netx_snmp_setget_octet_strings_test.c index 4f3df041..d5c194f7 100644 --- a/test/regression/snmp_test/netx_snmp_setget_octet_strings_test.c +++ b/test/regression/snmp_test/netx_snmp_setget_octet_strings_test.c @@ -10,11 +10,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v1_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v1_buffer_overwrite_test.c index 26d8a7cd..c31b4e57 100644 --- a/test/regression/snmp_test/netx_snmp_v1_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v1_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v1_object_id_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v1_object_id_buffer_overwrite_test.c index a0c14bde..0b29cc80 100644 --- a/test/regression/snmp_test/netx_snmp_v1_object_id_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v1_object_id_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v1_packet_double_release_test.c b/test/regression/snmp_test/netx_snmp_v1_packet_double_release_test.c index ccedec0b..c9bcbc31 100644 --- a/test/regression/snmp_test/netx_snmp_v1_packet_double_release_test.c +++ b/test/regression/snmp_test/netx_snmp_v1_packet_double_release_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v2_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v2_buffer_overwrite_test.c index dc3a91df..327963c0 100644 --- a/test/regression/snmp_test/netx_snmp_v2_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v2_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v2_get_bulk_request_test.c b/test/regression/snmp_test/netx_snmp_v2_get_bulk_request_test.c index 1d26e9d2..3bb7df06 100644 --- a/test/regression/snmp_test/netx_snmp_v2_get_bulk_request_test.c +++ b/test/regression/snmp_test/netx_snmp_v2_get_bulk_request_test.c @@ -6,11 +6,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v2_send_trap_test.c b/test/regression/snmp_test/netx_snmp_v2_send_trap_test.c index 34cd7000..693f07a0 100644 --- a/test/regression/snmp_test/netx_snmp_v2_send_trap_test.c +++ b/test/regression/snmp_test/netx_snmp_v2_send_trap_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v2_unknown_oid_test.c b/test/regression/snmp_test/netx_snmp_v2_unknown_oid_test.c index 0af1e812..aeaf3f88 100644 --- a/test/regression/snmp_test/netx_snmp_v2_unknown_oid_test.c +++ b/test/regression/snmp_test/netx_snmp_v2_unknown_oid_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v3_buffer_overwrite_test.c index 8afe0f6d..9e7c675e 100644 --- a/test/regression/snmp_test/netx_snmp_v3_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_decrypt_pdu_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v3_decrypt_pdu_buffer_overwrite_test.c index b0f5873c..2bda98af 100644 --- a/test/regression/snmp_test/netx_snmp_v3_decrypt_pdu_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_decrypt_pdu_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_buffer_overwrite_test.c index 4e176c8e..796b6c83 100644 --- a/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_padding_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_padding_buffer_overwrite_test.c index 8f4429ce..06777e86 100644 --- a/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_padding_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_encrypt_pdu_padding_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_md5_failed_security_test.c b/test/regression/snmp_test/netx_snmp_v3_md5_failed_security_test.c index 41d97529..422c8c65 100644 --- a/test/regression/snmp_test/netx_snmp_v3_md5_failed_security_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_md5_failed_security_test.c @@ -6,11 +6,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_md5_security_extended_test.c b/test/regression/snmp_test/netx_snmp_v3_md5_security_extended_test.c index 2234f652..610fbdcc 100644 --- a/test/regression/snmp_test/netx_snmp_v3_md5_security_extended_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_md5_security_extended_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_md5_security_test.c b/test/regression/snmp_test/netx_snmp_v3_md5_security_test.c index 5faa5e3b..d9d87525 100644 --- a/test/regression/snmp_test/netx_snmp_v3_md5_security_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_md5_security_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_no_security_function_test.c b/test/regression/snmp_test/netx_snmp_v3_no_security_function_test.c index 0ed15cab..2d477198 100644 --- a/test/regression/snmp_test/netx_snmp_v3_no_security_function_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_no_security_function_test.c @@ -4,11 +4,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_nosec_traplist_test.c b/test/regression/snmp_test/netx_snmp_v3_nosec_traplist_test.c index 73b0aa6d..0bfee76c 100644 --- a/test/regression/snmp_test/netx_snmp_v3_nosec_traplist_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_nosec_traplist_test.c @@ -5,11 +5,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/snmp_test/netx_snmp_v3_object_id_buffer_overwrite_test.c b/test/regression/snmp_test/netx_snmp_v3_object_id_buffer_overwrite_test.c index 6c08c555..01a0b65f 100644 --- a/test/regression/snmp_test/netx_snmp_v3_object_id_buffer_overwrite_test.c +++ b/test/regression/snmp_test/netx_snmp_v3_object_id_buffer_overwrite_test.c @@ -7,11 +7,7 @@ #include "tx_api.h" #include "nx_api.h" -#if defined(__PRODUCT_NETXDUO__) #include "nxd_snmp.h" -#else -#include "nx_snmp.h" -#endif #include "nx_udp.h" #include "small_mib_helper.h" diff --git a/test/regression/sntp_test/netx_sntp_client_broadcast_basic_test.c b/test/regression/sntp_test/netx_sntp_client_broadcast_basic_test.c index 62175ad5..169ed5f2 100644 --- a/test/regression/sntp_test/netx_sntp_client_broadcast_basic_test.c +++ b/test/regression/sntp_test/netx_sntp_client_broadcast_basic_test.c @@ -1,10 +1,6 @@ #include "nx_api.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/sntp_test/netx_sntp_client_ipv6_broadcast_basic_test.c b/test/regression/sntp_test/netx_sntp_client_ipv6_broadcast_basic_test.c index 897162aa..499bd779 100644 --- a/test/regression/sntp_test/netx_sntp_client_ipv6_broadcast_basic_test.c +++ b/test/regression/sntp_test/netx_sntp_client_ipv6_broadcast_basic_test.c @@ -1,10 +1,6 @@ #include "nx_api.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); #if defined(FEATURE_NX_IPV6) && !defined(NX_DISABLE_IPV4) diff --git a/test/regression/sntp_test/netx_sntp_client_ipv6_unicast_basic_test.c b/test/regression/sntp_test/netx_sntp_client_ipv6_unicast_basic_test.c index 790c287a..46b38d4c 100644 --- a/test/regression/sntp_test/netx_sntp_client_ipv6_unicast_basic_test.c +++ b/test/regression/sntp_test/netx_sntp_client_ipv6_unicast_basic_test.c @@ -1,10 +1,6 @@ #include "nx_api.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); #if defined(FEATURE_NX_IPV6) && !defined(NX_DISABLE_IPV4) diff --git a/test/regression/sntp_test/netx_sntp_client_kod_test.c b/test/regression/sntp_test/netx_sntp_client_kod_test.c index a9b03587..9951ae83 100644 --- a/test/regression/sntp_test/netx_sntp_client_kod_test.c +++ b/test/regression/sntp_test/netx_sntp_client_kod_test.c @@ -1,10 +1,6 @@ #include "nx_api.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/sntp_test/netx_sntp_client_seconds_to_date_test.c b/test/regression/sntp_test/netx_sntp_client_seconds_to_date_test.c index e40d20eb..a6382cca 100644 --- a/test/regression/sntp_test/netx_sntp_client_seconds_to_date_test.c +++ b/test/regression/sntp_test/netx_sntp_client_seconds_to_date_test.c @@ -1,10 +1,6 @@ #include <time.h> #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/sntp_test/netx_sntp_client_unicast_basic_test.c b/test/regression/sntp_test/netx_sntp_client_unicast_basic_test.c index d3b08f0d..e07dd634 100644 --- a/test/regression/sntp_test/netx_sntp_client_unicast_basic_test.c +++ b/test/regression/sntp_test/netx_sntp_client_unicast_basic_test.c @@ -1,10 +1,6 @@ #include "nx_api.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/sntp_test/netx_sntp_client_unicast_display_date_test.c b/test/regression/sntp_test/netx_sntp_client_unicast_display_date_test.c index 16b44e1d..59efb2cf 100644 --- a/test/regression/sntp_test/netx_sntp_client_unicast_display_date_test.c +++ b/test/regression/sntp_test/netx_sntp_client_unicast_display_date_test.c @@ -1,10 +1,6 @@ #include "nx_api.h" #include "nx_ip.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); #if !defined(NX_DISABLE_IPV4) diff --git a/test/regression/sntp_test/netx_sntp_forward_unicast_update_test.c b/test/regression/sntp_test/netx_sntp_forward_unicast_update_test.c index 16582cf2..9df296d3 100644 --- a/test/regression/sntp_test/netx_sntp_forward_unicast_update_test.c +++ b/test/regression/sntp_test/netx_sntp_forward_unicast_update_test.c @@ -11,11 +11,7 @@ #include <stdio.h> #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT result); diff --git a/test/regression/sntp_test/netx_sntp_request_unicast_test.c b/test/regression/sntp_test/netx_sntp_request_unicast_test.c index 083299a9..38360de0 100644 --- a/test/regression/sntp_test/netx_sntp_request_unicast_test.c +++ b/test/regression/sntp_test/netx_sntp_request_unicast_test.c @@ -14,11 +14,7 @@ #include "nx_api.h" #include "nx_ip.h" #include <stdio.h> -#ifdef __PRODUCT_NETXDUO__ #include "nxd_sntp_client.h" -#else -#include "nx_sntp_client.h" -#endif extern void test_control_return(UINT status); diff --git a/test/regression/telnet_test/netx_telnet_activity_timeout_test.c b/test/regression/telnet_test/netx_telnet_activity_timeout_test.c index 5e1fec66..70919a27 100644 --- a/test/regression/telnet_test/netx_telnet_activity_timeout_test.c +++ b/test/regression/telnet_test/netx_telnet_activity_timeout_test.c @@ -16,13 +16,8 @@ extern void test_control_return(UINT); #if defined(NX_TELNET_SERVER_USER_CREATE_PACKET_POOL) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_client.h" #include "nxd_telnet_server.h" -#else -#include "nx_telnet_client.h" -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/telnet_test/netx_telnet_basic_test.c b/test/regression/telnet_test/netx_telnet_basic_test.c index d9e59f0b..92a36538 100644 --- a/test/regression/telnet_test/netx_telnet_basic_test.c +++ b/test/regression/telnet_test/netx_telnet_basic_test.c @@ -10,13 +10,8 @@ extern void test_control_return(UINT); -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_client.h" #include "nxd_telnet_server.h" -#else -#include "nx_telnet_client.h" -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/telnet_test/netx_telnet_create_packet_pool_test.c b/test/regression/telnet_test/netx_telnet_create_packet_pool_test.c index a5d26441..d3f2b400 100644 --- a/test/regression/telnet_test/netx_telnet_create_packet_pool_test.c +++ b/test/regression/telnet_test/netx_telnet_create_packet_pool_test.c @@ -13,13 +13,8 @@ extern void test_control_return(UINT); #if defined(NX_TELNET_SERVER_USER_CREATE_PACKET_POOL) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_client.h" #include "nxd_telnet_server.h" -#else -#include "nx_telnet_client.h" -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/telnet_test/netx_telnet_max_connections_test.c b/test/regression/telnet_test/netx_telnet_max_connections_test.c index 0c87d929..a0d49531 100644 --- a/test/regression/telnet_test/netx_telnet_max_connections_test.c +++ b/test/regression/telnet_test/netx_telnet_max_connections_test.c @@ -16,13 +16,8 @@ extern void test_control_return(UINT); #if defined(NX_TELNET_SERVER_USER_CREATE_PACKET_POOL) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_client.h" #include "nxd_telnet_server.h" -#else -#include "nx_telnet_client.h" -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/telnet_test/netx_telnet_rst_test.c b/test/regression/telnet_test/netx_telnet_rst_test.c index 85c8ce6e..439d789d 100644 --- a/test/regression/telnet_test/netx_telnet_rst_test.c +++ b/test/regression/telnet_test/netx_telnet_rst_test.c @@ -10,11 +10,7 @@ extern void test_control_return(UINT); -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_server.h" -#else -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 #define LOOP 100 diff --git a/test/regression/telnet_test/netx_telnet_server_bad_option_reply_test.c b/test/regression/telnet_test/netx_telnet_server_bad_option_reply_test.c index 63e1f552..d10ed07d 100644 --- a/test/regression/telnet_test/netx_telnet_server_bad_option_reply_test.c +++ b/test/regression/telnet_test/netx_telnet_server_bad_option_reply_test.c @@ -17,13 +17,8 @@ extern void test_control_return(UINT); #if defined(NX_TELNET_SERVER_USER_CREATE_PACKET_POOL) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_client.h" #include "nxd_telnet_server.h" -#else -#include "nx_telnet_client.h" -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/telnet_test/netx_telnet_server_options_negotiate_test.c b/test/regression/telnet_test/netx_telnet_server_options_negotiate_test.c index e48c3142..29cd3f26 100644 --- a/test/regression/telnet_test/netx_telnet_server_options_negotiate_test.c +++ b/test/regression/telnet_test/netx_telnet_server_options_negotiate_test.c @@ -16,13 +16,8 @@ extern void test_control_return(UINT); #if defined(NX_TELNET_SERVER_USER_CREATE_PACKET_POOL) && !defined(NX_DISABLE_IPV4) -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_client.h" #include "nxd_telnet_server.h" -#else -#include "nx_telnet_client.h" -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 diff --git a/test/regression/telnet_test/netx_telnet_two_listen_test.c b/test/regression/telnet_test/netx_telnet_two_listen_test.c index a190702d..f8d6f302 100644 --- a/test/regression/telnet_test/netx_telnet_two_listen_test.c +++ b/test/regression/telnet_test/netx_telnet_two_listen_test.c @@ -10,11 +10,7 @@ extern void test_control_return(UINT); -#ifdef __PRODUCT_NETXDUO__ #include "nxd_telnet_server.h" -#else -#include "nx_telnet_server.h" -#endif #define DEMO_STACK_SIZE 4096 #define LOOP 100 diff --git a/test/regression/tftp_test/netx_tftp_basic_test.c b/test/regression/tftp_test/netx_tftp_basic_test.c index afb92a17..a6995daf 100644 --- a/test/regression/tftp_test/netx_tftp_basic_test.c +++ b/test/regression/tftp_test/netx_tftp_basic_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); diff --git a/test/regression/tftp_test/netx_tftp_error_destionation_port_test.c b/test/regression/tftp_test/netx_tftp_error_destionation_port_test.c index e8f9a1c6..7535036b 100644 --- a/test/regression/tftp_test/netx_tftp_error_destionation_port_test.c +++ b/test/regression/tftp_test/netx_tftp_error_destionation_port_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); diff --git a/test/regression/tftp_test/netx_tftp_error_file_name_test.c b/test/regression/tftp_test/netx_tftp_error_file_name_test.c index 4d5ebefa..4052a251 100644 --- a/test/regression/tftp_test/netx_tftp_error_file_name_test.c +++ b/test/regression/tftp_test/netx_tftp_error_file_name_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); diff --git a/test/regression/tftp_test/netx_tftp_ipv6_basic_test.c b/test/regression/tftp_test/netx_tftp_ipv6_basic_test.c index 697643d2..0c17d81a 100644 --- a/test/regression/tftp_test/netx_tftp_ipv6_basic_test.c +++ b/test/regression/tftp_test/netx_tftp_ipv6_basic_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" #ifdef FEATURE_NX_IPV6 #include "nx_ipv6.h" diff --git a/test/regression/tftp_test/netx_tftp_large_data_test.c b/test/regression/tftp_test/netx_tftp_large_data_test.c index 7d2f604a..8fd83988 100644 --- a/test/regression/tftp_test/netx_tftp_large_data_test.c +++ b/test/regression/tftp_test/netx_tftp_large_data_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); diff --git a/test/regression/tftp_test/netx_tftp_malformed_packet_test.c b/test/regression/tftp_test/netx_tftp_malformed_packet_test.c index 6caaebb9..c57921c7 100644 --- a/test/regression/tftp_test/netx_tftp_malformed_packet_test.c +++ b/test/regression/tftp_test/netx_tftp_malformed_packet_test.c @@ -1,13 +1,8 @@ #include "tx_api.h" #include "nx_api.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); diff --git a/test/regression/tftp_test/netx_tftp_read_interaction_test.c b/test/regression/tftp_test/netx_tftp_read_interaction_test.c index 89a77e53..d0f9b12d 100644 --- a/test/regression/tftp_test/netx_tftp_read_interaction_test.c +++ b/test/regression/tftp_test/netx_tftp_read_interaction_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); diff --git a/test/regression/tftp_test/netx_tftp_write_interaction_test.c b/test/regression/tftp_test/netx_tftp_write_interaction_test.c index 30579de3..370f45cb 100644 --- a/test/regression/tftp_test/netx_tftp_write_interaction_test.c +++ b/test/regression/tftp_test/netx_tftp_write_interaction_test.c @@ -2,13 +2,8 @@ #include "tx_api.h" #include "nx_api.h" #include "nx_udp.h" -#ifdef __PRODUCT_NETXDUO__ #include "nxd_tftp_client.h" #include "nxd_tftp_server.h" -#else -#include "nx_tftp_client.h" -#include "nx_tftp_server.h" -#endif #include "fx_api.h" extern void test_control_return(UINT); |