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.
187 lines
7.2 KiB
C
187 lines
7.2 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 l2_interface_ue.c
|
|
* \brief layer 2 interface, used to support different RRC sublayer
|
|
* \author R. Knopp, K.H. HSU
|
|
* \date 2018
|
|
* \version 0.1
|
|
* \company Eurecom / NTUST
|
|
* \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
|
|
* \note
|
|
* \warning
|
|
*/
|
|
|
|
#include "rrc_defs.h"
|
|
#include "rrc_proto.h"
|
|
#include "assertions.h"
|
|
#include "rrc_vars.h"
|
|
|
|
typedef uint32_t channel_t;
|
|
|
|
int8_t
|
|
nr_mac_rrc_data_ind_ue(
|
|
const module_id_t module_id,
|
|
const int CC_id,
|
|
const uint8_t gNB_index,
|
|
const frame_t frame,
|
|
const sub_frame_t sub_frame,
|
|
const rnti_t rnti,
|
|
const channel_t channel,
|
|
const uint8_t* pduP,
|
|
const sdu_size_t pdu_len){
|
|
sdu_size_t sdu_size = 0;
|
|
|
|
switch(channel){
|
|
case NR_BCCH_BCH:
|
|
AssertFatal( nr_rrc_ue_decode_NR_BCCH_BCH_Message(module_id, gNB_index, (uint8_t*)pduP, pdu_len) == 0, "UE decode BCCH-BCH error!\n");
|
|
break;
|
|
|
|
case NR_BCCH_DL_SCH:
|
|
if (pdu_len>0) {
|
|
LOG_T(NR_RRC, "[UE %d] Received SDU for NR-BCCH-DL-SCH on SRB %u from gNB %d\n", module_id, channel & RAB_OFFSET,
|
|
gNB_index);
|
|
|
|
MessageDef *message_p;
|
|
int msg_sdu_size = BCCH_SDU_SIZE;
|
|
|
|
if (pdu_len > msg_sdu_size) {
|
|
LOG_E(NR_RRC, "SDU larger than NR-BCCH-DL-SCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
|
|
sdu_size = msg_sdu_size;
|
|
} else {
|
|
sdu_size = pdu_len;
|
|
}
|
|
|
|
message_p = itti_alloc_new_message(TASK_MAC_UE, 0, NR_RRC_MAC_BCCH_DATA_IND);
|
|
memset(NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu, 0, BCCH_SDU_SIZE);
|
|
memcpy(NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
|
|
NR_RRC_MAC_BCCH_DATA_IND (message_p).frame = frame; //frameP
|
|
NR_RRC_MAC_BCCH_DATA_IND (message_p).sub_frame = sub_frame; //sub_frameP
|
|
NR_RRC_MAC_BCCH_DATA_IND (message_p).sdu_size = sdu_size;
|
|
NR_RRC_MAC_BCCH_DATA_IND (message_p).gnb_index = gNB_index;
|
|
itti_send_msg_to_task(TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE(module_id), message_p);
|
|
}
|
|
break;
|
|
|
|
case CCCH:
|
|
if (pdu_len>0) {
|
|
LOG_T(NR_RRC,"[UE %d] Received SDU for CCCH on SRB %u from gNB %d\n",module_id,channel & RAB_OFFSET,gNB_index);
|
|
|
|
MessageDef *message_p;
|
|
int msg_sdu_size = CCCH_SDU_SIZE;
|
|
|
|
if (pdu_len > msg_sdu_size) {
|
|
LOG_E(NR_RRC, "SDU larger than CCCH SDU buffer size (%d, %d)", sdu_size, msg_sdu_size);
|
|
sdu_size = msg_sdu_size;
|
|
} else {
|
|
sdu_size = pdu_len;
|
|
}
|
|
|
|
message_p = itti_alloc_new_message (TASK_MAC_UE, 0, NR_RRC_MAC_CCCH_DATA_IND);
|
|
memset (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
|
|
memcpy (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, pduP, sdu_size);
|
|
NR_RRC_MAC_CCCH_DATA_IND (message_p).frame = frame; //frameP
|
|
NR_RRC_MAC_CCCH_DATA_IND (message_p).sub_frame = sub_frame; //sub_frameP
|
|
NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu_size = sdu_size;
|
|
NR_RRC_MAC_CCCH_DATA_IND (message_p).gnb_index = gNB_index;
|
|
NR_RRC_MAC_CCCH_DATA_IND (message_p).rnti = rnti; //rntiP
|
|
itti_send_msg_to_task (TASK_RRC_NRUE, GNB_MODULE_ID_TO_INSTANCE( module_id ), message_p);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return(0);
|
|
}
|
|
|
|
int8_t nr_mac_rrc_data_req_ue(const module_id_t Mod_idP,
|
|
const int CC_id,
|
|
const uint8_t gNB_id,
|
|
const frame_t frameP,
|
|
const rb_id_t Srb_id,
|
|
uint8_t *buffer_pP){
|
|
|
|
switch(Srb_id){
|
|
|
|
case CCCH:
|
|
|
|
// TODO: Enable timer T300
|
|
//NR_UE_rrc_inst[Mod_idP].Info[gNB_id].T300_active = 1;
|
|
//NR_UE_rrc_inst[Mod_idP].Info[gNB_id].T300_cnt = 0;
|
|
|
|
LOG_D(NR_RRC, "nr_mac_rrc_data_req_ue: Payload size = %i\n", NR_UE_rrc_inst[Mod_idP].Srb0[gNB_id].Tx_buffer.payload_size);
|
|
memcpy(buffer_pP, (uint8_t*)NR_UE_rrc_inst[Mod_idP].Srb0[gNB_id].Tx_buffer.Payload, NR_UE_rrc_inst[Mod_idP].Srb0[gNB_id].Tx_buffer.payload_size);
|
|
for(int i = 0; i<NR_UE_rrc_inst[Mod_idP].Srb0[gNB_id].Tx_buffer.payload_size; i++) {
|
|
LOG_D(NR_RRC,"(%i): %i\n", i, buffer_pP[i]);
|
|
}
|
|
|
|
return NR_UE_rrc_inst[Mod_idP].Srb0[gNB_id].Tx_buffer.payload_size;
|
|
|
|
case DCCH:
|
|
AssertFatal(1==0, "SRB1 not implemented yet!\n");
|
|
case DCCH1:
|
|
AssertFatal(1==0, "SRB2 not implemented yet!\n");
|
|
default:
|
|
AssertFatal(1==0, "Invalid SRB id!\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
uint8_t
|
|
rrc_data_req_nr_ue(
|
|
const protocol_ctxt_t *const ctxt_pP,
|
|
const rb_id_t rb_idP,
|
|
const mui_t muiP,
|
|
const confirm_t confirmP,
|
|
const sdu_size_t sdu_sizeP,
|
|
uint8_t *const buffer_pP,
|
|
const pdcp_transmission_mode_t modeP
|
|
)
|
|
{
|
|
MessageDef *message_p;
|
|
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
|
|
uint8_t *message_buffer;
|
|
message_buffer = itti_malloc (TASK_RRC_UE, TASK_PDCP_UE, sdu_sizeP);
|
|
LOG_D(RRC,"Sending RRC message for SRB %ld, sdu_size %d\n",rb_idP, sdu_sizeP);
|
|
memcpy (message_buffer, buffer_pP, sdu_sizeP);
|
|
message_p = itti_alloc_new_message ( TASK_RRC_UE, 0, RRC_DCCH_DATA_REQ);
|
|
RRC_DCCH_DATA_REQ (message_p).frame = ctxt_pP->frame;
|
|
RRC_DCCH_DATA_REQ (message_p).enb_flag = ctxt_pP->enb_flag;
|
|
RRC_DCCH_DATA_REQ (message_p).rb_id = rb_idP;
|
|
RRC_DCCH_DATA_REQ (message_p).muip = muiP;
|
|
RRC_DCCH_DATA_REQ (message_p).confirmp = confirmP;
|
|
RRC_DCCH_DATA_REQ (message_p).sdu_size = sdu_sizeP;
|
|
RRC_DCCH_DATA_REQ (message_p).sdu_p = message_buffer;
|
|
RRC_DCCH_DATA_REQ (message_p).mode = modeP;
|
|
RRC_DCCH_DATA_REQ (message_p).module_id = ctxt_pP->module_id;
|
|
RRC_DCCH_DATA_REQ (message_p).rnti = ctxt_pP->rnti;
|
|
RRC_DCCH_DATA_REQ (message_p).eNB_index = ctxt_pP->eNB_index;
|
|
itti_send_msg_to_task (
|
|
TASK_PDCP_UE,
|
|
ctxt_pP->instance,
|
|
message_p);
|
|
return TRUE; // TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
|
|
|
|
}
|