Skip to content

O
OpenXG-RAN
Commit 46d08aed authored by tct-labo4's avatar tct-labo4
Browse files
Options

Merge branch 'develop-nr' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr

parents d978b6d2 3e32b94f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 1191 deletions
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @ 46d08aed
...@@ -67,8 +67,12 @@ typedef struct { ...@@ -67,8 +67,12 @@ typedef struct {
#define FAPI_NR_TAG_LENGTH_PACKED_LEN 4 #define FAPI_NR_TAG_LENGTH_PACKED_LEN 4
typedef struct { typedef struct {
fapi_nr_tl_t tl; // config
// common C-RNTI uint8_t cce_idx;
uint8_t aggregation_level;
uint16_t rnti;
// dci pdu
uint8_t dci_format; uint8_t dci_format;
uint8_t frequency_domain_resouce_assignment; // 38.214 chapter 5.1.2.2 uint8_t frequency_domain_resouce_assignment; // 38.214 chapter 5.1.2.2
uint8_t time_domain_resource_assignment; // 38.214 chapter 5.1.2.1 uint8_t time_domain_resource_assignment; // 38.214 chapter 5.1.2.1
......
openair1/PHY/defs_nr_UE.h
View file @ 46d08aed
...@@ -991,6 +991,8 @@ typedef struct { ...@@ -991,6 +991,8 @@ typedef struct {
NR_DL_FRAME_PARMS frame_parms_before_ho; NR_DL_FRAME_PARMS frame_parms_before_ho;
NR_UE_COMMON common_vars; NR_UE_COMMON common_vars;
nr_ue_if_module_t *if_inst;
// point to the current rxTx thread index // point to the current rxTx thread index
uint8_t current_thread_id[10]; uint8_t current_thread_id[10];
......
openair1/SCHED_NR_UE/fapi_l1.c deleted 100644 → 0
View file @ d978b6d2
This diff is collapsed.
openair1/SCHED_NR_UE/fapi_l1.h deleted 100644 → 0
View file @ d978b6d2
/*
* 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 fapi_l1.h
* \brief function prototypes for FAPI L1 interface
* \author R. Knopp
* \date 2017
* \version 0.1
* \company Eurecom
* \email: knopp@eurecom.fr
* \note
* \warning
*/
#include "PHY/defs_eNB.h"
#include "PHY/phy_extern.h"
#include "PHY/LTE_TRANSPORT/transport_proto.h"
#include "SCHED/sched_eNB.h"
#include "SCHED/sched_common.h"
#include "nfapi_interface.h"
void fill_uci_harq_indication(PHY_VARS_eNB *eNB,LTE_eNB_UCI *uci,int frame,int subframe,uint8_t *harq_ack,uint8_t tdd_mapping_mode,uint16_t tdd_multiplexing_mask);
void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,uint16_t rnti, int frame,int subframe,int bundling);
void fill_ulsch_cqi_indication(PHY_VARS_eNB *eNB,uint16_t frame,uint8_t subframe,LTE_UL_eNB_HARQ_t *ulsch_harq,uint16_t rnti);
void fill_sr_indication(PHY_VARS_eNB *eNB,uint16_t rnti,int frame,int subframe,uint32_t stat);
void fill_rx_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe);
void fill_crc_indication(PHY_VARS_eNB *eNB,int UE_id,int frame,int subframe,uint8_t crc_flag);
void handle_nfapi_dci_dl_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
void handle_nfapi_mpdcch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
void handle_nfapi_hi_dci0_dci_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
nfapi_hi_dci0_request_pdu_t *hi_dci0_config_pdu);
void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_proc_t *proc,
nfapi_dl_config_request_pdu_t *dl_config_pdu,
uint8_t codeword_index,
uint8_t *sdu);
void handle_nfapi_ul_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
nfapi_ul_config_request_pdu_t *ul_config_pdu,
uint16_t frame,uint8_t subframe,uint8_t srs_present);
void handle_ulsch_harq_pdu(
PHY_VARS_eNB *eNB,
int UE_id,
nfapi_ul_config_request_pdu_t *ul_config_pdu,
nfapi_ul_config_ulsch_harq_information *harq_information,
uint16_t frame,
uint8_t subframe);
void handle_ulsch_cqi_ri_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe);
void handle_uci_harq_information(PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci,nfapi_ul_config_harq_information *harq_information);
void handle_uci_sr_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe,uint8_t srs_active);
void handle_uci_sr_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe,uint8_t srs_active);
void handle_uci_harq_pdu(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe,uint8_t srs_active);
void handle_srs_pdu(PHY_VARS_eNB *eNB,nfapi_ul_config_request_pdu_t *ul_config_pdu,uint16_t frame,uint8_t subframe);
void schedule_response(Sched_Rsp_t *Sched_INFO);
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @ 46d08aed
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file fapi_nr_ue_l1.c /* \file fapi_nr_ue_l1.c
* \brief functions for NR UE FAPI-like interface * \brief functions for NR UE FAPI-like interface
* \author R. Knopp * \author R. Knopp, K.H. HSU
* \date 2018 * \date 2018
* \version 0.1 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note * \note
* \warning * \warning
*/ */
......
openair1/SCHED_NR_UE/fapi_nr_ue_l1.h
View file @ 46d08aed
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file fapi_nr_ue_l1.c /* \file fapi_nr_ue_l1.c
* \brief functions for FAPI L1 interface * \brief functions for FAPI L1 interface
* \author R. Knopp * \author R. Knopp, K.H. HSU
* \date 2018 * \date 2018
* \version 0.1 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note * \note
* \warning * \warning
*/ */
......
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @ 46d08aed
...@@ -19,15 +19,17 @@ ...@@ -19,15 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file config.c /* \file config.c
* \brief UE and eNB configuration performed by RRC or as a consequence of RRC procedures * \brief UE and eNB configuration performed by RRC or as a consequence of RRC procedures
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \version 0.1 * \version 0.1
* \email: navid.nikaein@eurecom.fr * \company Eurecom / NTUST
* @ingroup _mac * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
* \warning
*/ */
#include "defs.h" #include "defs.h"
#include "proto.h" #include "proto.h"
......
openair2/LAYER2/NR_MAC_UE/extern.h deleted 100644 → 0
View file @ d978b6d2
/*
* 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 extern.h
* \brief mac externs
* \author Navid Nikaein and Raymond Knopp
* \date 2010 - 2014
* \version 1.0
* \email navid.nikaein@eurecom.fr
* @ingroup _mac
*/
#ifndef __MAC_EXTERN_H__
#define __MAC_EXTERN_H__
#ifdef USER_MODE
//#include "stdio.h"
#endif //USER_MODE
//#include "PHY/defs.h"
#include "PHY/defs_nr_UE.h"
#include "defs.h"
#include "COMMON/mac_rrc_primitives.h"
#ifdef PHY_EMUL
//#include "SIMULATION/simulation_defs.h"
#endif //PHY_EMUL
//#include "PHY_INTERFACE/defs.h"
//#include "RRC/LITE/defs.h"
extern const uint32_t BSR_TABLE[BSR_TABLE_SIZE];
//extern uint32_t EBSR_Level[63];
extern const uint32_t Extended_BSR_TABLE[BSR_TABLE_SIZE];
//extern uint32_t Extended_BSR_TABLE[63]; ----currently not used
extern const uint8_t cqi2fmt0_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
extern const uint8_t cqi2fmt1x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
extern const uint8_t cqi2fmt2x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE];
extern UE_MAC_INST *UE_mac_inst;
extern eNB_MAC_INST *eNB_mac_inst;
extern eNB_RRC_INST *eNB_rrc_inst;
extern UE_RRC_INST *UE_rrc_inst;
extern UE_MAC_INST *ue_mac_inst;
extern MAC_RLC_XFACE *Mac_rlc_xface;
extern uint8_t Is_rrc_registered;
extern eNB_ULSCH_INFO eNB_ulsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
extern eNB_DLSCH_INFO eNB_dlsch_info[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX]; // eNBxUE = 8x8
//#ifndef USER_MODE
//extern MAC_xface *mac_xface;
extern RRC_XFACE *Rrc_xface;
extern uint8_t Is_rrc_registered;
#ifndef PHY_EMUL
#ifndef PHYSIM
#define NB_INST 1
#else
extern unsigned char NB_INST;
#endif
extern unsigned char NB_eNB_INST;
extern unsigned char NB_UE_INST;
extern unsigned char NB_RN_INST;
extern unsigned short NODE_ID[1];
extern void* bigphys_malloc(int);
#else
extern EMULATION_VARS *Emul_vars;
#endif //PHY_EMUL
extern int cqi_to_mcs[16];
extern uint32_t RRC_CONNECTION_FLAG;
extern uint8_t rb_table[33];
extern DCI0_5MHz_TDD_1_6_t UL_alloc_pdu;
extern DCI1A_5MHz_TDD_1_6_t RA_alloc_pdu;
extern DCI1A_5MHz_TDD_1_6_t DLSCH_alloc_pdu1A;
extern DCI1A_5MHz_TDD_1_6_t BCCH_alloc_pdu;
extern DCI1A_5MHz_TDD_1_6_t CCCH_alloc_pdu;
extern DCI1_5MHz_TDD_t DLSCH_alloc_pdu;
extern DCI0_5MHz_FDD_t UL_alloc_pdu_fdd;
extern DCI1A_5MHz_FDD_t DLSCH_alloc_pdu1A_fdd;
extern DCI1A_5MHz_FDD_t RA_alloc_pdu_fdd;
extern DCI1A_5MHz_FDD_t BCCH_alloc_pdu_fdd;
extern DCI1A_5MHz_FDD_t CCCH_alloc_pdu_fdd;
extern DCI1_5MHz_FDD_t DLSCH_alloc_pdu_fdd;
extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu1;
extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
#endif //DEF_H
openair2/LAYER2/NR_MAC_UE/mac.h
View file @ 46d08aed
...@@ -19,21 +19,17 @@ ...@@ -19,21 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file LAYER2/MAC/defs.h /* \file mac.h
* \brief MAC data structures, constant, and function prototype * \brief MAC data structures, constant, and function prototype
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2011 * \date 2018
* \version 0.5 * \version 0.1
* \email navid.nikaein@eurecom.fr * \company Eurecom / NTUST
* \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
*/ * \note
/** @defgroup _oai2 openair2 Reference Implementation * \warning
* @ingroup _ref_implementation_
* @{
*/ */
/*@}*/
#ifndef __LAYER2_NR_UE_MAC_DEFS_H__ #ifndef __LAYER2_NR_UE_MAC_DEFS_H__
#define __LAYER2_NR_UE_MAC_DEFS_H__ #define __LAYER2_NR_UE_MAC_DEFS_H__
......
openair2/LAYER2/NR_MAC_UE/mac_defs.h
View file @ 46d08aed
...@@ -19,21 +19,17 @@ ...@@ -19,21 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file LAYER2/MAC/defs.h /* \file mac_defs.h
* \brief MAC data structures, constant, and function prototype * \brief MAC data structures, constant, and function prototype
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2011 * \date 2018
* \version 0.5 * \version 0.1
* \email navid.nikaein@eurecom.fr * \company Eurecom / NTUST
* \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
*/ * \note
/** @defgroup _oai2 openair2 Reference Implementation * \warning
* @ingroup _ref_implementation_
* @{
*/ */
/*@}*/
#ifndef __LAYER2_NR_MAC_DEFS_H__ #ifndef __LAYER2_NR_MAC_DEFS_H__
#define __LAYER2_NR_MAC_DEFS_H__ #define __LAYER2_NR_MAC_DEFS_H__
......
openair2/LAYER2/NR_MAC_UE/mac_vars.c
View file @ 46d08aed
...@@ -19,15 +19,16 @@ ...@@ -19,15 +19,16 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file vars.h /* \file vars.h
* \brief mac vars * \brief MAC Layer variables
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \version 1.0 * \version 0.1
* \email navid.nikaein@eurecom.fr * \company Eurecom / NTUST
* @ingroup _mac * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
*/ * \warning
*/
#include "mac_defs.h" #include "mac_defs.h"
......
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
View file @ 46d08aed
...@@ -19,14 +19,15 @@ ...@@ -19,14 +19,15 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file main.c /* \file main_ue_nr.c
* \brief top init of Layer 2 * \brief top init of Layer 2
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \version 1.0 * \version 0.1
* \email: navid.nikaein@eurecom.fr * \company Eurecom / NTUST
* @ingroup _mac * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
* \warning
*/ */
#include "defs.h" #include "defs.h"
......
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @ 46d08aed
...@@ -19,15 +19,17 @@ ...@@ -19,15 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file ue_procedures.c /* \file ue_procedures.c
* \brief procedures related to UE * \brief procedures related to UE
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \version 1 * \version 0.1
* \email: navid.nikaein@eurecom.fr * \company Eurecom / NTUST
* @ingroup _mac * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
* \warning
*/ */
#include "proto.h" #include "proto.h"
#include "RRC/NR_UE/rrc_proto.h" #include "RRC/NR_UE/rrc_proto.h"
......
openair2/LAYER2/NR_MAC_UE/proto.h
View file @ 46d08aed
...@@ -19,13 +19,17 @@ ...@@ -19,13 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file LAYER2/MAC/proto.h /* \file proto.h
* \brief MAC functions prototypes for eNB and UE * \brief MAC functions prototypes for eNB and UE
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \email navid.nikaein@eurecom.fr * \version 0.1
* \version 1.0 * \company Eurecom / NTUST
* \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
* \warning
*/ */
#ifndef __LAYER2_MAC_PROTO_H__ #ifndef __LAYER2_MAC_PROTO_H__
#define __LAYER2_MAC_PROTO_H__ #define __LAYER2_MAC_PROTO_H__
......
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
View file @ 46d08aed
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file NR_IF_Module.c /* \file NR_IF_Module.c
* \brief functions for NR UE FAPI-like interface * \brief functions for NR UE FAPI-like interface
* \author R. Knopp * \author R. Knopp, K.H. HSU
* \date 2018 * \date 2018
* \version 0.1 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note * \note
* \warning * \warning
*/ */
...@@ -102,7 +102,7 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id){ ...@@ -102,7 +102,7 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id){
memset((void*)nr_ue_if_module_inst[module_id],0,sizeof(nr_ue_if_module_t)); memset((void*)nr_ue_if_module_inst[module_id],0,sizeof(nr_ue_if_module_t));
nr_ue_if_module_inst[module_id]->CC_mask=0; nr_ue_if_module_inst[module_id]->CC_mask=0;
nr_ue_if_module_register_dl_indication(module_id, nr_ue_dl_indication); nr_ue_if_module_inst[module_id]->dl_indication = nr_ue_dl_indication;
} }
return nr_ue_if_module_inst[module_id]; return nr_ue_if_module_inst[module_id];
......
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
View file @ 46d08aed
...@@ -19,16 +19,17 @@ ...@@ -19,16 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file openair2/PHY_INTERFACE/IF_Module.h /* \file NR_IF_Module.h
* \brief data structures for PHY/MAC interface modules * \brief data structures for L1/L2 interface modules
* \author EURECOM/NTUST * \author R. Knopp, K.H. HSU
* \date 2018 * \date 2018
* \version 0.1 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: raymond.knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note * \note
* \warning * \warning
*/ */
#ifndef __NR_IF_MODULE_H__ #ifndef __NR_IF_MODULE_H__
#define __NR_IF_MODULE_H__ #define __NR_IF_MODULE_H__
......
openair2/RRC/NR_UE/L2_interface_ue.c
View file @ 46d08aed
...@@ -19,13 +19,15 @@ ...@@ -19,13 +19,15 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file l2_interface.c /* \file l2_interface_ue.c
* \brief layer 2 interface, used to support different RRC sublayer * \brief layer 2 interface, used to support different RRC sublayer
* \author Raymond Knopp and Navid Nikaein * \author R. Knopp, K.H. HSU
* \date 2010-2014 * \date 2018
* \version 1.0 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: raymond.knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
* \warning
*/ */
#include "rrc_defs.h" #include "rrc_defs.h"
......
openair2/RRC/NR_UE/main_ue.c
View file @ 46d08aed
/*
* 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_ue.c
* \brief RRC layer top level initialization
* \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 "defs.h" #include "defs.h"
#include "rrc_proto.h" #include "rrc_proto.h"
......
openair2/RRC/NR_UE/rrc_UE.c
View file @ 46d08aed
...@@ -19,13 +19,15 @@ ...@@ -19,13 +19,15 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file rrc_UE.c /* \file rrc_UE.c
* \brief rrc procedures for UE * \brief RRC procedures
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2011 - 2014 * \date 2018
* \version 1.0 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: navid.nikaein@eurecom.fr and raymond.knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
* \note
* \warning
*/ */
#define RRC_UE #define RRC_UE
......
openair2/RRC/NR_UE/rrc_defs.h
View file @ 46d08aed
...@@ -19,14 +19,16 @@ ...@@ -19,14 +19,16 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file RRC/LITE/defs.h /* \file rrc_defs.h
* \brief RRC struct definitions and function prototypes * \brief RRC structures/types definition
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \version 1.0 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: navid.nikaein@eurecom.fr, raymond.knopp@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
*/ * \note
* \warning
*/
#ifndef __OPENAIR_NR_RRC_DEFS_H__ #ifndef __OPENAIR_NR_RRC_DEFS_H__
#define __OPENAIR_NR_RRC_DEFS_H__ #define __OPENAIR_NR_RRC_DEFS_H__
......
openair2/RRC/NR_UE/rrc_list.h
View file @ 46d08aed
/*
* 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 rrc_list.h
* \brief linked list implementation for ToAddModList mechanism in RRC layer
* \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
*/
#ifndef _RRC_LIST_H_ #ifndef _RRC_LIST_H_
#define _RRC_LIST_H_ #define _RRC_LIST_H_
......
openair2/RRC/NR_UE/rrc_proto.h
View file @ 46d08aed
...@@ -19,17 +19,17 @@ ...@@ -19,17 +19,17 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file proto.h /* \file proto.h
* \brief RRC functions prototypes for eNB and UE * \brief RRC functions prototypes for eNB and UE
* \author Navid Nikaein and Raymond Knopp * \author R. Knopp, K.H. HSU
* \date 2010 - 2014 * \date 2018
* \email navid.nikaein@eurecom.fr * \version 0.1
* \version 1.0 * \company Eurecom / NTUST
* \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
*/ * \note
/** \addtogroup _rrc * \warning
* @{
*/ */
#ifndef _RRC_PROTO_H_ #ifndef _RRC_PROTO_H_
#define _RRC_PROTO_H_ #define _RRC_PROTO_H_
......
openair2/RRC/NR_UE/rrc_vars.h
View file @ 46d08aed
...@@ -19,14 +19,16 @@ ...@@ -19,14 +19,16 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
/*! \file vars.hles /* \file vars.h
* \brief rrc variables * \brief RRC layer variables
* \author Raymond Knopp and Navid Nikaein * \author R. Knopp, K.H. HSU
* \date 2013 * \date 2018
* \version 1.0 * \version 0.1
* \company Eurecom * \company Eurecom / NTUST
* \email: navid.nikaein@eurecom.fr * \email: knopp@eurecom.fr, kai-hsiang.hsu@eurecom.fr
*/ * \note
* \warning
*/
#ifndef __OPENAIR_NR_RRC_VARS_H__ #ifndef __OPENAIR_NR_RRC_VARS_H__
......
targets/RT/USER/nr-ue.c
View file @ 46d08aed
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all #undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
#include "fapi_nr_ue_l1.h"
#include "PHY/phy_extern_nr_ue.h" #include "PHY/phy_extern_nr_ue.h"
//#include "LAYER2/NR_MAC_UE/extern.h"
#include "LAYER2/NR_MAC_UE/proto.h" #include "LAYER2/NR_MAC_UE/proto.h"
#include "SCHED_NR/extern.h" #include "SCHED_NR/extern.h"
...@@ -220,6 +220,9 @@ void init_UE(int nb_inst) ...@@ -220,6 +220,9 @@ void init_UE(int nb_inst)
LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]); LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]);
PHY_vars_UE_g[inst][0] = init_nr_ue_vars(NULL,inst,0); PHY_vars_UE_g[inst][0] = init_nr_ue_vars(NULL,inst,0);
AssertFatal((UE->if_inst = IF_Module_init(inst)) != NULL,"Can't register interface module\n");
UE->if_inst->scheduled_response = nr_ue_scheduled_response;
UE->if_inst->phy_config_request = nr_ue_phy_config_request;
AssertFatal(0 == pthread_create(&UE->proc.pthread_ue, AssertFatal(0 == pthread_create(&UE->proc.pthread_ue,
&UE->proc.attr_ue, &UE->proc.attr_ue,
......
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