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
常顺宇
OpenXG-RAN
Commits
e4443b18
Commit
e4443b18
authored
Feb 13, 2019
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x2: fix compilation
parent
1c6b9f0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+9
-9
No files found.
openair2/RRC/LTE/rrc_eNB.c
View file @
e4443b18
...
...
@@ -4810,10 +4810,10 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
physicalConfigDedicated2->antennaInfo = CALLOC(1, sizeof(*physicalConfigDedicated2->antennaInfo));
physicalConfigDedicated2->antennaInfo->present = LTE_PhysicalConfigDedicated__antennaInfo_PR_explicitValue;
//if ((*physicalConfigDedicated)->antennaInfo) {
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.transmissionMode = rrc_inst->configuration.
ue_TransmissionMode[0]
;
LOG_D(RRC,"Setting transmission mode to %ld+1\n",rrc_inst->configuration.
ue_TransmissionMode[0]
);
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.transmissionMode = rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
;
LOG_D(RRC,"Setting transmission mode to %ld+1\n",rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
);
if (rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm3) {
if (rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm3) {
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction=
CALLOC(1,sizeof(LTE_AntennaInfoDedicated__codebookSubsetRestriction_PR));
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->present =
...
...
@@ -4822,7 +4822,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm3.buf[0] = 0xc0;
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm3.size=1;
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm3.bits_unused=6;
} else if (rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm4) {
} else if (rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm4) {
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction=
CALLOC(1,sizeof(LTE_AntennaInfoDedicated__codebookSubsetRestriction_PR));
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->present =
...
...
@@ -4831,7 +4831,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm4.buf[0] = 0xfc;
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm4.size=1;
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm4.bits_unused=2;
} else if (rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm5) {
} else if (rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm5) {
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction=
CALLOC(1,sizeof(LTE_AntennaInfoDedicated__codebookSubsetRestriction_PR));
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->present =
...
...
@@ -4840,7 +4840,7 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm5.buf[0] = 0xf0;
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm5.size=1;
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->choice.n2TxAntenna_tm5.bits_unused=4;
} else if (rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm6) {
} else if (rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm6) {
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction=
CALLOC(1,sizeof(LTE_AntennaInfoDedicated__codebookSubsetRestriction_PR));
(*physicalConfigDedicated)->antennaInfo->choice.explicitValue.codebookSubsetRestriction->present =
...
...
@@ -4867,9 +4867,9 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
physicalConfigDedicated2->cqi_ReportConfig->cqi_ReportPeriodic->present = LTE_CQI_ReportPeriodic_PR_release;
//if ((*physicalConfigDedicated)->cqi_ReportConfig) {
if ((rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm4) ||
(rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm5) ||
(rrc_inst->configuration.
ue_TransmissionMode[0]
==LTE_AntennaInfoDedicated__transmissionMode_tm6)) {
if ((rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm4) ||
(rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm5) ||
(rrc_inst->configuration.
radioresourceconfig[0].ue_TransmissionMode
==LTE_AntennaInfoDedicated__transmissionMode_tm6)) {
//feedback mode needs to be set as well
//TODO: I think this is taken into account in the PHY automatically based on the transmission mode variable
printf("setting cqi reporting mode to rm31\n");
...
...
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