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
wangjie
OpenXG-RAN
Commits
8981f5cb
Commit
8981f5cb
authored
Jul 10, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix in pucch ue scheduler for pucch_Config = NULL
parent
3228ebf3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+3
-3
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
8981f5cb
...
@@ -1857,7 +1857,8 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
...
@@ -1857,7 +1857,8 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
O_ACK
=
get_downlink_ack
(
mac
,
frameP
,
slotP
,
pucch
);
O_ACK
=
get_downlink_ack
(
mac
,
frameP
,
slotP
,
pucch
);
NR_BWP_Id_t
bwp_id
=
mac
->
UL_BWP_Id
;
NR_BWP_Id_t
bwp_id
=
mac
->
UL_BWP_Id
;
NR_PUCCH_Config_t
*
pucch_Config
;
NR_PUCCH_Config_t
*
pucch_Config
=
NULL
;
if
(
bwp_id
>
0
&&
if
(
bwp_id
>
0
&&
mac
->
ULbwp
[
bwp_id
-
1
]
&&
mac
->
ULbwp
[
bwp_id
-
1
]
&&
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
&&
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
&&
...
@@ -1875,11 +1876,10 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
...
@@ -1875,11 +1876,10 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
)
{
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
)
{
pucch_Config
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
;
pucch_Config
=
mac
->
cg
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
initialUplinkBWP
->
pucch_Config
->
choice
.
setup
;
}
}
else
AssertFatal
(
1
==
0
,
"no pucch_Config
\n
"
);
// if multiplexing of HARQ and CSI is not possible, transmit only HARQ bits
// if multiplexing of HARQ and CSI is not possible, transmit only HARQ bits
if
((
O_ACK
!=
0
)
&&
(
O_ACK
!=
0
)
&&
(
pucch_Config
->
format2
->
choice
.
setup
->
simultaneousHARQ_ACK_CSI
==
NULL
))
{
if
((
O_ACK
!=
0
)
&&
(
O_ACK
!=
0
)
&&
pucch_Config
&&
(
pucch_Config
->
format2
->
choice
.
setup
->
simultaneousHARQ_ACK_CSI
==
NULL
))
{
O_CSI
=
0
;
O_CSI
=
0
;
pucch
->
csi_part1_payload
=
0
;
pucch
->
csi_part1_payload
=
0
;
pucch
->
csi_part2_payload
=
0
;
pucch
->
csi_part2_payload
=
0
;
...
...
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