Melissa Elkadi
9b16c1d860
At this point we are successfully able to build. Additionally, we can run the scenario, however, it does not pass. It seems that the gNB is not connecting to the proxy correctly. Just wanted to push the progress so far. FYI, the items that had to be changed to correct the linking issues were the following: - mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue - rrc_data_req vs. nr_rrc_data_req - mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue - rrc_data_req_ue vs. rrc_data_req_nr_ue - rrc_data_req vs. nr_rrc_data_req The listed functions should be declard in the LTE/NR UE directory depending on the functionality. Several were mixed. i.e.: LTE functions being called in NR UE. Also, removing siWindowLength, siWindowLength_int, SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC. These variable were not used in the NR UE and are defined for LTE only. Lastly, in the NR_IF_Module.c of the NR UE, the global variable def_dci_pdu_rel15 is not accessible. Need to revisit this. For not it is commented out.
127 lines
4.1 KiB
C
127 lines
4.1 KiB
C
/*
|
|
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership.
|
|
* The OpenAirInterface Software Alliance licenses this file to You under
|
|
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.openairinterface.org/?page_id=698
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*-------------------------------------------------------------------------------
|
|
* For more information about the OpenAirInterface (OAI) Software Alliance:
|
|
* contact@openairinterface.org
|
|
*/
|
|
|
|
/*! \file main.c
|
|
* \brief top init of Layer 2
|
|
* \author Navid Nikaein and Raymond Knopp, WEI-TAI CHEN
|
|
* \date 2010 - 2014, 2018
|
|
* \version 1.0
|
|
* \company Eurecom, NTUST
|
|
* \email: navid.nikaein@eurecom.fr, kroempa@gmail.com
|
|
* @ingroup _mac
|
|
|
|
*/
|
|
|
|
#include "NR_MAC_gNB/mac_proto.h"
|
|
#include "NR_MAC_COMMON/nr_mac_extern.h"
|
|
#include "assertions.h"
|
|
|
|
#include "LAYER2/nr_pdcp/nr_pdcp_entity.h"
|
|
#include "RRC/NR/nr_rrc_defs.h"
|
|
#include "common/utils/LOG/log.h"
|
|
//#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
|
|
|
|
#include "common/ran_context.h"
|
|
#include "executables/softmodem-common.h"
|
|
|
|
extern RAN_CONTEXT_t RC;
|
|
|
|
|
|
void mac_top_init_gNB(void)
|
|
{
|
|
module_id_t i;
|
|
int list_el;
|
|
NR_UE_info_t *UE_info;
|
|
gNB_MAC_INST *nrmac;
|
|
|
|
LOG_I(MAC, "[MAIN] Init function start:nb_nr_macrlc_inst=%d\n",RC.nb_nr_macrlc_inst);
|
|
|
|
if (RC.nb_nr_macrlc_inst > 0) {
|
|
|
|
RC.nrmac = (gNB_MAC_INST **) malloc16(RC.nb_nr_macrlc_inst *sizeof(gNB_MAC_INST *));
|
|
|
|
AssertFatal(RC.nrmac != NULL,"can't ALLOCATE %zu Bytes for %d gNB_MAC_INST with size %zu \n",
|
|
RC.nb_nr_macrlc_inst * sizeof(gNB_MAC_INST *),
|
|
RC.nb_nr_macrlc_inst, sizeof(gNB_MAC_INST));
|
|
|
|
for (i = 0; i < RC.nb_nr_macrlc_inst; i++) {
|
|
|
|
RC.nrmac[i] = (gNB_MAC_INST *) malloc16(sizeof(gNB_MAC_INST));
|
|
|
|
AssertFatal(RC.nrmac != NULL,"can't ALLOCATE %zu Bytes for %d gNB_MAC_INST with size %zu \n",
|
|
RC.nb_nr_macrlc_inst * sizeof(gNB_MAC_INST *),
|
|
RC.nb_nr_macrlc_inst, sizeof(gNB_MAC_INST));
|
|
|
|
LOG_D(MAC,"[MAIN] ALLOCATE %zu Bytes for %d gNB_MAC_INST @ %p\n",sizeof(gNB_MAC_INST), RC.nb_nr_macrlc_inst, RC.mac);
|
|
|
|
bzero(RC.nrmac[i], sizeof(gNB_MAC_INST));
|
|
|
|
RC.nrmac[i]->Mod_id = i;
|
|
|
|
RC.nrmac[i]->tag = (NR_TAG_t*)malloc(sizeof(NR_TAG_t));
|
|
memset((void*)RC.nrmac[i]->tag,0,sizeof(NR_TAG_t));
|
|
|
|
RC.nrmac[i]->ul_handle = 0;
|
|
|
|
RC.nrmac[i]->handled_frame = 1025;
|
|
RC.nrmac[i]->first_MIB = true;
|
|
|
|
if (get_softmodem_params()->phy_test) {
|
|
RC.nrmac[i]->pre_processor_dl = nr_preprocessor_phytest;
|
|
RC.nrmac[i]->pre_processor_ul = nr_ul_preprocessor_phytest;
|
|
} else {
|
|
RC.nrmac[i]->pre_processor_dl = nr_init_fr1_dlsch_preprocessor(i, 0);
|
|
RC.nrmac[i]->pre_processor_ul = nr_init_fr1_ulsch_preprocessor(i, 0);
|
|
}
|
|
|
|
}//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
|
|
|
|
AssertFatal(rlc_module_init(1) == 0,"Could not initialize RLC layer\n");
|
|
|
|
// These should be out of here later
|
|
pdcp_layer_init();
|
|
|
|
if(IS_SOFTMODEM_NOS1 && get_softmodem_params()->phy_test)
|
|
nr_DRB_preconfiguration(0x1234);
|
|
|
|
rrc_init_nr_global_param();
|
|
|
|
} else {
|
|
RC.nrmac = NULL;
|
|
}
|
|
|
|
// Initialize Linked-List for Active UEs
|
|
for (i = 0; i < RC.nb_nr_macrlc_inst; i++) {
|
|
|
|
nrmac = RC.nrmac[i];
|
|
nrmac->if_inst = NR_IF_Module_init(i);
|
|
|
|
UE_info = &nrmac->UE_info;
|
|
UE_info->num_UEs = 0;
|
|
create_nr_list(&UE_info->list, MAX_MOBILES_PER_GNB);
|
|
for (list_el = 0; list_el < MAX_MOBILES_PER_GNB; list_el++) {
|
|
UE_info->active[list_el] = false;
|
|
}
|
|
}
|
|
|
|
srand48(0);
|
|
}
|