Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
15
Merge Requests
15
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
8d88bae9
Commit
8d88bae9
authored
Mar 28, 2017
by
Wilson
Committed by
Wilson
Mar 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#221 fixed incorrect processing of CQI_PMI_Index in RRCConnectionReconfiguration
parent
2660ac05
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+15
-2
No files found.
openair2/RRC/LITE/rrc_UE.c
View file @
8d88bae9
...
...
@@ -975,6 +975,8 @@ rrc_ue_update_radioResourceConfigDedicated(RadioResourceConfigDedicated_t* radio
physicalConfigDedicated2
->
pusch_ConfigDedicated
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
pusch_ConfigDedicated
));
physicalConfigDedicated2
->
pucch_ConfigDedicated
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
pucch_ConfigDedicated
));
physicalConfigDedicated2
->
cqi_ReportConfig
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
cqi_ReportConfig
));
physicalConfigDedicated2
->
cqi_ReportConfig
->
cqi_ReportPeriodic
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
cqi_ReportConfig
->
cqi_ReportPeriodic
));
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
soundingRS_UL_ConfigDedicated
));
physicalConfigDedicated2
->
schedulingRequestConfig
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
schedulingRequestConfig
));
physicalConfigDedicated2
->
antennaInfo
=
CALLOC
(
1
,
sizeof
(
*
physicalConfigDedicated2
->
antennaInfo
));
...
...
@@ -1036,14 +1038,25 @@ rrc_ue_update_radioResourceConfigDedicated(RadioResourceConfigDedicated_t* radio
// Update cqi_ReportConfig
if
(
radioResourceConfigDedicated
->
physicalConfigDedicated
->
cqi_ReportConfig
!=
NULL
)
{
LOG_I
(
RRC
,
"Update cqi_ReportConfig config
\n
"
);
LOG_I
(
RRC
,
"Update cqi_ReportConfig config
(size=%d,%d)
\n
"
,
sizeof
(
*
physicalConfigDedicated2
->
cqi_ReportConfig
),
sizeof
(
CQI_ReportConfig_t
)
);
if
(
UE_rrc_inst
[
ctxt_pP
->
module_id
].
physicalConfigDedicated
[
eNB_index
]
->
cqi_ReportConfig
==
NULL
)
UE_rrc_inst
[
ctxt_pP
->
module_id
].
physicalConfigDedicated
[
eNB_index
]
->
cqi_ReportConfig
=
CALLOC
(
1
,
sizeof
(
CQI_ReportConfig_t
));
memcpy
((
char
*
)
UE_rrc_inst
[
ctxt_pP
->
module_id
].
physicalConfigDedicated
[
eNB_index
]
->
cqi_ReportConfig
,
(
char
*
)
radioResourceConfigDedicated
->
physicalConfigDedicated
->
cqi_ReportConfig
,
sizeof
(
physicalConfigDedicated2
->
cqi_ReportConfig
));
sizeof
(
*
physicalConfigDedicated2
->
cqi_ReportConfig
));
if
(
radioResourceConfigDedicated
->
physicalConfigDedicated
->
cqi_ReportConfig
->
cqi_ReportPeriodic
!=
NULL
)
{
LOG_I
(
RRC
,
"Update cqi_ReportPeriodic config (size=%d,%d)
\n
"
,
sizeof
(
*
physicalConfigDedicated2
->
cqi_ReportConfig
->
cqi_ReportPeriodic
),
sizeof
(
CQI_ReportPeriodic_t
));
if
(
UE_rrc_inst
[
ctxt_pP
->
module_id
].
physicalConfigDedicated
[
eNB_index
]
->
cqi_ReportConfig
->
cqi_ReportPeriodic
==
NULL
)
UE_rrc_inst
[
ctxt_pP
->
module_id
].
physicalConfigDedicated
[
eNB_index
]
->
cqi_ReportConfig
->
cqi_ReportPeriodic
=
CALLOC
(
1
,
sizeof
(
CQI_ReportPeriodic_t
));
memcpy
((
char
*
)
UE_rrc_inst
[
ctxt_pP
->
module_id
].
physicalConfigDedicated
[
eNB_index
]
->
cqi_ReportConfig
->
cqi_ReportPeriodic
,
(
char
*
)
radioResourceConfigDedicated
->
physicalConfigDedicated
->
cqi_ReportConfig
->
cqi_ReportPeriodic
,
sizeof
(
*
physicalConfigDedicated2
->
cqi_ReportConfig
->
cqi_ReportPeriodic
));
}
}
else
{
...
...
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