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
canghaiwuhen
OpenXG-RAN
Commits
288df1af
Commit
288df1af
authored
Oct 20, 2020
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove hardcoding of FR2 parameters
parent
9e69c0e3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+1
-1
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+8
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @
288df1af
...
...
@@ -974,7 +974,7 @@ void schedule_fapi_ul_pdu(int Mod_idP,
pusch_pdu
->
resource_alloc
=
1
;
//type 1
pusch_pdu
->
rb_start
=
0
;
if
(
get_softmodem_params
()
->
phy_test
==
1
)
pusch_pdu
->
rb_size
=
5
;
pusch_pdu
->
rb_size
=
min
(
pusch_pdu
->
bwp_size
,
50
)
;
else
pusch_pdu
->
rb_size
=
pusch_pdu
->
bwp_size
;
}
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
288df1af
...
...
@@ -3295,7 +3295,10 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
rs_ConfigSSB_r15
.
measTimingConfig_r15
.
periodicityAndOffset_r15
.
present
=
LTE_MTC_SSB_NR_r15__periodicityAndOffset_r15_PR_sf20_r15
;
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
rs_ConfigSSB_r15
.
measTimingConfig_r15
.
periodicityAndOffset_r15
.
choice
.
sf20_r15
=
0
;
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
rs_ConfigSSB_r15
.
measTimingConfig_r15
.
ssb_Duration_r15
=
LTE_MTC_SSB_NR_r15__ssb_Duration_r15_sf4
;
if
(
rrc_inst
->
nr_scg_ssb_freq
>
2016666
)
//FR2
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
rs_ConfigSSB_r15
.
subcarrierSpacingSSB_r15
=
LTE_RS_ConfigSSB_NR_r15__subcarrierSpacingSSB_r15_kHz120
;
else
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
rs_ConfigSSB_r15
.
subcarrierSpacingSSB_r15
=
LTE_RS_ConfigSSB_NR_r15__subcarrierSpacingSSB_r15_kHz30
;
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
quantityConfigSet_r15
=
1
;
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
=
calloc
(
1
,
sizeof
(
struct
LTE_MeasObjectNR_r15__ext1
));
...
...
@@ -3306,7 +3309,10 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
if
(
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
==
NULL
)
exit
(
1
);
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
present
=
LTE_MeasObjectNR_r15__ext1__bandNR_r15_PR_setup
;
if
(
rrc_inst
->
nr_scg_ssb_freq
>
2016666
)
//FR2
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
choice
.
setup
=
261
;
else
MeasObj2
->
measObject
.
choice
.
measObjectNR_r15
.
ext1
->
bandNR_r15
->
choice
.
setup
=
78
;
ASN_SEQUENCE_ADD
(
&
MeasObj_list
->
list
,
MeasObj2
);
}
...
...
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