Commit 7808b6ff authored by wujing's avatar wujing

fix ping loss

parent 1fbc356f
...@@ -660,7 +660,7 @@ add_boolean_option(EXMIMO_IOT True "????") ...@@ -660,7 +660,7 @@ add_boolean_option(EXMIMO_IOT True "????")
add_boolean_option(LOCALIZATION False "???") add_boolean_option(LOCALIZATION False "???")
add_integer_option(MAX_NUM_CCs 1 "????") add_integer_option(MAX_NUM_CCs 1 "????")
add_boolean_option(MU_RECEIVER False "????") add_boolean_option(MU_RECEIVER False "????")
add_boolean_option(PHYSIM True "for L1 simulators (dlsim, ulsim, ...)") add_boolean_option(PHYSIM False "for L1 simulators (dlsim, ulsim, ...)")
add_boolean_option(PHY_CONTEXT True "not clear: must remain False for dlsim") add_boolean_option(PHY_CONTEXT True "not clear: must remain False for dlsim")
add_boolean_option(PHY_EMUL False "not clear: must remain False for dlsim") add_boolean_option(PHY_EMUL False "not clear: must remain False for dlsim")
add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator") add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator")
......
...@@ -69,6 +69,7 @@ UE_AUTOTEST_TRACE="False" ...@@ -69,6 +69,7 @@ UE_AUTOTEST_TRACE="False"
UE_DEBUG_TRACE="False" UE_DEBUG_TRACE="False"
UE_TIMING_TRACE="False" UE_TIMING_TRACE="False"
USRP_REC_PLAY="False" USRP_REC_PLAY="False"
PHYSIM="False"
BUILD_ECLIPSE=0 BUILD_ECLIPSE=0
OPTIONAL_LIBRARIES="telnetsrv enbscope uescope msc" OPTIONAL_LIBRARIES="telnetsrv enbscope uescope msc"
trap handle_ctrl_c INT trap handle_ctrl_c INT
...@@ -246,6 +247,7 @@ function main() { ...@@ -246,6 +247,7 @@ function main() {
shift 2;; shift 2;;
--phy_simulators) --phy_simulators)
SIMUS_PHY=1 SIMUS_PHY=1
PHYSIM="True"
echo_info "Will compile dlsim, ulsim, ..." echo_info "Will compile dlsim, ulsim, ..."
shift;; shift;;
--core_simulators) --core_simulators)
...@@ -501,7 +503,7 @@ function main() { ...@@ -501,7 +503,7 @@ function main() {
echo "set ( UE_EXPANSION $UE_EXPANSION )" >> $cmake_file echo "set ( UE_EXPANSION $UE_EXPANSION )" >> $cmake_file
echo "set ( PHY_RM $PHY_RM )" >> $cmake_file echo "set ( PHY_RM $PHY_RM )" >> $cmake_file
echo "set ( UDP_1MS $UDP_1MS )" >> $cmake_file echo "set ( UDP_1MS $UDP_1MS )" >> $cmake_file
# echo "set ( PHY_TX_THREAD $UE_EXPANSION )" >> $cmake_file echo "set ( PHYSIM $PHYSIM )" >> $cmake_file
echo "set ( PRE_SCD_THREAD $UE_EXPANSION )" >> $cmake_file echo "set ( PRE_SCD_THREAD $UE_EXPANSION )" >> $cmake_file
echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )" >> $cmake_file echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )" >> $cmake_file
echo "set ( RRC_ASN1_VERSION \"${REL}\")" >> $cmake_file echo "set ( RRC_ASN1_VERSION \"${REL}\")" >> $cmake_file
......
...@@ -900,6 +900,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) { ...@@ -900,6 +900,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
if (1) { //sdu != NULL) if (1) { //sdu != NULL)
if (NFAPI_MODE!=NFAPI_MODE_VNF) { if (NFAPI_MODE!=NFAPI_MODE_VNF) {
if (sdu != NULL) { if (sdu != NULL) {
#ifdef PHYSIM
LTE_eNB_PDCCH *pdcch_vars = &eNB->pdcch_vars[NFAPI_SFNSF2SF(DL_req->sfn_sf)&1]; LTE_eNB_PDCCH *pdcch_vars = &eNB->pdcch_vars[NFAPI_SFNSF2SF(DL_req->sfn_sf)&1];
uint8_t harq_pid_dl = 0; uint8_t harq_pid_dl = 0;
uint8_t k; uint8_t k;
...@@ -921,6 +922,24 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) { ...@@ -921,6 +922,24 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
LOG_E(PHY, "schedule_response illegal harq_pid %d\n", harq_pid_dl); LOG_E(PHY, "schedule_response illegal harq_pid %d\n", harq_pid_dl);
} }
} }
#else
LTE_TDD_Config_t *tdd_Config = NULL;
if (fp->frame_type == TDD) {
tdd_Config = CALLOC(1,sizeof(struct LTE_TDD_Config));
tdd_Config->subframeAssignment = fp->tdd_config;
tdd_Config->specialSubframePatterns = fp->tdd_config_S;
}
uint8_t harq_pid_dl = frame_subframe2_dl_harq_pid(tdd_Config, NFAPI_SFNSF2SFN(DL_req->sfn_sf), NFAPI_SFNSF2SF(DL_req->sfn_sf));
if (harq_pid_dl >=0 && harq_pid_dl < 8) {
memset(dl_pdus[harq_pid_dl][i], 0, sizeof(uint8_t)*9422);
memcpy(dl_pdus[harq_pid_dl][i], TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_data, TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_length);
handle_nfapi_dlsch_pdu(eNB,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),proc,dl_config_pdu, dlsch_pdu_rel8->transport_blocks-1, dl_pdus[harq_pid_dl][i]);
} else {
LOG_E(PHY, "schedule_response illegal harq_pid %d\n", harq_pid_dl);
}
#endif
} else { } else {
handle_nfapi_dlsch_pdu(eNB,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),proc,dl_config_pdu, dlsch_pdu_rel8->transport_blocks-1, sdu); handle_nfapi_dlsch_pdu(eNB,NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),proc,dl_config_pdu, dlsch_pdu_rel8->transport_blocks-1, sdu);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment