From 83394cd3a5bd069399a3ea96a9f6e9218b7203f9 Mon Sep 17 00:00:00 2001 From: matzakos <panagiotis.matzakos@eurecom.fr> Date: Fri, 17 Nov 2017 14:41:34 +0100 Subject: [PATCH] Small correction wrt the UE_MAC state machine in phy_stub_UE --- openair2/PHY_INTERFACE/phy_stub_UE.c | 10 ++++++---- targets/RT/USER/lte-ue.c | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.c b/openair2/PHY_INTERFACE/phy_stub_UE.c index 747a80a02f5..52860810555 100644 --- a/openair2/PHY_INTERFACE/phy_stub_UE.c +++ b/openair2/PHY_INTERFACE/phy_stub_UE.c @@ -493,7 +493,9 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id, fill_crc_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, 0); fill_rx_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, UE_mac_inst[Mod_id].RA_prach_resources.Msg3,buflen, rnti); Msg3_transmitted(Mod_id, 0, frame, 0); - UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; + + // Panos: This should be done after the reception of the respective hi_dci0 + //UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; } else { ue_get_sdu( Mod_id, 0, frame, subframe, 0, ulsch_buffer, buflen, &access_mode); @@ -516,7 +518,7 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id, fill_crc_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, 0); fill_rx_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, UE_mac_inst[Mod_id].RA_prach_resources.Msg3,buflen, rnti); Msg3_transmitted(Mod_id, 0, frame, 0); - UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; + //UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; } else { ue_get_sdu( Mod_id, 0, frame, subframe, 0, ulsch_buffer, buflen, &access_mode); @@ -544,7 +546,7 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id, fill_crc_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, 0); fill_rx_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, UE_mac_inst[Mod_id].RA_prach_resources.Msg3,buflen, rnti); Msg3_transmitted(Mod_id, 0, frame, 0); - UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; + //UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; } else { ue_get_sdu( Mod_id, 0, frame, subframe, 0, ulsch_buffer, buflen, &access_mode); @@ -571,7 +573,7 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id, fill_crc_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, 0); fill_rx_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, UE_mac_inst[Mod_id].RA_prach_resources.Msg3,buflen, rnti); Msg3_transmitted(Mod_id, 0, frame, 0); - UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; + //UE_mac_inst[Mod_id].first_ULSCH_Tx = 0; } else { ue_get_sdu( Mod_id, 0, frame, subframe, 0, ulsch_buffer, buflen, &access_mode); diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c index f3c28546c1a..9da164d41ec 100644 --- a/targets/RT/USER/lte-ue.c +++ b/targets/RT/USER/lte-ue.c @@ -648,6 +648,8 @@ static void *UE_thread_rxn_txnp4(void *arg) { // Hardcode Mod_id for now. Will be changed later. if(nfapi_mode == 3){ + // Panos: is this the right place to call oai_subframe_indication to invoke p7 nfapi callbacks here? + //oai_subframe_insdication() if(UE_mac_inst[Mod_id].tx_req) tx_req_UE_MAC(UE_mac_inst[Mod_id].tx_req); if(UE_mac_inst[Mod_id].dl_config_req) @@ -778,6 +780,10 @@ void *UE_thread(void *arg) { #endif int sub_frame=-1; + if(nfapi_mode==3) { + phy_stub_ticking->ticking_var = -1; + } + //int cumulated_shift=0; -- GitLab