Skip to content

O
OpenXG-RAN
Commit 806234e8 authored by chenhsunyang0922's avatar chenhsunyang0922
Browse files
Options

delete PHY/defs_NB_IoT.h and modify defs_L1_NB_IoT.h

parent 7d88acc8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 1225 deletions
openair1/PHY/NBIoT_TRANSPORT/dlsch_demodulation_NB_IoT.c
View file @ 806234e8
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
//#include "PHY/defs.h" //#include "PHY/defs.h"
#include "PHY/extern_NB_IoT.h" #include "PHY/extern_NB_IoT.h"
#include "SCHED/defs_NB_IoT.h" #include "SCHED_NBIOT/defs_NB_IoT.h"
#include "defs_NB_IoT.h" #include "defs_NB_IoT.h"
#include "extern_NB_IoT.h" #include "extern_NB_IoT.h"
#include "PHY/sse_intrin.h" #include "PHY/sse_intrin.h"
......
openair1/PHY/NBIoT_TRANSPORT/dlsch_modulation_NB_IoT.c
View file @ 806234e8
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
//#include "PHY/defs.h" //#include "PHY/defs.h"
//#include "PHY/defs_NB_IoT.h" //#include "PHY/defs_NB_IoT.h"
//#include "PHY/extern_NB_IoT.h" //#include "PHY/extern_NB_IoT.h"
#include "PHY/impl_defs_lte.h" //#include "PHY/impl_defs_lte.h"
//#include "PHY/CODING/defs_nb_iot.h" //#include "PHY/CODING/defs_nb_iot.h"
//#include "PHY/CODING/extern.h" //#include "PHY/CODING/extern.h"
//#include "PHY/CODING/lte_interleaver_inline.h" //#include "PHY/CODING/lte_interleaver_inline.h"
#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h" #include "PHY/NBIoT_TRANSPORT/defs_NB_IoT.h"
#include "PHY/LTE_TRANSPORT/proto_NB_IoT.h" #include "PHY/NBIoT_TRANSPORT/proto_NB_IoT.h"
#include "PHY/impl_defs_lte_NB_IoT.h" #include "PHY/impl_defs_lte_NB_IoT.h"
#include "PHY/impl_defs_top_NB_IoT.h" #include "PHY/impl_defs_top_NB_IoT.h"
//#include "defs.h" //#include "defs.h"
......
openair1/PHY/NBIoT_TRANSPORT/proto_NB_IoT.h
View file @ 806234e8
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include "PHY/defs_NB_IoT.h" #include "PHY/defs_NB_IoT.h"
#include "PHY/impl_defs_lte.h" #include "PHY/impl_defs_lte.h"
#include "PHY/defs_eNB.h"
#include "PHY/defs_UE.h"
//#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h" //#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
//#include <math.h> //#include <math.h>
......
openair1/PHY/defs_L1_NB_IoT.h
View file @ 806234e8
...@@ -127,7 +127,9 @@ static inline void* malloc16_clear( size_t size ) ...@@ -127,7 +127,9 @@ static inline void* malloc16_clear( size_t size )
#include "PHY/impl_defs_lte_NB_IoT.h" #include "PHY/impl_defs_lte_NB_IoT.h"
#include "PHY/TOOLS/time_meas.h" #include "PHY/TOOLS/time_meas.h"
#include "PHY/TOOLS/time_meas_NB_IoT.h"
//#include "PHY/CODING/defs.h" //#include "PHY/CODING/defs.h"
#include "defs_common.h"
#include "PHY/CODING/defs_NB_IoT.h" #include "PHY/CODING/defs_NB_IoT.h"
#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" #include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
//#include "PHY/TOOLS/defs.h" //#include "PHY/TOOLS/defs.h"
...@@ -254,6 +256,8 @@ typedef struct { ...@@ -254,6 +256,8 @@ typedef struct {
/// Context data structure for RX/TX portion of subframe processing /// Context data structure for RX/TX portion of subframe processing
typedef struct { typedef struct {
/// Component Carrier index
uint8_t CC_id;
/// timestamp transmitted to HW /// timestamp transmitted to HW
openair0_timestamp timestamp_tx; openair0_timestamp timestamp_tx;
/// subframe to act upon for transmission /// subframe to act upon for transmission
...@@ -283,6 +287,21 @@ typedef struct { ...@@ -283,6 +287,21 @@ typedef struct {
pthread_mutex_t mutex_l2; pthread_mutex_t mutex_l2;
int instance_cnt_l2; int instance_cnt_l2;
pthread_attr_t attr_l2; pthread_attr_t attr_l2;
uint32_t frame_msg5;
uint32_t subframe_msg5;
int subframe_real;
uint8_t flag_scrambling;
uint8_t flag_msg3;
uint8_t counter_msg3;
uint32_t frame_msg3;
uint8_t flag_msg4;
uint8_t counter_msg4;
uint32_t frame_msg4;
uint32_t subframe_msg4;
uint8_t counter_msg5;
uint8_t flag_msg5;
uint32_t frame_dscr_msg5;
uint32_t subframe_dscr_msg5;
} eNB_rxtx_proc_NB_IoT_t; } eNB_rxtx_proc_NB_IoT_t;
/* /*
...@@ -303,6 +322,8 @@ typedef struct { ...@@ -303,6 +322,8 @@ typedef struct {
/// Context data structure for eNB subframe processing /// Context data structure for eNB subframe processing
typedef struct eNB_proc_NB_IoT_t_s { typedef struct eNB_proc_NB_IoT_t_s {
/// Component Carrier index
uint8_t CC_id;
/// thread index /// thread index
int thread_index; int thread_index;
/// timestamp received from HW /// timestamp received from HW
...@@ -448,6 +469,8 @@ typedef struct eNB_proc_NB_IoT_t_s { ...@@ -448,6 +469,8 @@ typedef struct eNB_proc_NB_IoT_t_s {
typedef struct { typedef struct {
/// index of the current UE RX/TX proc /// index of the current UE RX/TX proc
int proc_id; int proc_id;
/// Component Carrier index
uint8_t CC_id;
/// timestamp transmitted to HW /// timestamp transmitted to HW
openair0_timestamp timestamp_tx; openair0_timestamp timestamp_tx;
/// subframe to act upon for transmission /// subframe to act upon for transmission
...@@ -482,6 +505,8 @@ typedef struct { ...@@ -482,6 +505,8 @@ typedef struct {
/// Context data structure for eNB subframe processing /// Context data structure for eNB subframe processing
typedef struct { typedef struct {
/// Component Carrier index
uint8_t CC_id;
/// Last RX timestamp /// Last RX timestamp
openair0_timestamp timestamp_rx; openair0_timestamp timestamp_rx;
/// pthread attributes for main UE thread /// pthread attributes for main UE thread
...@@ -514,14 +539,19 @@ typedef struct { ...@@ -514,14 +539,19 @@ typedef struct {
typedef struct PHY_VARS_eNB_NB_IoT_s { typedef struct PHY_VARS_eNB_NB_IoT_s {
/// Module ID indicator for this instance /// Module ID indicator for this instance
module_id_t Mod_id; module_id_t Mod_id;
uint8_t CC_id;
uint8_t configured; uint8_t configured;
eNB_proc_NB_IoT_t proc; eNB_proc_NB_IoT_t proc;
int num_RU; int num_RU;
RU_t *RU_list[MAX_NUM_RU_PER_eNB]; RU_t *RU_list[MAX_NUM_RU_PER_eNB];
/// Ethernet parameters for northbound midhaul interface (L1 to Mac) /// Ethernet parameters for northbound midhaul interface (L1 to Mac)
eth_params_t eth_params_n; eth_params_t eth_params_n;
eNB_func_NB_IoT_t node_function;
eNB_timing_NB_IoT_t node_timing;
/// Ethernet parameters for fronthaul interface (upper L1 to Radio head) /// Ethernet parameters for fronthaul interface (upper L1 to Radio head)
eth_params_t eth_params; eth_params_t *eth_params;
int single_thread_flag; int single_thread_flag;
openair0_rf_map rf_map; openair0_rf_map rf_map;
int abstraction_flag; int abstraction_flag;
...@@ -533,7 +563,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s { ...@@ -533,7 +563,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
// indicator for precoding function (eNB,3GPP_eNB_BBU) // indicator for precoding function (eNB,3GPP_eNB_BBU)
int do_precoding; int do_precoding;
IF_Module_NB_IoT_t *if_inst_NB_IoT; IF_Module_NB_IoT_t *if_inst_NB_IoT;
UL_IND_NB_IoT_t UL_INFO_NB_IoT; UL_IND_NB_IoT_t UL_INFO;
pthread_mutex_t UL_INFO_mutex; pthread_mutex_t UL_INFO_mutex;
void (*do_prach)(struct PHY_VARS_eNB_NB_IoT_s *eNB,int frame,int subframe); void (*do_prach)(struct PHY_VARS_eNB_NB_IoT_s *eNB,int frame,int subframe);
void (*fep)(struct PHY_VARS_eNB_NB_IoT_s *eNB,eNB_rxtx_proc_NB_IoT_t *proc); void (*fep)(struct PHY_VARS_eNB_NB_IoT_s *eNB,eNB_rxtx_proc_NB_IoT_t *proc);
...@@ -782,6 +812,8 @@ typedef struct PHY_VARS_eNB_NB_IoT_s { ...@@ -782,6 +812,8 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
typedef struct { typedef struct {
/// \brief Module ID indicator for this instance /// \brief Module ID indicator for this instance
uint8_t Mod_id; uint8_t Mod_id;
/// \brief Component carrier ID for this PHY instance
uint8_t CC_id;
/// \brief Mapping of CC_id antennas to cards /// \brief Mapping of CC_id antennas to cards
openair0_rf_map rf_map; openair0_rf_map rf_map;
//uint8_t local_flag; //uint8_t local_flag;
......
openair1/PHY/defs_NB_IoT.h deleted 100644 → 0
View file @ 7d88acc8
This diff is collapsed.
openair1/PHY/defs_common.h
View file @ 806234e8
...@@ -784,6 +784,28 @@ typedef struct { ...@@ -784,6 +784,28 @@ typedef struct {
uint8_t RB_ID_NB_IoT; // to be used uint8_t RB_ID_NB_IoT; // to be used
uint8_t flag_free_sf; // flag to indicate for NPDSCH and NPDCCH process if the current SF already used uint8_t flag_free_sf; // flag to indicate for NPDSCH and NPDCCH process if the current SF already used
/// Frequency index of CBMIMO1 card
uint8_t freq_idx;
/// RX Frequency for ExpressMIMO/LIME
uint32_t carrier_freq[4];
/// TX Frequency for ExpressMIMO/LIME
uint32_t carrier_freqtx[4];
/// RX gain for ExpressMIMO/LIME
uint32_t rxgain[4];
/// TX gain for ExpressMIMO/LIME
uint32_t txgain[4];
/// RF mode for ExpressMIMO/LIME
uint32_t rfmode[4];
/// RF RX DC Calibration for ExpressMIMO/LIME
uint32_t rxdc[4];
/// RF TX DC Calibration for ExpressMIMO/LIME
uint32_t rflocal[4];
/// RF VCO calibration for ExpressMIMO/LIME
uint32_t rfvcolocal[4];
/// Turns on second TX of CBMIMO1 card
uint8_t dual_tx;
/// flag to indicate SISO transmission
uint8_t mode1_flag;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
} LTE_DL_FRAME_PARMS; } LTE_DL_FRAME_PARMS;
......
openair1/PHY/extern_NB_IoT.h
View file @ 806234e8
...@@ -34,7 +34,7 @@ extern char fmageren_name2[512]; ...@@ -34,7 +34,7 @@ extern char fmageren_name2[512];
extern unsigned int RX_DMA_BUFFER[4][NB_ANTENNAS_RX]; extern unsigned int RX_DMA_BUFFER[4][NB_ANTENNAS_RX];
extern unsigned int TX_DMA_BUFFER[4][NB_ANTENNAS_TX]; extern unsigned int TX_DMA_BUFFER[4][NB_ANTENNAS_TX];
*/ */
#include "PHY/LTE_TRANSPORT/extern_NB_IoT.h" #include "PHY/NBIoT_TRANSPORT/extern_NB_IoT.h"
//#include "SIMULATION/ETH_TRANSPORT/extern.h" //#include "SIMULATION/ETH_TRANSPORT/extern.h"
extern unsigned int DAQ_MBOX_NB_IoT; extern unsigned int DAQ_MBOX_NB_IoT;
......
openair2/COMMON/mac_rrc_primitives.h
View file @ 806234e8
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#endif #endif
#include "COMMON/platform_types.h" #include "COMMON/platform_types.h"
#include "COMMON/platform_constants.h" #include "COMMON/platform_constants.h"
#include "RRC/LTE/rrc_defs.h"
#include "LTE_RadioResourceConfigCommonSIB.h" #include "LTE_RadioResourceConfigCommonSIB.h"
#include "LTE_RadioResourceConfigDedicated.h" #include "LTE_RadioResourceConfigDedicated.h"
#include "LTE_MeasGapConfig.h" #include "LTE_MeasGapConfig.h"
......
openair2/ENB_APP/NB_IoT_config.c
View file @ 806234e8
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include "log.h" #include "common/utils/LOG/log.h"
#include "log_extern.h" #include "common/utils/LOG/log_extern.h"
#include "assertions.h" #include "assertions.h"
#include "intertask_interface.h" #include "intertask_interface.h"
#include "s1ap_eNB.h" #include "s1ap_eNB.h"
#include "sctp_eNB_task.h" #include "sctp_eNB_task.h"
#include "SystemInformationBlockType2.h" #include "LTE_SystemInformationBlockType2.h"
#include "PHY/phy_extern.h" #include "PHY/phy_extern.h"
#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h" #include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
......
openair2/ENB_APP/NB_IoT_paramdef.h
View file @ 806234e8
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
*/ */
#include "common/config/config_paramdesc.h" #include "common/config/config_paramdesc.h"
#include "SystemInformationBlockType2.h" #include "LTE_SystemInformationBlockType2.h"
#include "DL-GapConfig-NB-r13.h" #include "LTE_DL-GapConfig-NB-r13.h"
#include "NPRACH-Parameters-NB-r13.h" #include "LTE_NPRACH-Parameters-NB-r13.h"
#include "PowerRampingParameters.h" #include "LTE_PowerRampingParameters.h"
#include "BCCH-Config-NB-r13.h" #include "LTE_BCCH-Config-NB-r13.h"
#include "PCCH-Config-NB-r13.h" #include "LTE_PCCH-Config-NB-r13.h"
#include "ACK-NACK-NumRepetitions-NB-r13.h" #include "LTE_ACK-NACK-NumRepetitions-NB-r13.h"
#include "TDD-Config.h" #include "LTE_TDD-Config.h"
......
openair2/LAYER2/MAC/defs.h
View file @ 806234e8
...@@ -52,23 +52,23 @@ ...@@ -52,23 +52,23 @@
#include "PHY/defs.h" #include "PHY/defs.h"
#include "PHY/LTE_TRANSPORT/defs.h" #include "PHY/LTE_TRANSPORT/defs.h"
#include "COMMON/platform_constants.h" #include "COMMON/platform_constants.h"
#include "BCCH-BCH-Message.h" #include "LTE_BCCH-BCH-Message.h"
#include "RadioResourceConfigCommon.h" #include "LTE_RadioResourceConfigCommon.h"
#include "RadioResourceConfigDedicated.h" #include "LTE_RadioResourceConfigDedicated.h"
#include "MeasGapConfig.h" #include "LTE_MeasGapConfig.h"
#include "SchedulingInfoList.h" #include "LTE_SchedulingInfoList.h"
#include "TDD-Config.h" #include "LTE_TDD-Config.h"
#include "RACH-ConfigCommon.h" #include "LTE_RACH-ConfigCommon.h"
#include "MeasObjectToAddModList.h" #include "LTE_MeasObjectToAddModList.h"
#include "MobilityControlInfo.h" #include "LTE_MobilityControlInfo.h"
#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
#include "MBSFN-AreaInfoList-r9.h" #include "LTE_MBSFN-AreaInfoList-r9.h"
#include "MBSFN-SubframeConfigList.h" #include "LTE_MBSFN-SubframeConfigList.h"
#include "PMCH-InfoList-r9.h" #include "LTE_PMCH-InfoList-r9.h"
#include "SCellToAddMod-r10.h" #include "LTE_SCellToAddMod-r10.h"
#endif #endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#include "SystemInformationBlockType1-v1310-IEs.h" #include "LTE_SystemInformationBlockType1-v1310-IEs.h"
#endif #endif
#include "nfapi_interface.h" #include "nfapi_interface.h"
......
openair2/LAYER2/MAC/proto_NB_IoT.h
View file @ 806234e8
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef __LAYER2_MAC_PROTO_NB_IoT_H__ #ifndef __LAYER2_MAC_PROTO_NB_IoT_H__
#define __LAYER2_MAC_PROTO_NB_IoT_H__ #define __LAYER2_MAC_PROTO_NB_IoT_H__
#include "openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h" #include "openair1/PHY/NBIoT_TRANSPORT/defs_NB_IoT.h"
#include "LAYER2/MAC/defs_NB_IoT.h" #include "LAYER2/MAC/defs_NB_IoT.h"
#include "COMMON/platform_types.h" #include "COMMON/platform_types.h"
#include "openair2/RRC/NBIOT/defs_NB_IoT.h" #include "openair2/RRC/NBIOT/defs_NB_IoT.h"
...@@ -60,12 +60,12 @@ void config_mib_fapi_NB_IoT( ...@@ -60,12 +60,12 @@ void config_mib_fapi_NB_IoT(
int dl_CarrierFreq, int dl_CarrierFreq,
int ul_CarrierFreq, int ul_CarrierFreq,
long *eutraControlRegionSize, long *eutraControlRegionSize,
BCCH_BCH_Message_NB_t *mib_NB_IoT LTE_BCCH_BCH_Message_NB_t *mib_NB_IoT
); );
void config_sib2_fapi_NB_IoT( void config_sib2_fapi_NB_IoT(
int physCellId, int physCellId,
RadioResourceConfigCommonSIB_NB_r13_t *radioResourceConfigCommon LTE_RadioResourceConfigCommonSIB_NB_r13_t *radioResourceConfigCommon
); );
...@@ -75,10 +75,10 @@ void rrc_mac_config_req_NB_IoT( ...@@ -75,10 +75,10 @@ void rrc_mac_config_req_NB_IoT(
int CC_idP, int CC_idP,
int rntiP, int rntiP,
rrc_eNB_carrier_data_NB_IoT_t *carrier, rrc_eNB_carrier_data_NB_IoT_t *carrier,
SystemInformationBlockType1_NB_t *sib1_NB_IoT, LTE_SystemInformationBlockType1_NB_t *sib1_NB_IoT,
RadioResourceConfigCommonSIB_NB_r13_t *radioResourceConfigCommon, LTE_RadioResourceConfigCommonSIB_NB_r13_t *radioResourceConfigCommon,
PhysicalConfigDedicated_NB_r13_t *physicalConfigDedicated, LTE_PhysicalConfigDedicated_NB_r13_t *physicalConfigDedicated,
LogicalChannelConfig_NB_r13_t *logicalChannelConfig, //FIXME: decide how to use it LTE_LogicalChannelConfig_NB_r13_t *logicalChannelConfig, //FIXME: decide how to use it
uint8_t ded_flag, uint8_t ded_flag,
uint8_t ue_list_ded_num); uint8_t ue_list_ded_num);
......
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @ 806234e8
...@@ -82,15 +82,11 @@ hash_table_t *pdcp_coll_p = NULL; ...@@ -82,15 +82,11 @@ hash_table_t *pdcp_coll_p = NULL;
static int mbms_socket = -1; static int mbms_socket = -1;
#endif #endif
ccparams_NB_IoT_t NBconfig ;
memset((void *)&NBconfig,0,sizeof(ccparams_NB_IoT_t));
if (NBconfig.NB_IoT_configured > 0)
{
#include "openair2/RRC/NBIOT/proto_NB_IoT.h" #include "openair2/RRC/NBIOT/proto_NB_IoT.h"
#undef maxDRB #undef LTE_maxDRB
#define maxDRB maxDRB_NB_r13 #define LTE_maxDRB LTE_maxDRB_NB_r13
}
/* pdcp module parameters and related functions*/ /* pdcp module parameters and related functions*/
static pdcp_params_t pdcp_params= {0,NULL}; static pdcp_params_t pdcp_params= {0,NULL};
......
openair2/LAYER2/RLC/rlc_rrc.c
View file @ 806234e8
...@@ -150,18 +150,6 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP ...@@ -150,18 +150,6 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
&srb_toaddmod_p->rlc_Config->choice.explicitValue.choice.am, &srb_toaddmod_p->rlc_Config->choice.explicitValue.choice.am,
rb_id, lc_id); rb_id, lc_id);
} }
/****************************************config srb1bis for NB-IoT********************************************/
else if(NBconfig.NB_IoT_configured > 0)
{
if (rrc_rlc_add_rlc (ctxt_pP, SRB_FLAG_YES, MBMS_FLAG_NO, 3, 3, RLC_MODE_AM) != NULL) {
config_req_rlc_am_asn1 (
ctxt_pP,
SRB_FLAG_YES,
&srb_toaddmod_p->rlc_Config->choice.explicitValue.choice.am,
3, 3);
}
}
/************************************************************************************************************/
else { else {
LOG_E(RLC, PROTOCOL_CTXT_FMT" ERROR IN ALLOCATING SRB %d \n", LOG_E(RLC, PROTOCOL_CTXT_FMT" ERROR IN ALLOCATING SRB %d \n",
PROTOCOL_CTXT_ARGS(ctxt_pP), PROTOCOL_CTXT_ARGS(ctxt_pP),
......
openair2/PHY_INTERFACE/nfapi_interface.h
View file @ 806234e8
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define _NFAPI_INTERFACE_H_ #define _NFAPI_INTERFACE_H_
#include "stddef.h" #include "stddef.h"
#include "ACK-NACK-NumRepetitions-NB-r13.h" #include "LTE_ACK-NACK-NumRepetitions-NB-r13.h"
// Constants - update based on implementation // Constants - update based on implementation
#define NFAPI_MAX_PHY_RF_INSTANCES 2 #define NFAPI_MAX_PHY_RF_INSTANCES 2
......
openair2/RRC/NBIOT/MESSAGES/asn1_msg_NB_IoT.c
View file @ 806234e8
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <sysexits.h> /* for EX_* exit codes */ #include <sysexits.h> /* for EX_* exit codes */
#include <errno.h> /* for errno */ #include <errno.h> /* for errno */
#else #else
#include <linux/module.h> /* Needed by all modules */ //#include <linux/module.h> /* Needed by all modules */
#endif #endif
#ifdef USER_MODE #ifdef USER_MODE
//#include "RRC/NBIOT/defs.h" //#include "RRC/NBIOT/defs.h"
......
openair2/RRC/NBIOT/proto_NB_IoT.h
View file @ 806234e8
...@@ -167,9 +167,9 @@ int pdcp_apply_security_NB_IoT( ...@@ -167,9 +167,9 @@ int pdcp_apply_security_NB_IoT(
//defined in pdcp.c //defined in pdcp.c
boolean_t rrc_pdcp_config_asn1_req_NB_IoT ( boolean_t rrc_pdcp_config_asn1_req_NB_IoT (
const protocol_ctxt_t* const ctxt_pP, const protocol_ctxt_t* const ctxt_pP,
SRB_ToAddModList_NB_r13_t *const srb2add_list_pP, LTE_SRB_ToAddModList_NB_r13_t *const srb2add_list_pP,
DRB_ToAddModList_NB_r13_t *const drb2add_list_pP, LTE_DRB_ToAddModList_NB_r13_t *const drb2add_list_pP,
DRB_ToReleaseList_NB_r13_t *const drb2release_list_pP, LTE_DRB_ToReleaseList_NB_r13_t *const drb2release_list_pP,
const uint8_t security_modeP, const uint8_t security_modeP,
uint8_t *const kRRCenc_pP, uint8_t *const kRRCenc_pP,
uint8_t *const kRRCint_pP, uint8_t *const kRRCint_pP,
...@@ -238,9 +238,9 @@ void rrc_data_ind_NB_IoT( ...@@ -238,9 +238,9 @@ void rrc_data_ind_NB_IoT(
//defined in rlc_rrc.c //defined in rlc_rrc.c
rlc_op_status_t rrc_rlc_config_asn1_req_NB_IoT ( rlc_op_status_t rrc_rlc_config_asn1_req_NB_IoT (
const protocol_ctxt_t * const ctxt_pP, const protocol_ctxt_t * const ctxt_pP,
const SRB_ToAddModList_NB_r13_t * const srb2add_listP, const LTE_SRB_ToAddModList_NB_r13_t * const srb2add_listP,
const DRB_ToAddModList_NB_r13_t * const drb2add_listP, const LTE_DRB_ToAddModList_NB_r13_t * const drb2add_listP,
const DRB_ToReleaseList_NB_r13_t * const drb2release_listP, const LTE_DRB_ToReleaseList_NB_r13_t * const drb2release_listP,
srb1bis_flag_t srb1bis_flag srb1bis_flag_t srb1bis_flag
); );
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
...@@ -485,7 +485,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT( ...@@ -485,7 +485,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT(
void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT( void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
const protocol_ctxt_t* const ctxt_pP, const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_IoT_t* ue_context_pP, rrc_eNB_ue_context_NB_IoT_t* ue_context_pP,
RRCConnectionSetupComplete_NB_r13_IEs_t * rrcConnectionSetupComplete_NB LTE_RRCConnectionSetupComplete_NB_r13_IEs_t * rrcConnectionSetupComplete_NB
); );
void rrc_eNB_generate_SecurityModeCommand_NB_IoT( void rrc_eNB_generate_SecurityModeCommand_NB_IoT(
......
openair2/RRC/NBIOT/rrc_UE.c
View file @ 806234e8
...@@ -45,23 +45,23 @@ ...@@ -45,23 +45,23 @@
#ifndef CELLULAR #ifndef CELLULAR
#include "RRC/NBIOT/MESSAGES/asn1_msg.h" #include "RRC/NBIOT/MESSAGES/asn1_msg.h"
#endif #endif
#include "RRCConnectionRequest.h" #include "LTE_RRCConnectionRequest.h"
#include "RRCConnectionReconfiguration.h" #include "LTE_RRCConnectionReconfiguration.h"
#include "UL-CCCH-Message.h" #include "LTE_UL-CCCH-Message.h"
#include "DL-CCCH-Message.h" #include "LTE_DL-CCCH-Message.h"
#include "UL-DCCH-Message.h" #include "LTE_UL-DCCH-Message.h"
#include "DL-DCCH-Message.h" #include "LTE_DL-DCCH-Message.h"
#include "BCCH-DL-SCH-Message.h" #include "LTE_BCCH-DL-SCH-Message.h"
#include "PCCH-Message.h" #include "LTE_PCCH-Message.h"
#if defined(Rel10) || defined(Rel14) #if defined(Rel10) || defined(Rel14)
#include "MCCH-Message.h" #include "LTE_MCCH-Message.h"
#endif #endif
#include "MeasConfig.h" #include "LTE_MeasConfig.h"
#include "MeasGapConfig.h" #include "LTE_MeasGapConfig.h"
#include "MeasObjectEUTRA.h" #include "LTE_MeasObjectEUTRA.h"
#include "TDD-Config.h" #include "LTE_TDD-Config.h"
#include "UECapabilityEnquiry.h" #include "LTE_UECapabilityEnquiry.h"
#include "UE-CapabilityRequest.h" #include "LTE_UE-CapabilityRequest.h"
#ifdef PHY_ABSTRACTION #ifdef PHY_ABSTRACTION
#include "OCG.h" #include "OCG.h"
#include "OCG_extern.h" #include "OCG_extern.h"
......
openair2/RRC/NBIOT/rrc_eNB.c
View file @ 806234e8
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
#include "extern_NB_IoT.h" #include "extern_NB_IoT.h"
#include "LAYER2/MAC/proto_NB_IoT.h" #include "LAYER2/MAC/proto_NB_IoT.h"
#include "RRC/NBIOT/MESSAGES/asn1_msg_NB_IoT.h" #include "RRC/NBIOT/MESSAGES/asn1_msg_NB_IoT.h"
#include "RRCConnectionRequest-NB.h" #include "LTE_RRCConnectionRequest-NB.h"
#include "UL-CCCH-Message-NB.h" #include "LTE_UL-CCCH-Message-NB.h"
/***************************/ /***************************/
//#include "DL-CCCH-Message-NB.h" //#include "DL-CCCH-Message-NB.h"
#include "UL-DCCH-Message-NB.h" #include "LTE_UL-DCCH-Message-NB.h"
//#include "DL-DCCH-Message-NB.h" //#include "DL-DCCH-Message-NB.h"
//#include "SRB-ToAddMod-NB-r13.h" //#include "SRB-ToAddMod-NB-r13.h"
/***************************/ /***************************/
...@@ -58,14 +58,14 @@ ...@@ -58,14 +58,14 @@
#include "UTIL/LOG/log.h" #include "UTIL/LOG/log.h"
#include "COMMON/mac_rrc_primitives.h" #include "COMMON/mac_rrc_primitives.h"
#include "RRC/NBIOT/MESSAGES/asn1_msg.h" #include "RRC/NBIOT/MESSAGES/asn1_msg.h"
#include "RRCConnectionRequest.h" #include "LTE_RRCConnectionRequest.h"
#include "RRCConnectionReestablishmentRequest.h" #include "LTE_RRCConnectionReestablishmentRequest.h"
//#include "ReestablishmentCause.h" //#include "ReestablishmentCause.h"
#include "UL-CCCH-Message.h" #include "LTE_UL-CCCH-Message.h"
#include "DL-CCCH-Message.h" #include "LTE_DL-CCCH-Message.h"
#include "UL-DCCH-Message.h" #include "LTE_UL-DCCH-Message.h"
#include "DL-DCCH-Message.h" #include "LTE_DL-DCCH-Message.h"
#include "TDD-Config.h" #include "LTE_TDD-Config.h"
#include "HandoverCommand.h" #include "HandoverCommand.h"
#include "rlc.h" #include "rlc.h"
#include "SIMULATION/ETH_TRANSPORT/extern.h" #include "SIMULATION/ETH_TRANSPORT/extern.h"
......
openair3/TEST/EPC_TEST/generate_scenario.h
View file @ 806234e8
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "platform_constants.h" #include "platform_constants.h"
#include "PHY/impl_defs_lte.h" #include "PHY/impl_defs_lte.h"
#include "s1ap_messages_types.h" #include "s1ap_messages_types.h"
#include "SystemInformationBlockType2.h" #include "LTE_SystemInformationBlockType2.h"
#define IPV4_STR_ADDR_TO_INT_NWBO(AdDr_StR,NwBo,MeSsAgE ) do {\ #define IPV4_STR_ADDR_TO_INT_NWBO(AdDr_StR,NwBo,MeSsAgE ) do {\
struct in_addr inp;\ struct in_addr inp;\
......
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