Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
c32044b3
Commit
c32044b3
authored
Mar 28, 2017
by
Cedric Roux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/bugfix-221' into develop_integration_w13
parents
67562c7e
52e35e23
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
13 deletions
+28
-13
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+2
-2
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
+1
-1
openair1/PHY/LTE_TRANSPORT/ulsch_modulation.c
openair1/PHY/LTE_TRANSPORT/ulsch_modulation.c
+1
-1
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+9
-7
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+15
-2
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
c32044b3
...
...
@@ -4799,7 +4799,7 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format,
return
(
0
);
}
if
(
harq_pid
>
8
)
if
(
harq_pid
>=
8
)
{
LOG_I
(
PHY
,
"bad harq id
\n
"
);
return
(
0
);
...
...
@@ -5013,7 +5013,7 @@ int check_dci_format2_2a_coherency(DCI_format_t dci_format,
#endif
// I- check dci content minimum coherency
if
(
harq_pid
>
8
)
if
(
harq_pid
>=
8
)
{
LOG_I
(
PHY
,
"bad harq pid
\n
"
);
return
(
0
);
...
...
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
View file @
c32044b3
...
...
@@ -242,7 +242,7 @@ uint32_t ulsch_encoding(uint8_t *a,
return
(
-
1
);
}
if
(
harq_pid
>
7
)
{
if
(
harq_pid
>
=
8
)
{
LOG_E
(
PHY
,
"Illegal harq_pid %d
\n
"
,
harq_pid
);
return
(
-
1
);
}
...
...
openair1/PHY/LTE_TRANSPORT/ulsch_modulation.c
View file @
c32044b3
...
...
@@ -402,7 +402,7 @@ void ulsch_modulation(int32_t **txdataF,
// x1 is set in lte_gold_generic
x2
=
(
ulsch
->
rnti
<<
14
)
+
(
subframe
<<
9
)
+
frame_parms
->
Nid_cell
;
//this is c_init in 36.211 Sec 6.3.1
if
(
harq_pid
>
7
)
{
if
(
harq_pid
>=
8
)
{
printf
(
"ulsch_modulation.c: Illegal harq_pid %d
\n
"
,
harq_pid
);
return
;
}
...
...
openair2/LAYER2/MAC/config.c
View file @
c32044b3
...
...
@@ -332,15 +332,17 @@ rrc_mac_config_req(
if
(
eNB_flagP
==
0
)
{
if
(
measObj
!=
NULL
)
{
if
(
measObj
[
0
]
!=
NULL
)
{
UE_mac_inst
[
Mod_idP
].
n_adj_cells
=
measObj
[
0
]
->
measObject
.
choice
.
measObjectEUTRA
.
cellsToAddModList
->
list
.
count
;
LOG_I
(
MAC
,
"Number of adjacent cells %d
\n
"
,
UE_mac_inst
[
Mod_idP
].
n_adj_cells
);
if
(
measObj
[
0
]
->
measObject
.
choice
.
measObjectEUTRA
.
cellsToAddModList
!=
NULL
)
{
UE_mac_inst
[
Mod_idP
].
n_adj_cells
=
measObj
[
0
]
->
measObject
.
choice
.
measObjectEUTRA
.
cellsToAddModList
->
list
.
count
;
LOG_D
(
MAC
,
"Number of adjacent cells %d
\n
"
,
UE_mac_inst
[
Mod_idP
].
n_adj_cells
);
for
(
i
=
0
;
i
<
UE_mac_inst
[
Mod_idP
].
n_adj_cells
;
i
++
)
{
UE_mac_inst
[
Mod_idP
].
adj_cell_id
[
i
]
=
measObj
[
0
]
->
measObject
.
choice
.
measObjectEUTRA
.
cellsToAddModList
->
list
.
array
[
i
]
->
physCellId
;
LOG_I
(
MAC
,
"Cell %d : Nid_cell %d
\n
"
,
i
,
UE_mac_inst
[
Mod_idP
].
adj_cell_id
[
i
]);
}
for
(
i
=
0
;
i
<
UE_mac_inst
[
Mod_idP
].
n_adj_cells
;
i
++
)
{
UE_mac_inst
[
Mod_idP
].
adj_cell_id
[
i
]
=
measObj
[
0
]
->
measObject
.
choice
.
measObjectEUTRA
.
cellsToAddModList
->
list
.
array
[
i
]
->
physCellId
;
LOG_D
(
MAC
,
"Cell %d : Nid_cell %d
\n
"
,
i
,
UE_mac_inst
[
Mod_idP
].
adj_cell_id
[
i
]);
}
mac_xface
->
phy_config_meas_ue
(
Mod_idP
,
0
,
eNB_index
,
UE_mac_inst
[
Mod_idP
].
n_adj_cells
,
UE_mac_inst
[
Mod_idP
].
adj_cell_id
);
mac_xface
->
phy_config_meas_ue
(
Mod_idP
,
0
,
eNB_index
,
UE_mac_inst
[
Mod_idP
].
n_adj_cells
,
UE_mac_inst
[
Mod_idP
].
adj_cell_id
);
}
}
/*
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
c32044b3
...
...
@@ -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