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
lizhongxiao
OpenXG-RAN
Commits
97126eb5
Commit
97126eb5
authored
5 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix carrierFreq MeasObj calculation to handle F1 case
parent
cc2a507d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+12
-6
No files found.
openair2/RRC/LTE/rrc_eNB.c
View file @
97126eb5
...
...
@@ -3101,8 +3101,10 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t *cons
memset
((
void
*
)
MeasObj
,
0
,
sizeof
(
*
MeasObj
));
MeasObj
->
measObjectId
=
1
;
MeasObj
->
measObject
.
present
=
LTE_MeasObjectToAddMod__measObject_PR_measObjectEUTRA
;
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
carrierFreq
=
(
LTE_ARFCN_ValueEUTRA_t
)
to_earfcn_DL
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
eutra_band
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
dl_CarrierFreq
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
N_RB_DL
);
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
carrierFreq
=
to_earfcn_DL
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
eutra_band
[
0
],
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
downlink_frequency
[
0
],
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
N_RB_DL
[
0
]);
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
allowedMeasBandwidth
=
LTE_AllowedMeasBandwidth_mbw25
;
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
presenceAntennaPort1
=
1
;
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
neighCellConfig
.
buf
=
CALLOC
(
1
,
sizeof
(
uint8_t
));
...
...
@@ -5070,8 +5072,10 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
memset
((
void
*
)
MeasObj
,
0
,
sizeof
(
*
MeasObj
));
MeasObj
->
measObjectId
=
1
;
MeasObj
->
measObject
.
present
=
LTE_MeasObjectToAddMod__measObject_PR_measObjectEUTRA
;
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
carrierFreq
=
(
LTE_ARFCN_ValueEUTRA_t
)
to_earfcn_DL
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
eutra_band
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
dl_CarrierFreq
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
N_RB_DL
);
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
carrierFreq
=
to_earfcn_DL
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
eutra_band
[
0
],
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
downlink_frequency
[
0
],
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
N_RB_DL
[
0
]);
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
allowedMeasBandwidth
=
LTE_AllowedMeasBandwidth_mbw25
;
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
presenceAntennaPort1
=
1
;
MeasObj
->
measObject
.
choice
.
measObjectEUTRA
.
neighCellConfig
.
buf
=
CALLOC
(
1
,
sizeof
(
uint8_t
));
...
...
@@ -5299,8 +5303,10 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
rrc_inst
->
carrier
[
0
]
/* CROUX TBC */
.
sib2
->
radioResourceConfigCommon
.
ul_CyclicPrefixLength
;
//End of configuration of radioResourceConfigCommon
mobilityInfo
->
carrierFreq
=
CALLOC
(
1
,
sizeof
(
*
mobilityInfo
->
carrierFreq
));
//CALLOC(1,sizeof(CarrierFreqEUTRA_t)); 36090
mobilityInfo
->
carrierFreq
->
dl_CarrierFreq
=
(
LTE_ARFCN_ValueEUTRA_t
)
to_earfcn_DL
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
eutra_band
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
dl_CarrierFreq
,
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
0
].
N_RB_DL
);
mobilityInfo
->
carrierFreq
->
dl_CarrierFreq
=
to_earfcn_DL
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
eutra_band
[
0
],
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
downlink_frequency
[
0
],
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
N_RB_DL
[
0
]);
mobilityInfo
->
carrierFreq
->
ul_CarrierFreq
=
NULL
;
mobilityInfo
->
carrierBandwidth
=
CALLOC
(
1
,
sizeof
(
*
mobilityInfo
->
carrierBandwidth
));
//CALLOC(1,sizeof(struct CarrierBandwidthEUTRA)); AllowedMeasBandwidth_mbw25
...
...
This diff is collapsed.
Click to expand it.
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