Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZhouShuya
OpenXG-RAN
Commits
4dd74fbd
Commit
4dd74fbd
authored
Aug 08, 2018
by
WEI-TAI CHEN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upata the loss config
parent
b9037d15
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
108 additions
and
84 deletions
+108
-84
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+1
-0
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+29
-5
openair2/GNB_APP/gnb_config.h
openair2/GNB_APP/gnb_config.h
+1
-1
openair2/GNB_APP/gnb_paramdef.h
openair2/GNB_APP/gnb_paramdef.h
+74
-77
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
+3
-1
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
4dd74fbd
...
@@ -359,6 +359,7 @@ typedef struct NRRrcConfigurationReq_s {
...
@@ -359,6 +359,7 @@ typedef struct NRRrcConfigurationReq_s {
long
UL_BWP_SubcarrierSpacing
[
MAX_NUM_CCs
];
long
UL_BWP_SubcarrierSpacing
[
MAX_NUM_CCs
];
lte_prefix_type_t
UL_BWP_prefix_type
[
MAX_NUM_CCs
];
lte_prefix_type_t
UL_BWP_prefix_type
[
MAX_NUM_CCs
];
long
UL_timeAlignmentTimerCommon
[
MAX_NUM_CCs
];
long
UL_timeAlignmentTimerCommon
[
MAX_NUM_CCs
];
long
ServingCellConfigCommon_n_TimingAdvanceOffset
[
MAX_NUM_CCs
];
long
ServingCellConfigCommon_ssb_PositionsInBurst_PR
[
MAX_NUM_CCs
];
long
ServingCellConfigCommon_ssb_PositionsInBurst_PR
[
MAX_NUM_CCs
];
long
ServingCellConfigCommon_ssb_periodicityServingCell
[
MAX_NUM_CCs
];
//ServingCellConfigCommon
long
ServingCellConfigCommon_ssb_periodicityServingCell
[
MAX_NUM_CCs
];
//ServingCellConfigCommon
long
ServingCellConfigCommon_dmrs_TypeA_Position
[
MAX_NUM_CCs
];
//ServingCellConfigCommon
long
ServingCellConfigCommon_dmrs_TypeA_Position
[
MAX_NUM_CCs
];
//ServingCellConfigCommon
...
...
openair2/GNB_APP/gnb_config.c
View file @
4dd74fbd
...
@@ -82,6 +82,7 @@ void RCconfig_nr_flexran()
...
@@ -82,6 +82,7 @@ void RCconfig_nr_flexran()
*
DL_SCS_SubcarrierSpacing
,
*
DL_BWP_SubcarrierSpacing
,
*
DL_BWP_prefix_type
,
*
DL_SCS_SubcarrierSpacing
,
*
DL_BWP_SubcarrierSpacing
,
*
DL_BWP_prefix_type
,
*
UL_frequencyShift7p5khz
,
*
UL_SCS_SubcarrierSpacing
,
*
UL_BWP_SubcarrierSpacing
,
*
UL_frequencyShift7p5khz
,
*
UL_SCS_SubcarrierSpacing
,
*
UL_BWP_SubcarrierSpacing
,
*
UL_BWP_prefix_type
,
*
UL_timeAlignmentTimerCommon
,
*
UL_BWP_prefix_type
,
*
UL_timeAlignmentTimerCommon
,
*
ServingCellConfigCommon_n_TimingAdvanceOffset
,
*
ServingCellConfigCommon_ssb_PositionsInBurst_PR
,
*
ServingCellConfigCommon_ssb_PositionsInBurst_PR
,
*
NIA_SubcarrierSpacing
,
*
referenceSubcarrierSpacing
,
*
dl_UL_TransmissionPeriodicity
,
*
NIA_SubcarrierSpacing
,
*
referenceSubcarrierSpacing
,
*
dl_UL_TransmissionPeriodicity
,
*
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice
,
*
rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice
,
...
@@ -126,6 +127,7 @@ void RCconfig_nr_flexran()
...
@@ -126,6 +127,7 @@ void RCconfig_nr_flexran()
PUSCH_TimeDomainResourceAllocation_k2
,
PUSCH_TimeDomainResourceAllocation_k2
,
PUSCH_TimeDomainResourceAllocation_startSymbolAndLength
,
PUSCH_TimeDomainResourceAllocation_startSymbolAndLength
,
pucch_ResourceCommon
,
hoppingId
,
p0_nominal
,
PDSCH_TimeDomainResourceAllocation_k0
,
pucch_ResourceCommon
,
hoppingId
,
p0_nominal
,
PDSCH_TimeDomainResourceAllocation_k0
,
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
,
rateMatchPatternId
,
periodicityAndPattern
,
RateMatchPattern_controlResourceSet
,
rateMatchPatternId
,
periodicityAndPattern
,
RateMatchPattern_controlResourceSet
,
controlResourceSetZero
,
searchSpaceZero
,
controlResourceSetZero
,
searchSpaceZero
,
searchSpaceSIB1
,
searchSpaceOtherSystemInformation
,
pagingSearchSpace
,
searchSpaceSIB1
,
searchSpaceOtherSystemInformation
,
pagingSearchSpace
,
...
@@ -397,7 +399,7 @@ void RCconfig_nr_macrlc() {
...
@@ -397,7 +399,7 @@ void RCconfig_nr_macrlc() {
}
}
int
RCconfig_NRRRC
(
MessageDef
*
msg_p
,
uint32_t
i
,
gNB_RRC_INST
*
rrc
)
{
void
RCconfig_NRRRC
(
MessageDef
*
msg_p
,
uint32_t
i
,
gNB_RRC_INST
*
rrc
)
{
int
num_gnbs
=
0
;
int
num_gnbs
=
0
;
int
num_component_carriers
=
0
;
int
num_component_carriers
=
0
;
...
@@ -461,7 +463,7 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -461,7 +463,7 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
char
*
UL_BWP_prefix_type
=
NULL
;
char
*
UL_BWP_prefix_type
=
NULL
;
char
*
UL_timeAlignmentTimerCommon
=
0
;
char
*
UL_timeAlignmentTimerCommon
=
0
;
int32_t
ServingCellConfigCommon_n_TimingAdvanceOffset
=
0
;
char
*
ServingCellConfigCommon_n_TimingAdvanceOffset
=
0
;
char
*
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
;
char
*
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
;
int32_t
ServingCellConfigCommon_ssb_periodicityServingCell
=
0
;
int32_t
ServingCellConfigCommon_ssb_periodicityServingCell
=
0
;
int32_t
ServingCellConfigCommon_dmrs_TypeA_Position
=
0
;
int32_t
ServingCellConfigCommon_dmrs_TypeA_Position
=
0
;
...
@@ -591,14 +593,14 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -591,14 +593,14 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
int32_t
RateMatchPatternLTE_CRS_radioframeAllocationPeriod
=
0
;
int32_t
RateMatchPatternLTE_CRS_radioframeAllocationPeriod
=
0
;
int32_t
RateMatchPatternLTE_CRS_radioframeAllocationOffset
=
0
;
int32_t
RateMatchPatternLTE_CRS_radioframeAllocationOffset
=
0
;
char
*
RateMatchPatternLTE_CRS_subframeAllocation_choice
=
NULL
;
char
*
RateMatchPatternLTE_CRS_subframeAllocation_choice
=
NULL
;
/*
int32_t srb1_timer_poll_retransmit = 0;
int32_t srb1_timer_poll_retransmit = 0;
int32_t srb1_timer_reordering = 0;
int32_t srb1_timer_reordering = 0;
int32_t srb1_timer_status_prohibit = 0;
int32_t srb1_timer_status_prohibit = 0;
int32_t srb1_poll_pdu = 0;
int32_t srb1_poll_pdu = 0;
int32_t srb1_poll_byte = 0;
int32_t srb1_poll_byte = 0;
int32_t srb1_max_retx_threshold = 0;
int32_t srb1_max_retx_threshold = 0;
*/
//int32_t my_int;
//int32_t my_int;
paramdef_t
GNBSParams
[]
=
GNBSPARAMS_DESC
;
paramdef_t
GNBSParams
[]
=
GNBSPARAMS_DESC
;
...
@@ -610,7 +612,12 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -610,7 +612,12 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
paramdef_t
CCsParams
[]
=
NRCCPARAMS_DESC
;
paramdef_t
CCsParams
[]
=
NRCCPARAMS_DESC
;
paramlist_def_t
CCsParamList
=
{
GNB_CONFIG_STRING_COMPONENT_CARRIERS
,
NULL
,
0
};
paramlist_def_t
CCsParamList
=
{
GNB_CONFIG_STRING_COMPONENT_CARRIERS
,
NULL
,
0
};
paramdef_t
SRB1Params
[]
=
SRB1PARAMS_DESC
;
//paramdef_t SRB1Params[] = SRB1PARAMS_DESC;
/* map parameter checking array instances to parameter definition array instances */
for
(
int
I
=
0
;
I
<
(
sizeof
(
CCsParams
)
/
sizeof
(
paramdef_t
));
I
++
)
{
CCsParams
[
I
].
chkPptr
=
&
(
config_check_CCparams
[
I
]);
}
/* get global parameters, defined outside any section in the config file */
/* get global parameters, defined outside any section in the config file */
...
@@ -1058,6 +1065,17 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -1058,6 +1065,17 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
RC
.
config_file_name
,
i
,
UL_timeAlignmentTimerCommon
);
RC
.
config_file_name
,
i
,
UL_timeAlignmentTimerCommon
);
}
}
if
(
strcmp
(
ServingCellConfigCommon_n_TimingAdvanceOffset
,
"n0"
)
==
0
)
{
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ServingCellConfigCommon_n_TimingAdvanceOffset
[
j
]
=
NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n0
;
}
else
if
(
strcmp
(
ServingCellConfigCommon_n_TimingAdvanceOffset
,
"n25600"
)
==
0
)
{
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ServingCellConfigCommon_n_TimingAdvanceOffset
[
j
]
=
NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n25600
;
}
else
if
(
strcmp
(
ServingCellConfigCommon_n_TimingAdvanceOffset
,
"n39936"
)
==
0
)
{
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ServingCellConfigCommon_n_TimingAdvanceOffset
[
j
]
=
NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n39936
;
}
else
{
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%s
\"
for ServingCellConfigCommon_n_TimingAdvanceOffset choice n0,n25600,n39936!
\n
"
,
RC
.
config_file_name
,
i
,
ServingCellConfigCommon_n_TimingAdvanceOffset
);
}
if
(
strcmp
(
ServingCellConfigCommon_ssb_PositionsInBurst_PR
,
"shortBitmap"
)
==
0
)
{
if
(
strcmp
(
ServingCellConfigCommon_ssb_PositionsInBurst_PR
,
"shortBitmap"
)
==
0
)
{
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ServingCellConfigCommon_ssb_PositionsInBurst_PR
[
j
]
=
NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_shortBitmap
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ServingCellConfigCommon_ssb_PositionsInBurst_PR
[
j
]
=
NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_shortBitmap
;
}
else
if
(
strcmp
(
ServingCellConfigCommon_ssb_PositionsInBurst_PR
,
"mediumBitmap"
)
==
0
)
{
}
else
if
(
strcmp
(
ServingCellConfigCommon_ssb_PositionsInBurst_PR
,
"mediumBitmap"
)
==
0
)
{
...
@@ -1865,6 +1883,12 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -1865,6 +1883,12 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
RC
.
config_file_name
,
i
,
PDSCH_TimeDomainResourceAllocation_mappingType
);
RC
.
config_file_name
,
i
,
PDSCH_TimeDomainResourceAllocation_mappingType
);
}
}
NRRRC_CONFIGURATION_REQ
(
msg_p
).
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
[
j
]
=
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
;
if
((
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
<
0
)
||
(
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
>
127
)){
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%d
\"
for PDSCH_TimeDomainResourceAllocation_startSymbolAndLength choice: 0..127 !
\n
"
,
RC
.
config_file_name
,
i
,
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
);
}
//////////////////////////////////NR RateMatchPattern///////////////////////////
//////////////////////////////////NR RateMatchPattern///////////////////////////
NRRRC_CONFIGURATION_REQ
(
msg_p
).
rateMatchPatternId
[
j
]
=
rateMatchPatternId
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
rateMatchPatternId
[
j
]
=
rateMatchPatternId
;
if
((
rateMatchPatternId
<
0
)
||
(
rateMatchPatternId
>
3
)){
if
((
rateMatchPatternId
<
0
)
||
(
rateMatchPatternId
>
3
)){
...
...
openair2/GNB_APP/gnb_config.h
View file @
4dd74fbd
...
@@ -101,7 +101,7 @@ extern void NRRCConfig(void);
...
@@ -101,7 +101,7 @@ extern void NRRCConfig(void);
//void enb_config_display(void);
//void enb_config_display(void);
//void ru_config_display(void);
//void ru_config_display(void);
int
RCconfig_NRRRC
(
MessageDef
*
msg_p
,
uint32_t
i
,
gNB_RRC_INST
*
rrc
);
void
RCconfig_NRRRC
(
MessageDef
*
msg_p
,
uint32_t
i
,
gNB_RRC_INST
*
rrc
);
int
RCconfig_NR_S1
(
MessageDef
*
msg_p
,
uint32_t
i
);
int
RCconfig_NR_S1
(
MessageDef
*
msg_p
,
uint32_t
i
);
#endif
/* GNB_CONFIG_H_ */
#endif
/* GNB_CONFIG_H_ */
...
...
openair2/GNB_APP/gnb_paramdef.h
View file @
4dd74fbd
...
@@ -270,6 +270,7 @@ typedef enum {
...
@@ -270,6 +270,7 @@ typedef enum {
#define GNB_CONFIG_STRING_UL_BWP_PREFIX_TYPE "UL_BWP_prefix_type"
#define GNB_CONFIG_STRING_UL_BWP_PREFIX_TYPE "UL_BWP_prefix_type"
#define GNB_CONFIG_STRING_UL_TIMEALIGNMENTTIMERCOMMON "UL_timeAlignmentTimerCommon"
#define GNB_CONFIG_STRING_UL_TIMEALIGNMENTTIMERCOMMON "UL_timeAlignmentTimerCommon"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_N_TIMINGADVANCEOFFSET "ServingCellConfigCommon_n_TimingAdvanceOffset"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_POSITIONSINBURST_PR "ServingCellConfigCommon_ssb_PositionsInBurst_PR"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_POSITIONSINBURST_PR "ServingCellConfigCommon_ssb_PositionsInBurst_PR"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_PERIODICITYSERVINGCELL "ServingCellConfigCommon_ssb_periodicityServingCell"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_PERIODICITYSERVINGCELL "ServingCellConfigCommon_ssb_periodicityServingCell"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_DMRS_TYPEA_POSITION "ServingCellConfigCommon_dmrs_TypeA_Position"
#define GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_DMRS_TYPEA_POSITION "ServingCellConfigCommon_dmrs_TypeA_Position"
...
@@ -341,7 +342,7 @@ typedef enum {
...
@@ -341,7 +342,7 @@ typedef enum {
//PDSCH-TIMEDOMAINRESOURCEALLOCATION
//PDSCH-TIMEDOMAINRESOURCEALLOCATION
#define GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_K0 "PDSCH_TimeDomainResourceAllocation_k0"
#define GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_K0 "PDSCH_TimeDomainResourceAllocation_k0"
#define GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE "PDSCH_TimeDomainResourceAllocation_mappingType"
#define GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE "PDSCH_TimeDomainResourceAllocation_mappingType"
#define GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_STARTSYMBOLANDLENGTH "PDSCH_TimeDomainResourceAllocation_startSymbolAndLength"
//RATEMATCHPATTERN IS USED TO CONFIGURE ONE RATE MATCHING PATTERN FOR PDSCH
//RATEMATCHPATTERN IS USED TO CONFIGURE ONE RATE MATCHING PATTERN FOR PDSCH
#define GNB_CONFIG_STRING_RATEMATCHPATTERNID "rateMatchPatternId"
#define GNB_CONFIG_STRING_RATEMATCHPATTERNID "rateMatchPatternId"
#define GNB_CONFIG_STRING_RATEMATCHPATTERN_PATTERNTYPE "RateMatchPattern_patternType"
#define GNB_CONFIG_STRING_RATEMATCHPATTERN_PATTERNTYPE "RateMatchPattern_patternType"
...
@@ -400,15 +401,7 @@ typedef enum {
...
@@ -400,15 +401,7 @@ typedef enum {
/* init for checkedparam_t structure */
/* init for checkedparam_t structure */
#define NRCCPARAMS_CHECK { \
#define NRCCPARAMS_CHECK { \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
{ .s5= {NULL }} , \
...
@@ -596,6 +589,7 @@ typedef enum {
...
@@ -596,6 +589,7 @@ typedef enum {
{GNB_CONFIG_STRING_UL_BWP_SUBCARRIERSPACING, NULL, 0, strptr:&UL_BWP_SubcarrierSpacing, defstrval:"kHz15", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_UL_BWP_SUBCARRIERSPACING, NULL, 0, strptr:&UL_BWP_SubcarrierSpacing, defstrval:"kHz15", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_UL_BWP_PREFIX_TYPE, NULL, 0, strptr:&UL_BWP_prefix_type, defstrval:"NORMAL", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_UL_BWP_PREFIX_TYPE, NULL, 0, strptr:&UL_BWP_prefix_type, defstrval:"NORMAL", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_UL_TIMEALIGNMENTTIMERCOMMON, NULL, 0, strptr:&UL_timeAlignmentTimerCommon, defstrval:"infinity", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_UL_TIMEALIGNMENTTIMERCOMMON, NULL, 0, strptr:&UL_timeAlignmentTimerCommon, defstrval:"infinity", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_N_TIMINGADVANCEOFFSET, NULL, 0, strptr:&ServingCellConfigCommon_n_TimingAdvanceOffset, defstrval:"n0", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_POSITIONSINBURST_PR, NULL, 0, strptr:&ServingCellConfigCommon_ssb_PositionsInBurst_PR, defstrval:"shortBitmap", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_POSITIONSINBURST_PR, NULL, 0, strptr:&ServingCellConfigCommon_ssb_PositionsInBurst_PR, defstrval:"shortBitmap", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_PERIODICITYSERVINGCELL, NULL, 0, iptr:&ServingCellConfigCommon_ssb_periodicityServingCell, defintval:10, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_SSB_PERIODICITYSERVINGCELL, NULL, 0, iptr:&ServingCellConfigCommon_ssb_periodicityServingCell, defintval:10, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_DMRS_TYPEA_POSITION, NULL, 0, iptr:&ServingCellConfigCommon_dmrs_TypeA_Position, defintval:0, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_SERVINGCELLCONFIGCOMMON_DMRS_TYPEA_POSITION, NULL, 0, iptr:&ServingCellConfigCommon_dmrs_TypeA_Position, defintval:0, TYPE_UINT, 0}, \
...
@@ -650,6 +644,7 @@ typedef enum {
...
@@ -650,6 +644,7 @@ typedef enum {
{GNB_CONFIG_STRING_P0_NOMINAL, NULL, 0, iptr:&p0_nominal, defintval:-30, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_P0_NOMINAL, NULL, 0, iptr:&p0_nominal, defintval:-30, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_K0, NULL, 0, iptr:&PDSCH_TimeDomainResourceAllocation_k0, defintval:2, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_K0, NULL, 0, iptr:&PDSCH_TimeDomainResourceAllocation_k0, defintval:2, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE, NULL, 0, strptr:&PDSCH_TimeDomainResourceAllocation_mappingType, defstrval:"typeA", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE, NULL, 0, strptr:&PDSCH_TimeDomainResourceAllocation_mappingType, defstrval:"typeA", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_PDSCH_TIMEDOMAINRESOURCEALLOCATION_STARTSYMBOLANDLENGTH, NULL, 0, iptr:&PDSCH_TimeDomainResourceAllocation_startSymbolAndLength, defintval:0, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_RATEMATCHPATTERNID, NULL, 0, iptr:&rateMatchPatternId, defintval:0, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_RATEMATCHPATTERNID, NULL, 0, iptr:&rateMatchPatternId, defintval:0, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_RATEMATCHPATTERN_PATTERNTYPE, NULL, 0, strptr:&RateMatchPattern_patternType, defstrval:"bitmaps", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_RATEMATCHPATTERN_PATTERNTYPE, NULL, 0, strptr:&RateMatchPattern_patternType, defstrval:"bitmaps", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_SYMBOLSINRESOURCEBLOCK, NULL, 0, strptr:&symbolsInResourceBlock, defstrval:"oneSlot", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_SYMBOLSINRESOURCEBLOCK, NULL, 0, strptr:&symbolsInResourceBlock, defstrval:"oneSlot", TYPE_STRING, 0}, \
...
@@ -743,8 +738,9 @@ typedef enum {
...
@@ -743,8 +738,9 @@ typedef enum {
#define GNB_CONFIG_UL_LOCATIONANDBANDWIDTH_IDX 41
#define GNB_CONFIG_UL_LOCATIONANDBANDWIDTH_IDX 41
#define GNB_CONFIG_UL_BWP_SUBCARRIERSPACING_IDX 42
#define GNB_CONFIG_UL_BWP_SUBCARRIERSPACING_IDX 42
#define GNB_CONFIG_UL_BWP_PREFIX_TYPE_IDX 43
#define GNB_CONFIG_UL_BWP_PREFIX_TYPE_IDX 43
#define GNB_CONFIG_TIMEALIGNMENTTIMERCOMMON_IDX
#define GNB_CONFIG_TIMEALIGNMENTTIMERCOMMON_IDX 44
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_SSB_POSITIONSINBURST_PR_IDX 44
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_N_TIMINGADVANCEOFFSET_IDX
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_SSB_POSITIONSINBURST_PR_IDX 45
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_SSB_PERIODICITYSERVINGCELL_IDX 46
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_SSB_PERIODICITYSERVINGCELL_IDX 46
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_DMRS_TYPEA_POSITION_IDX 47
#define GNB_CONFIG_SERVINGCELLCONFIGCOMMON_DMRS_TYPEA_POSITION_IDX 47
#define GNB_CONFIG_NIA_SUBCARRIERSPACING_IDX 48
#define GNB_CONFIG_NIA_SUBCARRIERSPACING_IDX 48
...
@@ -769,63 +765,64 @@ typedef enum {
...
@@ -769,63 +765,64 @@ typedef enum {
#define GNB_CONFIG_RACH_RA_MSG3SIZEGROUPA_IDX 67
#define GNB_CONFIG_RACH_RA_MSG3SIZEGROUPA_IDX 67
#define GNB_CONFIG_RACH_MESSAGEPOWEROFFSETGROUPB_IDX 68
#define GNB_CONFIG_RACH_MESSAGEPOWEROFFSETGROUPB_IDX 68
#define GNB_CONFIG_RACH_NUMBEROFRA_PREAMBLESGROUPA_IDX 69
#define GNB_CONFIG_RACH_NUMBEROFRA_PREAMBLESGROUPA_IDX 69
#define GNB_CONFIG_RACH_RA_CONTENTIONRESOLUTIONTIMER_IDX 60
#define GNB_CONFIG_RACH_RA_CONTENTIONRESOLUTIONTIMER_IDX 70
#define GNB_CONFIG_RSRP_THRESHOLDSSB_IDX 70
#define GNB_CONFIG_RSRP_THRESHOLDSSB_IDX 71
#define GNB_CONFIG_RSRP_THRESHOLDSSB_SUL_IDX 71
#define GNB_CONFIG_RSRP_THRESHOLDSSB_SUL_IDX 72
#define GNB_CONFIG_PRACH_ROOTSEQUENCEINDEX_CHOICE_IDX 72
#define GNB_CONFIG_PRACH_ROOTSEQUENCEINDEX_CHOICE_IDX 73
#define GNB_CONFIG_PRACH_ROOTSEQUENCEINDEX_L839_IDX 73
#define GNB_CONFIG_PRACH_ROOTSEQUENCEINDEX_L839_IDX 74
#define GNB_CONFIG_PRACH_ROOTSEQUENCEINDEX_L139_IDX 74
#define GNB_CONFIG_PRACH_ROOTSEQUENCEINDEX_L139_IDX 75
#define GNB_CONFIG_PRACH_MSG1_SUBCARRIERSPACING_IDX 75
#define GNB_CONFIG_PRACH_MSG1_SUBCARRIERSPACING_IDX 76
#define GNB_CONFIG_RESTRICTEDSETCONFIG_IDX 76
#define GNB_CONFIG_RESTRICTEDSETCONFIG_IDX 77
#define GNB_CONFIG_MSG3_TRANSFORMPRECODING_IDX 77
#define GNB_CONFIG_MSG3_TRANSFORMPRECODING_IDX 78
#define GNB_CONFIG_PRACH_CONFIGURATIONINDEX_IDX 78
#define GNB_CONFIG_PRACH_CONFIGURATIONINDEX_IDX 79
#define GNB_CONFIG_PRACH_MSG1_FDM_IDX 79
#define GNB_CONFIG_PRACH_MSG1_FDM_IDX 80
#define GNB_CONFIG_PRACH_MSG1_FREQUENCYSTART_IDX 80
#define GNB_CONFIG_PRACH_MSG1_FREQUENCYSTART_IDX 81
#define GNB_CONFIG_ZEROCORRELATIONZONECONFIG_IDX 81
#define GNB_CONFIG_ZEROCORRELATIONZONECONFIG_IDX 82
#define GNB_CONFIG_PREAMBLERECEIVEDTARGETPOWER_IDX 82
#define GNB_CONFIG_PREAMBLERECEIVEDTARGETPOWER_IDX 83
#define GNB_CONFIG_PREAMBLETRANSMAX_IDX 83
#define GNB_CONFIG_PREAMBLETRANSMAX_IDX 84
#define GNB_CONFIG_POWERRAMPINGSTEP_IDX 84
#define GNB_CONFIG_POWERRAMPINGSTEP_IDX 85
#define GNB_CONFIG_RA_RESPONSEWINDOW_IDX 85
#define GNB_CONFIG_RA_RESPONSEWINDOW_IDX 86
#define GNB_CONFIG_GROUPHOPPINGENABLEDTRANSFORMPRECODING_IDX 86
#define GNB_CONFIG_GROUPHOPPINGENABLEDTRANSFORMPRECODING_IDX 87
#define GNB_CONFIG_MSG3_DELTAPREAMBLE_IDX 87
#define GNB_CONFIG_MSG3_DELTAPREAMBLE_IDX 88
#define GNB_CONFIG_P0_NOMINALWITHGRANT_IDX 88
#define GNB_CONFIG_P0_NOMINALWITHGRANT_IDX 89
#define GNB_CONFIG_PUSCH_TIMEDOMAINRESOURCEALLOCATION_K2_IDX 89
#define GNB_CONFIG_PUSCH_TIMEDOMAINRESOURCEALLOCATION_K2_IDX 90
#define GNB_CONFIG_PUSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE_IDX 90
#define GNB_CONFIG_PUSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE_IDX 91
#define GNB_CONFIG_PUSCH_TIMEDOMAINRESOURCEALLOCATION_STARTSYMBOLANDLENGTH_IDX
#define GNB_CONFIG_PUSCH_TIMEDOMAINRESOURCEALLOCATION_STARTSYMBOLANDLENGTH_IDX 92
#define GNB_CONFIG_PUCCH_RESOURCECOMMON_IDX
#define GNB_CONFIG_PUCCH_RESOURCECOMMON_IDX 93
#define GNB_CONFIG_PUCCH_GROUPHOPPING_IDX 91
#define GNB_CONFIG_PUCCH_GROUPHOPPING_IDX 94
#define GNB_CONFIG_HOPPINGID_IDX
#define GNB_CONFIG_HOPPINGID_IDX 95
#define GNB_CONFIG_P0_NOMINAL_IDX 92
#define GNB_CONFIG_P0_NOMINAL_IDX 96
#define GNB_CONFIG_PDSCH_TIMEDOMAINRESOURCEALLOCATION_K0_IDX 93
#define GNB_CONFIG_PDSCH_TIMEDOMAINRESOURCEALLOCATION_K0_IDX 97
#define GNB_CONFIG_PDSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE_IDX 94
#define GNB_CONFIG_PDSCH_TIMEDOMAINRESOURCEALLOCATION_MAPPINGTYPE_IDX 98
#define GNB_CONFIG_RATEMATCHPATTERNID_IDX 95
#define GNB_CONFIG_PDSCH_TIMEDOMAINRESOURCEALLOCATION_STARTSYMBOLANDLENGTH
#define GNB_CONFIG_RATEMATCHPATTERN_PATTERNTYPE_IDX 96
#define GNB_CONFIG_RATEMATCHPATTERNID_IDX 99
#define GNB_CONFIG_SYMBOLSINRESOURCEBLOCK_IDX 97
#define GNB_CONFIG_RATEMATCHPATTERN_PATTERNTYPE_IDX 100
#define GNB_CONFIG_PERIODICITYANDPATTERN_IDX 98
#define GNB_CONFIG_SYMBOLSINRESOURCEBLOCK_IDX 101
#define GNB_CONFIG_RATEMATCHPATTERN_CONTROLRESOURCESET_IDX 99
#define GNB_CONFIG_PERIODICITYANDPATTERN_IDX 102
#define GNB_CONFIG_RATEMATCHPATTERN_SUBCARRIERSPACING_IDX 100
#define GNB_CONFIG_RATEMATCHPATTERN_CONTROLRESOURCESET_IDX 103
#define GNB_CONFIG_RATEMATCHPATTERN_MODE_IDX 101
#define GNB_CONFIG_RATEMATCHPATTERN_SUBCARRIERSPACING_IDX 104
#define GNB_CONFIG_CONTROLRESOURCESETZERO_IDX
#define GNB_CONFIG_RATEMATCHPATTERN_MODE_IDX 105
#define GNB_CONFIG_SEARCHSPACEZERO_IDX
#define GNB_CONFIG_CONTROLRESOURCESETZERO_IDX 106
#define GNB_CONFIG_SEARCHSPACESIB1_IDX 102
#define GNB_CONFIG_SEARCHSPACEZERO_IDX 107
#define GNB_CONFIG_SEARCHSPACEOTHERSYSTEMINFORMATION_IDX 103
#define GNB_CONFIG_SEARCHSPACESIB1_IDX 108
#define GNB_CONFIG_PAGINGSEARCHSPACE_IDX 104
#define GNB_CONFIG_SEARCHSPACEOTHERSYSTEMINFORMATION_IDX 109
#define GNB_CONFIG_RA_SEARCHSPACE_IDX 105
#define GNB_CONFIG_PAGINGSEARCHSPACE_IDX 110
#define GNB_CONFIG_PDCCH_COMMON_CONTROLRESOURCESETID_IDX 107
#define GNB_CONFIG_RA_SEARCHSPACE_IDX 111
#define GNB_CONFIG_PDCCH_COMMON_CONTROLRESOURCESET_DURATION_IDX 108
#define GNB_CONFIG_PDCCH_COMMON_CONTROLRESOURCESETID_IDX 112
#define GNB_CONFIG_PDCCH_CCE_REG_MAPPINGTYPE_IDX 109
#define GNB_CONFIG_PDCCH_COMMON_CONTROLRESOURCESET_DURATION_IDX 113
#define GNB_CONFIG_PDCCH_REG_BUNDLESIZE_IDX 110
#define GNB_CONFIG_PDCCH_CCE_REG_MAPPINGTYPE_IDX 114
#define GNB_CONFIG_PDCCH_INTERLEAVERSIZE_IDX 111
#define GNB_CONFIG_PDCCH_REG_BUNDLESIZE_IDX 115
#define GNB_CONFIG_PDCCH_SHIFTINDEX_IDX 112
#define GNB_CONFIG_PDCCH_INTERLEAVERSIZE_IDX 116
#define GNB_CONFIG_PDCCH_PRECODERGRANULARITY_IDX 113
#define GNB_CONFIG_PDCCH_SHIFTINDEX_IDX 117
#define GNB_CONFIG_PDCCH_TCI_STATEID_IDX 114
#define GNB_CONFIG_PDCCH_PRECODERGRANULARITY_IDX 118
#define GNB_CONFIG_TCI_PRESENTINDCI_IDX 115
#define GNB_CONFIG_PDCCH_TCI_STATEID_IDX 119
#define GNB_CONFIG_PDCCH_DMRS_SCRAMBLINGID_IDX
#define GNB_CONFIG_TCI_PRESENTINDCI_IDX 120
#define GNB_CONFIG_SEARCHSPACEID_IDX 116
#define GNB_CONFIG_PDCCH_DMRS_SCRAMBLINGID_IDX 121
#define GNB_CONFIG_COMMONSEARCHSPACES_CONTROLRESOURCESETID_IDX 117
#define GNB_CONFIG_SEARCHSPACEID_IDX 122
#define GNB_CONFIG_SEARCHSPACE_MONITORINGSLOTPERIODICITYANDOFFSET_CHOICE_IDX 118
#define GNB_CONFIG_COMMONSEARCHSPACES_CONTROLRESOURCESETID_IDX 123
#define GNB_CONFIG_SEARCHSPACE_MONITORINGSLOTPERIODICITYANDOFFSET_VALUE_IDX
#define GNB_CONFIG_SEARCHSPACE_MONITORINGSLOTPERIODICITYANDOFFSET_CHOICE_IDX 124
#define GNB_CONFIG_SEARCHSPACE_DURATION_IDX
#define GNB_CONFIG_SEARCHSPACE_MONITORINGSLOTPERIODICITYANDOFFSET_VALUE_IDX 125
#define GNB_CONFIG_SEARCHSPACE_DURATION_IDX 126
#define GNB_CONFIG_SEARCHSPACE_NROFCANDIDATES_AGGREGATIONLEVEL1_IDX 127
#define GNB_CONFIG_SEARCHSPACE_NROFCANDIDATES_AGGREGATIONLEVEL1_IDX 127
#define GNB_CONFIG_SEARCHSPACE_NROFCANDIDATES_AGGREGATIONLEVEL2_IDX 128
#define GNB_CONFIG_SEARCHSPACE_NROFCANDIDATES_AGGREGATIONLEVEL2_IDX 128
#define GNB_CONFIG_SEARCHSPACE_NROFCANDIDATES_AGGREGATIONLEVEL4_IDX 129
#define GNB_CONFIG_SEARCHSPACE_NROFCANDIDATES_AGGREGATIONLEVEL4_IDX 129
...
@@ -839,14 +836,14 @@ typedef enum {
...
@@ -839,14 +836,14 @@ typedef enum {
#define GNB_CONFIG_COMMON_DCI_FORMAT2_0_NROFCANDIDATES_SFI_AGGREGATIONLEVEL16_IDX 137
#define GNB_CONFIG_COMMON_DCI_FORMAT2_0_NROFCANDIDATES_SFI_AGGREGATIONLEVEL16_IDX 137
#define GNB_CONFIG_COMMON_DCI_FORMAT2_3_MONITORINGPERIODICITY_IDX 138
#define GNB_CONFIG_COMMON_DCI_FORMAT2_3_MONITORINGPERIODICITY_IDX 138
#define GNB_CONFIG_COMMON_DCI_FORMAT2_3_NROFPDCCH_CANDIDATES_IDX 139
#define GNB_CONFIG_COMMON_DCI_FORMAT2_3_NROFPDCCH_CANDIDATES_IDX 139
#define GNB_CONFIG_UE_SPECIFIC__DCI_FORMATS_IDX 14
1
#define GNB_CONFIG_UE_SPECIFIC__DCI_FORMATS_IDX 14
0
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_CARRIERFREQDL_IDX 14
2
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_CARRIERFREQDL_IDX 14
1
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_CARRIERBANDWIDTHDL_IDX 14
3
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_CARRIERBANDWIDTHDL_IDX 14
2
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_NROFCRS_PORTS_IDX 14
4
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_NROFCRS_PORTS_IDX 14
3
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_V_SHIFT_IDX 14
5
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_V_SHIFT_IDX 14
4
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_RADIOFRAMEALLOCATIONPERIOD_IDX 14
6
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_RADIOFRAMEALLOCATIONPERIOD_IDX 14
5
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_RADIOFRAMEALLOCATIONOFFSET_IDX 14
7
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_RADIOFRAMEALLOCATIONOFFSET_IDX 14
6
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_SUBFRAMEALLOCATION_CHOICE_IDX 14
8
#define GNB_CONFIG_RATEMATCHPATTERNLTE_CRS_SUBFRAMEALLOCATION_CHOICE_IDX 14
7
/*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/*------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
View file @
4dd74fbd
...
@@ -69,7 +69,8 @@ gNBs =
...
@@ -69,7 +69,8 @@ gNBs =
UL_BWP_SubcarrierSpacing
=
"kHz15"
;
UL_BWP_SubcarrierSpacing
=
"kHz15"
;
UL_BWP_prefix_type
=
"NORMAL"
;
UL_BWP_prefix_type
=
"NORMAL"
;
UL_timeAlignmentTimerCommon
=
"infinity"
;
UL_timeAlignmentTimerCommon
=
"infinity"
;
ServingCellConfigCommon__ssb_PositionsInBurst_PR
=
"shortBitmap"
;
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
"shortBitmap"
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
10
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
10
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
NIA_SubcarrierSpacing
=
"kHz15"
;
NIA_SubcarrierSpacing
=
"kHz15"
;
...
@@ -123,6 +124,7 @@ gNBs =
...
@@ -123,6 +124,7 @@ gNBs =
p0_nominal
= -
30
;
p0_nominal
= -
30
;
PDSCH_TimeDomainResourceAllocation_k0
=
2
;
PDSCH_TimeDomainResourceAllocation_k0
=
2
;
PDSCH_TimeDomainResourceAllocation_mappingType
=
"typeA"
;
PDSCH_TimeDomainResourceAllocation_mappingType
=
"typeA"
;
PDSCH_TimeDomainResourceAllocation_startSymbolAndLength
=
0
;
rateMatchPatternId
=
0
;
rateMatchPatternId
=
0
;
RateMatchPattern_patternType
=
"bitmaps"
;
RateMatchPattern_patternType
=
"bitmaps"
;
symbolsInResourceBlock
=
"oneSlot"
;
symbolsInResourceBlock
=
"oneSlot"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment