Skip to content

O
OpenXG-RAN
Commit 104e5327 authored by Shruthi's avatar Shruthi
Browse files
Options

Review comments on SA mode addressed

parent 6fa460dd
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 24 deletions
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @ 104e5327
......@@ -420,7 +420,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
NR_UE_MAC_INST_t *mac = get_mac_inst(0);
NR_PUCCH_Resource_t *pucch_resource = NULL;
uint16_t crnti = mac->crnti;
NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
/* update current context */
......@@ -619,10 +619,11 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
mac->ULbwp[bwp_id] &&
mac->ULbwp[bwp_id]->bwp_Dedicated &&
mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config &&
mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config->choice.setup)
mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config->choice.setup) {
pucch_Config = mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config->choice.setup;
BWPsize = NRRIV2BW(mac->ULbwp[bwp_id]->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
BWPstart = NRRIV2PRBOFFSET(mac->ULbwp[bwp_id]->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
}
else if (bwp_id==0 &&
mac->cg &&
mac->cg->spCellConfig &&
......@@ -990,7 +991,7 @@ uint8_t get_downlink_ack(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_t
int N_m_c_rx = 0;
int V_DAI_m_DL = 0;
NR_UE_MAC_INST_t *mac = get_mac_inst(0);
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
if (mac->DLbwp[dl_bwp_id] &&
......@@ -1182,7 +1183,7 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
pucch_format_nr_t format_pucch;
int ready_pucch_resource_id = FALSE; /* in the case that it is already given */
NR_PUCCH_Resource_t *pucch_resource = NULL;
NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
/* ini values to unset */
*initial_pucch_id = NB_INITIAL_PUCCH_RESOURCE;
......@@ -1377,7 +1378,7 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
int find_pucch_resource_set(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, int uci_size)
{
int pucch_resource_set_id = 0;
NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
//long *pucch_max_pl_bits = NULL;
......
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @ 104e5327
......@@ -601,8 +601,8 @@ void config_control_ue(NR_UE_MAC_INST_t *mac){
AssertFatal(scd->downlinkBWP_ToAddModList->list.count <= 4, "downlinkBWP_ToAddModList->list->count is %d\n", scd->downlinkBWP_ToAddModList->list.count);
config_bwp_ue(mac, NULL, NULL);
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id ; //Changed
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id ;//Changed
AssertFatal(dl_bwp_id != 0, "DL_BWP_Id is 0!");
AssertFatal(ul_bwp_id != 0, "UL_BWP_Id is 0!");
......
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @ 104e5327
......@@ -73,7 +73,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_dci_dl_pdu_rel15_t
AssertFatal(mac->scc == NULL || mac->scc_SIB == NULL, "both scc and scc_SIB cannot be non-null\n");
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id ; //Changed
NR_ServingCellConfigCommon_t *scc = mac->scc;
NR_ServingCellConfigCommonSIB_t *scc_SIB = mac->scc_SIB;
NR_BWP_DownlinkCommon_t *bwp_Common=NULL;
......@@ -244,7 +244,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
RA_config_t *ra = &mac->ra;
int ss_id;
NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 : ((mac->cg) ? mac->DL_BWP_Id : 0) ; //SA uses initial BWP
NR_BWP_Id_t bwp_id = (mac->cg) ? mac->DL_BWP_Id : 0; //Changed
uint8_t coreset_id = (mac->cg) ? 1 : 0;
//NR_ServingCellConfig_t *scd = mac->scg->spCellConfig->spCellConfigDedicated;
NR_BWP_Downlink_t *bwp = (mac->cg) ? mac->DLbwp[bwp_id] : NULL;
......
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @ 104e5327
......@@ -280,8 +280,8 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
uint8_t sliv_S=0;
uint8_t sliv_L=0;
uint8_t mu_pusch = 1;
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
// definition table j Table 6.1.2.1.1-4
uint8_t j = (mu_pusch==3)?3:(mu_pusch==2)?2:1;
......@@ -459,8 +459,8 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
RA_config_t *ra = &mac->ra;
fapi_nr_dl_config_request_t *dl_config = &mac->dl_config_request;
uint8_t is_Msg3 = 0;
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
uint16_t n_RB_DLBWP;
if (mac->DLbwp[dl_bwp_id]) n_RB_DLBWP = NRRIV2BW(mac->DLbwp[dl_bwp_id]->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
......@@ -1169,7 +1169,7 @@ void nr_ue_send_sdu(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t *u
int get_n_rb(NR_UE_MAC_INST_t *mac, int rnti_type){
int N_RB = 0, start_RB;
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
switch(rnti_type) {
case NR_RNTI_RA:
case NR_RNTI_TC:
......@@ -1206,8 +1206,8 @@ uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
int fsize = 0;
int rnti_type = get_rnti_type(mac, rnti);
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 : mac->DL_BWP_Id ; //SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id; //SA uses initial BWP
NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
int N_RB_UL = 0;
if(mac->scc_SIB) {
......
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @ 104e5327
......@@ -95,7 +95,7 @@ void fill_scheduled_response(nr_scheduled_response_t *scheduled_response,
long get_k2(NR_UE_MAC_INST_t *mac, uint8_t time_domain_ind) {
long k2 = -1;
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
// Get K2 from RRC configuration
NR_PUSCH_Config_t *pusch_config=mac->ULbwp[ul_bwp_id] ? mac->ULbwp[ul_bwp_id]->bwp_Dedicated->pusch_Config->choice.setup : NULL;
NR_PUSCH_TimeDomainResourceAllocationList_t *pusch_TimeDomainAllocationList = NULL;
......@@ -136,7 +136,7 @@ long get_k2(NR_UE_MAC_INST_t *mac, uint8_t time_domain_ind) {
*/
fapi_nr_ul_config_request_t *get_ul_config_request(NR_UE_MAC_INST_t *mac, int slot)
{
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
NR_TDD_UL_DL_ConfigCommon_t *tdd_config = mac->scc==NULL ? mac->scc_SIB->tdd_UL_DL_ConfigurationCommon : mac->scc->tdd_UL_DL_ConfigurationCommon;
//Check if request to access ul_config is for a UL slot
......@@ -167,7 +167,7 @@ fapi_nr_ul_config_request_t *get_ul_config_request(NR_UE_MAC_INST_t *mac, int sl
void ul_layers_config(NR_UE_MAC_INST_t * mac, nfapi_nr_ue_pusch_pdu_t *pusch_config_pdu, dci_pdu_rel15_t *dci) {
NR_ServingCellConfigCommon_t *scc = mac->scc;
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
NR_PUSCH_Config_t *pusch_Config = mac->ULbwp[ul_bwp_id]->bwp_Dedicated->pusch_Config->choice.setup;
long transformPrecoder;
......@@ -306,7 +306,7 @@ void ul_ports_config(NR_UE_MAC_INST_t * mac, nfapi_nr_ue_pusch_pdu_t *pusch_conf
/* ANTENNA_PORTS */
uint8_t rank = 0; // We need to initialize rank FIXME!!!
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
NR_ServingCellConfigCommon_t *scc = mac->scc;
NR_PUSCH_Config_t *pusch_Config = mac->ULbwp[ul_bwp_id]->bwp_Dedicated->pusch_Config->choice.setup;
......@@ -513,7 +513,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
int N_PRB_oh = 0;
int rnti_type = get_rnti_type(mac, rnti);
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
// Common configuration
pusch_config_pdu->dmrs_config_type = pusch_dmrs_type1;
......@@ -668,7 +668,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
config_bwp_ue(mac, &dci->bwp_indicator.val, dci_format);
ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
ul_layers_config(mac, pusch_config_pdu, dci);
......@@ -1121,7 +1121,7 @@ int nr_ue_pusch_scheduler(NR_UE_MAC_INST_t *mac,
uint8_t tda_id){
int delta = 0;
NR_BWP_Id_t ul_bwp_id = get_softmodem_params()->sa ? 0 : mac->UL_BWP_Id ;//SA uses initial BWP
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
NR_BWP_Uplink_t *ubwp = mac->ULbwp[ul_bwp_id];
// Get the numerology to calculate the Tx frame and slot
......
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @ 104e5327
......@@ -1996,7 +1996,11 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id];
NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 1 : *CellGroup->spCellConfig->spCellConfigDedicated->firstActiveDownlinkBWP_Id;
NR_BWP_Id_t bwp_id; //Changed
if (CellGroup->spCellConfig->spCellConfigDedicated->firstActiveDownlinkBWP_Id)
bwp_id = *CellGroup->spCellConfig->spCellConfigDedicated->firstActiveDownlinkBWP_Id;
else
bwp_id = 1;
NR_BWP_Downlink_t *bwp=NULL;
NR_BWP_Uplink_t *ubwp=NULL;
......
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