maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing errored/missing circular dependency protection

Browse Source 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2020-05-15 15:39:11 +02:00
parent e376241a82
commit 11783e755a
56 changed files with 226 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/ENB_APP/L1_paramdef.h
+4
View File
@@ -30,6 +30,8 @@
* \warning
*/
#ifndef __ENB_APP_L1_PARAMDEF__H__
#define __ENB_APP_L1_PARAMDEF__H__
/*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -114,3 +116,5 @@
#define L1_PUCCH1_DTX_EMTC3_THRESHOLD_IDX 22
#define L1_PUCCH1AB_DTX_EMTC3_THRESHOLD_IDX 23
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
openair2/ENB_APP/MACRLC_paramdef.h
+4
View File
@@ -31,6 +31,8 @@
*/
#ifndef __ENB_APP_MACRLC_PARAMDEF__H__
#define __ENB_APP_MACRLC_PARAMDEF__H__
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -104,3 +106,5 @@
#define MACRLC_PUSCH10xSNR_IDX 18
#define MACRLC_PUCCH10xSNR_IDX 19
/*---------------------------------------------------------------------------------------------------------------------------------------------------------*/
#endif
openair2/ENB_APP/NB_IoT_paramdef.h
+5
View File
@@ -30,6 +30,9 @@
* \warning
*/
#ifndef __ENB_APP_NB_IOT_PARAMDEF__H__
#define __ENB_APP_NB_IOT_PARAMDEF__H__
#include "common/config/config_paramdesc.h"
#include "SystemInformationBlockType2.h"
#include "DL-GapConfig-NB-r13.h"
@@ -398,3 +401,5 @@
/*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/* NB IoT L1 configuration list section name */
#define NBIOT_L1LIST_CONFIG_STRING "NB-IoT_L1s"
#endif
openair2/ENB_APP/enb_paramdef_emtc.h
+5
View File
@@ -30,6 +30,9 @@
* \warning
*/
#ifndef __ENB_APP_ENB_PARAMDEF_EMTC__H__
#define __ENB_APP_ENB_PARAMDEF_EMTC__H__
#include "common/config/config_paramdesc.h"
#include "RRC_paramsvalues.h"
@@ -405,3 +408,5 @@ typedef struct ccparams_eMTC_s {
{"sib2_interval_ULHoppingConfigCommonModeB_r13_val", NULL, 0, iptr:&eMTCconfig->sib2_interval_ULHoppingConfigCommonModeB_r13_val, defintval:0, TYPE_UINT, 0}, \
{"sib2_mpdcch_pdsch_hoppingOffset_r13", NULL, 0, iptr:&eMTCconfig->sib2_mpdcch_pdsch_hoppingOffset_r13, defintval:1, TYPE_UINT, 0} \
}
#endif
openair2/ENB_APP/enb_paramdef_mce.h
+4 -2
View File
@@ -30,6 +30,9 @@
* \warning
*/
#ifndef __ENB_APP_ENB_PARAMDEF_MCE__H__
#define __ENB_APP_ENB_PARAMDEF_MCE__H__
#include "common/config/config_paramdesc.h"
#include "RRC_paramsvalues.h"
@@ -235,5 +238,4 @@
#define MCE_CONFIG_STRING_NUM_FRAME_IDX 2
#define MCE_CONFIG_STRING_SUBFRAME_ALLOCATION_IDX 3
#endif
openair2/ENB_APP/enb_paramdef_mme.h
+4 -3
View File
@@ -30,6 +30,9 @@
* \warning
*/
#ifndef __ENB_APP_ENB_PARAMDEF_MME__H__
#define __ENB_APP_ENB_PARAMDEF_MME__H__
#include "common/config/config_paramdesc.h"
#include "RRC_paramsvalues.h"
@@ -77,6 +80,4 @@
{MME_CONFIG_STRING_MME_PORT_FOR_M3C, NULL, 0, uptr:&mme_port_for_m3c, defintval:36444L, TYPE_UINT, 0}, \
}
#endif