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
9eb1137b
Commit
9eb1137b
authored
Feb 18, 2022
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for scc/scc_SIB at UE
parent
7b4b7b96
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
14 deletions
+20
-14
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+5
-8
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+11
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-1
No files found.
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
9eb1137b
...
...
@@ -4076,25 +4076,22 @@ uint16_t compute_pucch_prb_size(uint8_t format,
}
}
int
get_bw_tbslbrm
(
NR_
ServingCellConfigCommon_t
*
scc
,
int
get_bw_tbslbrm
(
NR_
BWP_t
*
genericParameters
,
NR_CellGroupConfig_t
*
cg
)
{
int
bw
=
0
;
NR_BWP_t
genericParameters
;
if
(
cg
&&
cg
->
spCellConfig
&&
cg
->
spCellConfig
->
spCellConfigDedicated
&&
cg
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
)
{
struct
NR_ServingCellConfig__downlinkBWP_ToAddModList
*
BWP_list
=
cg
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
;
for
(
int
i
=
0
;
i
<
BWP_list
->
list
.
count
;
i
++
)
{
genericParameters
=
BWP_list
->
list
.
array
[
i
]
->
bwp_Common
->
genericParameters
;
int
curr_bw
=
NRRIV2BW
(
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
genericParameters
=
&
BWP_list
->
list
.
array
[
i
]
->
bwp_Common
->
genericParameters
;
int
curr_bw
=
NRRIV2BW
(
genericParameters
->
locationAndBandwidth
,
MAX_BWP_SIZE
);
if
(
curr_bw
>
bw
)
bw
=
curr_bw
;
}
}
else
{
genericParameters
=
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
;
bw
=
NRRIV2BW
(
genericParameters
.
locationAndBandwidth
,
MAX_BWP_SIZE
);
}
else
bw
=
NRRIV2BW
(
genericParameters
->
locationAndBandwidth
,
MAX_BWP_SIZE
);
return
bw
;
}
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
View file @
9eb1137b
...
...
@@ -121,7 +121,7 @@ uint8_t get_K_ptrs(uint16_t nrb0, uint16_t nrb1, uint16_t N_RB);
uint16_t
get_nr_srs_offset
(
NR_SRS_PeriodicityAndOffset_t
periodicityAndOffset
);
int
get_bw_tbslbrm
(
NR_
ServingCellConfigCommon_t
*
scc
,
int
get_bw_tbslbrm
(
NR_
BWP_t
*
genericParameters
,
NR_CellGroupConfig_t
*
cg
);
uint32_t
nr_compute_tbslbrm
(
uint16_t
table
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
9eb1137b
...
...
@@ -891,7 +891,14 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
return
-
1
;
}
int
bw_tbslbrm
=
get_bw_tbslbrm
(
mac
->
scc
,
mac
->
cg
);
int
bw_tbslbrm
;
if
(
mac
->
scc
||
mac
->
scc_SIB
||
mac
->
cg
)
{
NR_BWP_t
genericParameters
=
mac
->
scc
?
mac
->
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
:
mac
->
scc_SIB
->
downlinkConfigCommon
.
initialDownlinkBWP
.
genericParameters
;
bw_tbslbrm
=
get_bw_tbslbrm
(
&
genericParameters
,
mac
->
cg
);
}
else
bw_tbslbrm
=
dlsch_config_pdu_1_0
->
BWPSize
;
dlsch_config_pdu_1_0
->
tbslbrm
=
nr_compute_tbslbrm
(
dlsch_config_pdu_1_0
->
mcs_table
,
bw_tbslbrm
,
1
);
...
...
@@ -1265,7 +1272,9 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fr
long
*
maxMIMO_Layers
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
pdsch_ServingCellConfig
->
choice
.
setup
->
ext1
->
maxMIMO_Layers
;
AssertFatal
(
maxMIMO_Layers
!=
NULL
,
"Option with max MIMO layers not configured is not supported
\n
"
);
int
nl_tbslbrm
=
*
maxMIMO_Layers
<
4
?
*
maxMIMO_Layers
:
4
;
int
bw_tbslbrm
=
get_bw_tbslbrm
(
mac
->
scc
,
mac
->
cg
);
NR_BWP_t
genericParameters
=
mac
->
scc
?
mac
->
scc
->
downlinkConfigCommon
->
initialDownlinkBWP
->
genericParameters
:
mac
->
scc_SIB
->
downlinkConfigCommon
.
initialDownlinkBWP
.
genericParameters
;
int
bw_tbslbrm
=
get_bw_tbslbrm
(
&
genericParameters
,
mac
->
cg
);
dlsch_config_pdu_1_1
->
tbslbrm
=
nr_compute_tbslbrm
(
dlsch_config_pdu_1_1
->
mcs_table
,
bw_tbslbrm
,
nl_tbslbrm
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
9eb1137b
...
...
@@ -1338,7 +1338,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
uint8_t
tb_scaling
=
0
;
nr_get_tbs_dl
(
&
dl_tti_pdsch_pdu
->
pdsch_pdu
,
x_Overhead
,
pdsch_pdu_rel15
->
numDmrsCdmGrpsNoData
,
tb_scaling
);
int
bw_tbslbrm
=
get_bw_tbslbrm
(
scc
,
ra
->
CellGroup
);
int
bw_tbslbrm
=
get_bw_tbslbrm
(
genericParameters
,
ra
->
CellGroup
);
pdsch_pdu_rel15
->
maintenance_parms_v3
.
tbSizeLbrmBytes
=
nr_compute_tbslbrm
(
mcsTableIdx
,
bw_tbslbrm
,
1
);
...
...
@@ -1720,7 +1720,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
int
x_Overhead
=
0
;
nr_get_tbs_dl
(
&
dl_tti_pdsch_pdu
->
pdsch_pdu
,
x_Overhead
,
pdsch_pdu_rel15
->
numDmrsCdmGrpsNoData
,
tb_scaling
);
int
bw_tbslbrm
=
get_bw_tbslbrm
(
scc
,
ra
->
CellGroup
);
int
bw_tbslbrm
=
get_bw_tbslbrm
(
genericParameters
,
ra
->
CellGroup
);
pdsch_pdu_rel15
->
maintenance_parms_v3
.
tbSizeLbrmBytes
=
nr_compute_tbslbrm
(
mcsTableIdx
,
bw_tbslbrm
,
1
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
9eb1137b
...
...
@@ -1145,7 +1145,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
AssertFatal
(
maxMIMO_Layers
!=
NULL
,
"Option with max MIMO layers not configured is not supported
\n
"
);
int
nl_tbslbrm
=
*
maxMIMO_Layers
<
4
?
*
maxMIMO_Layers
:
4
;
// Maximum number of PRBs across all configured DL BWPs
int
bw_tbslbrm
=
get_bw_tbslbrm
(
scc
,
cg
);
int
bw_tbslbrm
=
get_bw_tbslbrm
(
genericParameters
,
cg
);
pdsch_pdu
->
maintenance_parms_v3
.
tbSizeLbrmBytes
=
nr_compute_tbslbrm
(
ps
->
mcsTableIdx
,
bw_tbslbrm
,
nl_tbslbrm
);
...
...
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