From 2d80c897eda7ffea6842bc3b0723cf7b34fed2f4 Mon Sep 17 00:00:00 2001 From: "lishuang.xie" Date: Tue, 2 Jan 2024 15:05:50 +0800 Subject: [PATCH] use the enhancement#1546 delete the cell_setup_simulation's sleep into dev_ck_v2.1 1. delete the sleep which in the function of cell_setup_simulation 2. the function of cell_setup_simulation define in many cases 3. Test: 3.1 spu(case0)+arm(case0): Pass 3.2 spu(case14)+arm(case20):Pass 3.3 spu(case20)+arm(case20):Pass 3.4 spu(case21)+arm(case21):Pass 3.5 spu(case34)+arm(case5): Pass 3.6 spu(case42)+arm(case46):Pass 3.7 spu(case44)+arm(case5): Pass --- test/case0/src/testcase.c | 18 +++++++++--------- test/case20/src/testcase20.c | 9 ++++----- test/case21/src/testcase21.c | 18 ++++++++---------- test/case22/src/testcase22.c | 18 ++++++++---------- test/case23/src/testcase23.c | 20 +++++++++----------- test/case45/src/testcase45.c | 3 --- test/case46/src/testcase46.c | 3 --- test/case48/src/testcase48.c | 3 --- test/case5/src/testcase5.c | 3 --- 9 files changed, 38 insertions(+), 57 deletions(-) diff --git a/test/case0/src/testcase.c b/test/case0/src/testcase.c index 876fa05..ee07bf8 100644 --- a/test/case0/src/testcase.c +++ b/test/case0/src/testcase.c @@ -188,7 +188,7 @@ static inline void msg_transfer_queue_polling(void) #define CELL_SETUP_TYPE_SIMULATION (0x5a6b7c8d) -void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core) +void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, uint8_t frame_type) { uint32_t size = 32; char* buf; @@ -200,9 +200,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core) handler.inst_id = 0; handler.type_id = CU_SPLIT; - //usleep(10000); - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ @@ -219,6 +216,7 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core) *(uint32_t*)(buf + 16) = scs_id; *(uint32_t*)(buf + 20) = cell_id; *(uint32_t*)(buf + 24) = run_core; + *(uint32_t*)(buf + 28) = frame_type; ret = msg_transfer_send_msg(handler.value, cu_flag, (uint8_t *)buf, offset, size); ret = msg_transfer_send_end(handler.value,cu_flag); @@ -249,11 +247,13 @@ int32_t test_case(uint32_t argc, int32_t* argvp) handler.inst_id = 0; handler.type_id = CU_SPLIT; - int32_t ret; - uint8_t scs_id = 0; // NR 15K - uint8_t cell_id = 0; - uint32_t run_ape = 0x3; - cell_setup_simulation(scs_id, cell_id, run_ape); + int32_t ret; + uint8_t scs_id = 0; // NR 15K + uint8_t cell_id = 0; + uint32_t run_ape = 0x3; + uint8_t frame_type = 1; // tdd + + cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); while(1) { msg_transfer_queue_polling(); diff --git a/test/case20/src/testcase20.c b/test/case20/src/testcase20.c index 3d620ab..05c7e9e 100644 --- a/test/case20/src/testcase20.c +++ b/test/case20/src/testcase20.c @@ -190,7 +190,7 @@ static inline void msg_transfer_queue_polling(void) #define CELL_SETUP_TYPE_SIMULATION (0x5a6b7c8d) -void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core) +void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, uint8_t frame_type) { uint32_t size = 16; char* buf; @@ -202,9 +202,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core) handler.inst_id = 0; handler.type_id = CU_SPLIT; - //usleep(10000); - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ @@ -221,6 +218,7 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core) *(uint32_t*)(buf + 16) = scs_id; *(uint32_t*)(buf + 20) = cell_id; *(uint32_t*)(buf + 24) = run_core; + *(uint32_t*)(buf + 28) = frame_type; ret = msg_transfer_send_msg(handler.value, cu_flag, (uint8_t *)buf, offset, size); ret = msg_transfer_send_end(handler.value,cu_flag); @@ -255,8 +253,9 @@ int32_t test_case(uint32_t argc, int32_t* argvp) uint8_t scs_id = 1; // NR 30K uint8_t cell_id = 0; uint32_t run_ape = 0xF; + uint8_t frame_type = 1; // tdd - cell_setup_simulation(scs_id, cell_id, run_ape); + cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); while(1) { diff --git a/test/case21/src/testcase21.c b/test/case21/src/testcase21.c index 918c605..b4704ec 100644 --- a/test/case21/src/testcase21.c +++ b/test/case21/src/testcase21.c @@ -231,8 +231,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ @@ -284,10 +282,10 @@ int32_t test_case(uint32_t argc, int32_t* argvp) handler.type_id = CU_SPLIT; int32_t ret; - uint8_t scs_id = 1; // NR 30K - uint8_t cell_id = 0; - uint32_t run_ape = 0xF; - uint8_t frame_type = 1; // tdd + uint8_t scs_id = 1; // NR 30K + uint8_t cell_id = 0; + uint32_t run_ape = 0xF; + uint8_t frame_type = 1; // tdd cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); /* the first cell */ UCP_PRINT_DEBUG("call cell setup(1)"); @@ -297,10 +295,10 @@ int32_t test_case(uint32_t argc, int32_t* argvp) if ((100000 == gu32_rx_callback_data_cnt) && (0 == u8_cell_flag)) { /* 1st cell build ok after 10s */ - scs_id = 1; // NR 30K - cell_id = 1; - run_ape = 0xF0; - uint8_t frame_type = 1; // tdd + scs_id = 1; // NR 30K + cell_id = 1; + run_ape = 0xF0; + frame_type = 1; // tdd cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); /* the second cell */ u8_cell_flag = 1; UCP_PRINT_DEBUG("call cell setup(2)"); diff --git a/test/case22/src/testcase22.c b/test/case22/src/testcase22.c index 608d489..b5d3596 100644 --- a/test/case22/src/testcase22.c +++ b/test/case22/src/testcase22.c @@ -230,8 +230,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ @@ -283,10 +281,10 @@ int32_t test_case(uint32_t argc, int32_t* argvp) handler.type_id = CU_SPLIT; int32_t ret; - uint8_t scs_id = 0; // NR 15K - uint8_t cell_id = 0; - uint32_t run_ape = 0xF; - uint8_t frame_type = 1; // tdd + uint8_t scs_id = 0; // NR 15K + uint8_t cell_id = 0; + uint32_t run_ape = 0xF; + uint8_t frame_type = 1; // tdd cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); /* the first cell */ UCP_PRINT_DEBUG("call cell setup(1)"); @@ -296,10 +294,10 @@ int32_t test_case(uint32_t argc, int32_t* argvp) if ((100000 == gu32_rx_callback_data_cnt) && (0 == u8_cell_flag)) { /* 1st cell build ok after 10s */ - scs_id = 0; // NR 15K - cell_id = 1; - run_ape = 0xF0; - uint8_t frame_type = 1; // tdd + scs_id = 0; // NR 15K + cell_id = 1; + run_ape = 0xF0; + frame_type = 1; // tdd cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); /* the second cell */ u8_cell_flag = 1; UCP_PRINT_DEBUG("call cell setup(2)"); diff --git a/test/case23/src/testcase23.c b/test/case23/src/testcase23.c index 9b458d9..931b1ef 100644 --- a/test/case23/src/testcase23.c +++ b/test/case23/src/testcase23.c @@ -30,7 +30,7 @@ uint32_t slot_ind_flag = 0; uint32_t slot_ind_time_flag = 0; -uint32_t g_slot_time = 0; +uint32_t g_slot_time = 0; uint32_t gu32_value = 0; uint32_t gu32_tick_receive_ctrl = 0; uint32_t gu32_tick_from_tx_ctrl = 0; @@ -230,8 +230,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ @@ -283,10 +281,10 @@ int32_t test_case(uint32_t argc, int32_t* argvp) handler.type_id = CU_SPLIT; int32_t ret; - uint8_t scs_id = 1; // NR 30K - uint8_t cell_id = 0; - uint32_t run_ape = 0xF; - uint8_t frame_type = 1; // tdd + uint8_t scs_id = 1; // NR 30K + uint8_t cell_id = 0; + uint32_t run_ape = 0xF; + uint8_t frame_type = 1; // tdd cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); /* the first cell */ UCP_PRINT_DEBUG("call cell setup(1)"); @@ -296,10 +294,10 @@ int32_t test_case(uint32_t argc, int32_t* argvp) if ((100000 == gu32_rx_callback_data_cnt) && (0 == u8_cell_flag)) { /* 1st cell build ok after 10s */ - scs_id = 0; // NR 15K - cell_id = 1; - run_ape = 0xF0; - uint8_t frame_type = 1; // tdd + scs_id = 0; // NR 15K + cell_id = 1; + run_ape = 0xF0; + frame_type = 1; // tdd cell_setup_simulation(scs_id, cell_id, run_ape, frame_type); /* the second cell */ u8_cell_flag = 1; UCP_PRINT_DEBUG("call cell setup(2)"); diff --git a/test/case45/src/testcase45.c b/test/case45/src/testcase45.c index d1309c5..21c923b 100644 --- a/test/case45/src/testcase45.c +++ b/test/case45/src/testcase45.c @@ -207,9 +207,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - //usleep(10000); - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ diff --git a/test/case46/src/testcase46.c b/test/case46/src/testcase46.c index 9e01e62..3bc34e1 100644 --- a/test/case46/src/testcase46.c +++ b/test/case46/src/testcase46.c @@ -207,9 +207,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - //usleep(10000); - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ diff --git a/test/case48/src/testcase48.c b/test/case48/src/testcase48.c index f19a8ac..f9c2f98 100644 --- a/test/case48/src/testcase48.c +++ b/test/case48/src/testcase48.c @@ -207,9 +207,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - //usleep(10000); - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/ diff --git a/test/case5/src/testcase5.c b/test/case5/src/testcase5.c index d5204fd..4581db1 100644 --- a/test/case5/src/testcase5.c +++ b/test/case5/src/testcase5.c @@ -200,9 +200,6 @@ void cell_setup_simulation(uint8_t scs_id, uint8_t cell_id, uint32_t run_core, u handler.inst_id = 0; handler.type_id = CU_SPLIT; - //usleep(10000); - sleep(1); - int32_t ret = msg_transfer_send_start(handler.value,cu_flag); /************C_PLANE***************/