diff options
| author | TiejunZhou <[email protected]> | 2023-12-27 03:01:42 +0000 |
|---|---|---|
| committer | TiejunZhou <[email protected]> | 2023-12-27 03:01:42 +0000 |
| commit | 5ce374fa5a117d62d260f7fecf726596d86803d6 (patch) | |
| tree | 5a2198f7fac1cf63a5a7be0b7ebb1f748c3ef82c | |
| parent | d55f93aa0e6b11308b8986dce1fe7e18fe529dc1 (diff) | |
Fix compiler issues
| -rw-r--r-- | test/regression/netxduo_test/netx_ip_link_status_test2.c | 18 | ||||
| -rw-r--r-- | test/regression/tsn_test/netx_shaper_cbs_test.c | 10 |
2 files changed, 5 insertions, 23 deletions
diff --git a/test/regression/netxduo_test/netx_ip_link_status_test2.c b/test/regression/netxduo_test/netx_ip_link_status_test2.c index 0b47a492..ade43d32 100644 --- a/test/regression/netxduo_test/netx_ip_link_status_test2.c +++ b/test/regression/netxduo_test/netx_ip_link_status_test2.c @@ -55,21 +55,12 @@ void thread_0_entry(ULONG thread_input); void thread_1_and_2_entry(ULONG thread_input); UINT receive_callback(NX_IP *ip_ptr, UINT interface_index, NX_PACKET *packet_ptr, ULONG physical_address_msw, ULONG physical_address_lsw, - USHORT packet_type, UINT header_size, VOID *context, + UINT packet_type, UINT header_size, VOID *context, struct NX_LINK_TIME_STRUCT *time_ptr); void _nx_ram_network_driver(struct NX_IP_DRIVER_STRUCT *driver_req); extern void test_control_return(UINT status); -/* Define main entry point. */ - -int main() -{ - - /* Enter the ThreadX kernel. */ - tx_kernel_enter(); -} - static VOID set_link_status(NX_IP *ip_ptr, UINT link_status) { @@ -166,7 +157,7 @@ UINT status; /* Define receive callback function. */ UINT receive_callback(NX_IP *ip_ptr, UINT interface_index, NX_PACKET *packet_ptr, ULONG physical_address_msw, ULONG physical_address_lsw, - USHORT packet_type, UINT header_size, VOID *context, + UINT packet_type, UINT header_size, VOID *context, struct NX_LINK_TIME_STRUCT *time_ptr) { (VOID)(physical_address_msw); @@ -194,9 +185,8 @@ UINT receive_callback(NX_IP *ip_ptr, UINT interface_index, NX_PACKET *packet_ptr void conf_link_layer() { - UINT status; - - UCHAR interface_0, interface_1; +UINT status; +UINT interface_0, interface_1; status = nx_link_vlan_interface_create(&ip_0, "NetX IP Interface 0:2", IP_ADDRESS(0, 0, 0, 0), 0xFFFFFFFFUL, VLAN_TAG, 0, &interface_0); if (status) diff --git a/test/regression/tsn_test/netx_shaper_cbs_test.c b/test/regression/tsn_test/netx_shaper_cbs_test.c index 0c43b6bc..67a565b9 100644 --- a/test/regression/tsn_test/netx_shaper_cbs_test.c +++ b/test/regression/tsn_test/netx_shaper_cbs_test.c @@ -47,14 +47,6 @@ extern void test_control_return(UINT status); /***** Substitute your ethernet driver entry function here *********/ void _nx_ram_network_driver(struct NX_IP_DRIVER_STRUCT *driver_req); -/* Define main entry point. */ -int main() -{ - - /* Enter the ThreadX kernel. */ - tx_kernel_enter(); -} - /* Define what the initial system looks like. */ #ifdef CTEST VOID test_application_define(void *first_unused_memory) @@ -155,7 +147,7 @@ UINT status; error_counter++; #endif - status = nx_link_vlan_id_set(&ip_0, 1, VLAN_ID); + status = nx_link_vlan_set(&ip_0, 1, VLAN_ID); if (status) error_counter++; |