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
wangjie
OpenXG-RAN
Commits
33cc4175
Commit
33cc4175
authored
May 07, 2021
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DetachedFromW16ForTest
parent
5d834473
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
14 deletions
+21
-14
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+5
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
+16
-10
No files found.
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
33cc4175
...
@@ -1184,13 +1184,13 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -1184,13 +1184,13 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
ASN_SEQUENCE_ADD
(
&
csirep1
->
reportConfigType
.
choice
.
periodic
->
pucch_CSI_ResourceList
.
list
,
pucchcsires1
);
ASN_SEQUENCE_ADD
(
&
csirep1
->
reportConfigType
.
choice
.
periodic
->
pucch_CSI_ResourceList
.
list
,
pucchcsires1
);
csirep1
->
reportQuantity
.
present
=
NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP
;
csirep1
->
reportQuantity
.
present
=
NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP
;
csirep1
->
reportQuantity
.
choice
.
ssb_Index_RSRP
=
(
NULL_t
)
0
;
csirep1
->
reportQuantity
.
choice
.
ssb_Index_RSRP
=
(
NULL_t
)
0
;
csirep1
->
reportFreqConfiguration
=
calloc
(
1
,
sizeof
(
*
csirep1
->
reportFreqConfiguration
));
csirep1
->
reportFreqConfiguration
=
NULL
;
/*
calloc(1,sizeof(*csirep1->reportFreqConfiguration));
csirep1->reportFreqConfiguration->cqi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__cqi_FormatIndicator_widebandCQI;
csirep1->reportFreqConfiguration->cqi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__cqi_FormatIndicator_widebandCQI;
csirep1->reportFreqConfiguration->pmi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__pmi_FormatIndicator_widebandPMI;
csirep1->reportFreqConfiguration->pmi_FormatIndicator=NR_CSI_ReportConfig__reportFreqConfiguration__pmi_FormatIndicator_widebandPMI;
csirep1
->
reportFreqConfiguration
->
csi_ReportingBand
=
NULL
;
csirep1->reportFreqConfiguration->csi_ReportingBand=NULL;
*/
csirep1
->
timeRestrictionForChannelMeasurements
=
NR_CSI_ReportConfig__timeRestrictionForChannelMeasurements_configured
;
csirep1
->
timeRestrictionForChannelMeasurements
=
NR_CSI_ReportConfig__timeRestrictionForChannelMeasurements_configured
;
csirep1
->
timeRestrictionForInterferenceMeasurements
=
NR_CSI_ReportConfig__timeRestrictionForInterferenceMeasurements_configured
;
csirep1
->
timeRestrictionForInterferenceMeasurements
=
NR_CSI_ReportConfig__timeRestrictionForInterferenceMeasurements_configured
;
csirep1
->
codebookConfig
=
calloc
(
1
,
sizeof
(
*
csirep1
->
codebookConfig
));
/*
csirep1->codebookConfig=calloc(1,sizeof(*csirep1->codebookConfig));
csirep1->codebookConfig->codebookType.present = NR_CodebookConfig__codebookType_PR_type1;
csirep1->codebookConfig->codebookType.present = NR_CodebookConfig__codebookType_PR_type1;
csirep1->codebookConfig->codebookType.choice.type1 = calloc(1,sizeof(*csirep1->codebookConfig->codebookType.choice.type1));
csirep1->codebookConfig->codebookType.choice.type1 = calloc(1,sizeof(*csirep1->codebookConfig->codebookType.choice.type1));
csirep1->codebookConfig->codebookType.choice.type1->subType.present=NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel;
csirep1->codebookConfig->codebookType.choice.type1->subType.present=NR_CodebookConfig__codebookType__type1__subType_PR_typeI_SinglePanel;
...
@@ -1210,7 +1210,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -1210,7 +1210,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
csirep1->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf=malloc(1);
csirep1->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf=malloc(1);
csirep1->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf[0]=0xc0; //'00000011'B
csirep1->codebookConfig->codebookType.choice.type1->subType.choice.typeI_SinglePanel->typeI_SinglePanel_ri_Restriction.buf[0]=0xc0; //'00000011'B
csirep1
->
codebookConfig
->
codebookType
.
choice
.
type1
->
codebookMode
=
1
;
csirep1->codebookConfig->codebookType.choice.type1->codebookMode=1;
*/
csirep1
->
dummy
=
NULL
;
csirep1
->
dummy
=
NULL
;
csirep1
->
groupBasedBeamReporting
.
present
=
NR_CSI_ReportConfig__groupBasedBeamReporting_PR_disabled
;
csirep1
->
groupBasedBeamReporting
.
present
=
NR_CSI_ReportConfig__groupBasedBeamReporting_PR_disabled
;
csirep1
->
groupBasedBeamReporting
.
choice
.
disabled
=
calloc
(
1
,
sizeof
(
*
csirep1
->
groupBasedBeamReporting
.
choice
.
disabled
));
csirep1
->
groupBasedBeamReporting
.
choice
.
disabled
=
calloc
(
1
,
sizeof
(
*
csirep1
->
groupBasedBeamReporting
.
choice
.
disabled
));
...
@@ -1222,6 +1222,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -1222,6 +1222,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
csirep1
->
cqi_Table
=
calloc
(
1
,
sizeof
(
*
csirep1
->
cqi_Table
));
csirep1
->
cqi_Table
=
calloc
(
1
,
sizeof
(
*
csirep1
->
cqi_Table
));
*
csirep1
->
cqi_Table
=
NR_CSI_ReportConfig__cqi_Table_table1
;
*
csirep1
->
cqi_Table
=
NR_CSI_ReportConfig__cqi_Table_table1
;
csirep1
->
subbandSize
=
NR_CSI_ReportConfig__subbandSize_value1
;
csirep1
->
subbandSize
=
NR_CSI_ReportConfig__subbandSize_value1
;
csirep1
->
non_PMI_PortIndication
=
NULL
;
csirep1
->
non_PMI_PortIndication
=
NULL
;
csirep1
->
ext1
=
NULL
;
csirep1
->
ext1
=
NULL
;
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
View file @
33cc4175
...
@@ -71,8 +71,10 @@ gNBs =
...
@@ -71,8 +71,10 @@ gNBs =
initialDLBWPstartSymbolAndLength_1
=
53
;
initialDLBWPstartSymbolAndLength_1
=
53
;
initialDLBWPk0_2
=
0
;
initialDLBWPk0_2
=
0
;
initialDLBWPmappingType_2
=
0
;
initialDLBWPmappingType_2
=
0
;
#this is SS=1,L=12
#this is SS=1,L=12
initialDLBWPstartSymbolAndLength_2
=
54
;
initialDLBWPstartSymbolAndLength_2
=
54
;
initialDLBWPk0_3
=
0
;
initialDLBWPk0_3
=
0
;
...
@@ -188,7 +190,7 @@ gNBs =
...
@@ -188,7 +190,7 @@ gNBs =
nrofUplinkSlots
=
2
;
nrofUplinkSlots
=
2
;
nrofUplinkSymbols
=
4
; //
0
; //
4
;
nrofUplinkSymbols
=
4
; //
0
; //
4
;
ssPBCH_BlockPower
= -
2
5
;
ssPBCH_BlockPower
= -
1
5
;
}
}
);
);
...
@@ -207,6 +209,7 @@ gNBs =
...
@@ -207,6 +209,7 @@ gNBs =
mme_ip_address
= ( {
ipv4
=
"192.168.18.99"
;
mme_ip_address
= ( {
ipv4
=
"192.168.18.99"
;
ipv6
=
"192:168:30::17"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
active
=
"yes"
;
port
=
36412
;
preference
=
"ipv4"
;
preference
=
"ipv4"
;
}
}
);
);
...
@@ -250,7 +253,7 @@ L1s = (
...
@@ -250,7 +253,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
pusch_proc_threads
=
6
;
}
}
);
);
...
@@ -263,9 +266,10 @@ RUs = (
...
@@ -263,9 +266,10 @@ RUs = (
att_rx
=
0
;
att_rx
=
0
;
bands
= [
7
];
bands
= [
7
];
max_pdschReferenceSignalPower
= -
27
;
max_pdschReferenceSignalPower
= -
27
;
max_rxgain
=
114
;
max_rxgain
=
75
;
eNB_instances
= [
0
];
eNB_instances
= [
0
];
clock_src
=
"external"
;
sdr_addrs
=
"addr=192.168.80.50"
;
clock_src
=
"internal"
;
}
}
);
);
...
@@ -279,17 +283,17 @@ THREAD_STRUCT = (
...
@@ -279,17 +283,17 @@ THREAD_STRUCT = (
}
}
);
);
security
= {
#
security = {
# preferred ciphering algorithms
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms
= (
"nea0"
,
"nea2"
);
#
ciphering_algorithms = ( "nea0", "nea2" );
# preferred integrity algorithms
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms
= (
"nia0"
);
#
integrity_algorithms = ( "nia0" );
};
#
};
log_config
:
log_config
:
{
{
...
@@ -308,4 +312,6 @@ security = {
...
@@ -308,4 +312,6 @@ security = {
rrc_log_level
=
"info"
;
rrc_log_level
=
"info"
;
rrc_log_verbosity
=
"medium"
;
rrc_log_verbosity
=
"medium"
;
};
};
uicc
: {
opc
=
"testopc"
;
};
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