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
58bab3f2
Commit
58bab3f2
authored
Sep 21, 2020
by
heshanyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compiler error of UE when rrc is rel16
parent
bc70da11
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+1
-1
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+4
-4
No files found.
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
58bab3f2
...
@@ -1062,7 +1062,7 @@ int find_pucch_resource_set(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, int uci_size)
...
@@ -1062,7 +1062,7 @@ int find_pucch_resource_set(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, int uci_size)
/* look for the first resource set which supports uci_size number of bits for payload */
/* look for the first resource set which supports uci_size number of bits for payload */
while
(
pucch_resource_set_id
<
MAX_NB_OF_PUCCH_RESOURCE_SETS
)
{
while
(
pucch_resource_set_id
<
MAX_NB_OF_PUCCH_RESOURCE_SETS
)
{
if
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
!=
NULL
)
{
if
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
!=
NULL
)
{
pucch_max_pl_bits
=
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
->
maxPayload
Minus1
;
pucch_max_pl_bits
=
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
->
maxPayload
Size
;
if
(
uci_size
<=
(((
pucch_max_pl_bits
!=
NULL
)
?
*
pucch_max_pl_bits
:
1706
)
+
1
))
{
if
(
uci_size
<=
(((
pucch_max_pl_bits
!=
NULL
)
?
*
pucch_max_pl_bits
:
1706
)
+
1
))
{
NR_TST_PHY_PRINTF
(
"PUCCH found resource set %d
\n
"
,
pucch_resource_set_id
);
NR_TST_PHY_PRINTF
(
"PUCCH found resource set %d
\n
"
,
pucch_resource_set_id
);
return
(
pucch_resource_set_id
);
return
(
pucch_resource_set_id
);
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
58bab3f2
...
@@ -479,10 +479,10 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
...
@@ -479,10 +479,10 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
case
NR_DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry
:
case
NR_DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry
:
case
NR_DL_DCCH_MessageType__c1_PR_counterCheck
:
case
NR_DL_DCCH_MessageType__c1_PR_counterCheck
:
case
NR_DL_DCCH_MessageType__c1_PR_mobilityFromNRCommand
:
case
NR_DL_DCCH_MessageType__c1_PR_mobilityFromNRCommand
:
case
NR_DL_DCCH_MessageType__c1_PR_
spare7
:
case
NR_DL_DCCH_MessageType__c1_PR_
dlDedicatedMessageSegment_r16
:
case
NR_DL_DCCH_MessageType__c1_PR_
spare
6
:
case
NR_DL_DCCH_MessageType__c1_PR_
ueInformationRequest_r1
6
:
case
NR_DL_DCCH_MessageType__c1_PR_
spare5
:
case
NR_DL_DCCH_MessageType__c1_PR_
dlInformationTransferMRDC_r16
:
case
NR_DL_DCCH_MessageType__c1_PR_
spare4
:
case
NR_DL_DCCH_MessageType__c1_PR_
loggedMeasurementConfiguration_r16
:
case
NR_DL_DCCH_MessageType__c1_PR_spare3
:
case
NR_DL_DCCH_MessageType__c1_PR_spare3
:
case
NR_DL_DCCH_MessageType__c1_PR_spare2
:
case
NR_DL_DCCH_MessageType__c1_PR_spare2
:
case
NR_DL_DCCH_MessageType__c1_PR_spare1
:
case
NR_DL_DCCH_MessageType__c1_PR_spare1
:
...
...
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