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
fae78bc0
Commit
fae78bc0
authored
Nov 25, 2020
by
hardy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/NR_UE_stability_fixes' into integration_2020_wk48_2
parents
948b8bcd
7a5fbeb6
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
96 additions
and
6 deletions
+96
-6
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+1
-1
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+6
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+89
-5
No files found.
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @
fae78bc0
...
...
@@ -798,7 +798,7 @@ typedef struct {
}
fapi_nr_pusch_power_control_t
;
typedef
enum
{
tx_config_codebook
=
1
,
tx_config_nonCodebook
=
2
}
tx_config_t
;
typedef
enum
{
transform_precoder_
disabled
=
0
,
transform_precoder_en
abled
=
1
}
transform_precoder_t
;
typedef
enum
{
transform_precoder_
enabled
=
0
,
transform_precoder_dis
abled
=
1
}
transform_precoder_t
;
typedef
enum
{
codebook_subset_fullyAndPartialAndNonCoherent
=
1
,
codebook_subset_partialAndNonCoherent
=
2
,
...
...
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
fae78bc0
...
...
@@ -1008,6 +1008,12 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
if
(
resource_set_found
==
TRUE
)
{
if
(
pucch_resource_indicator
<
MAX_PUCCH_RESOURCE_INDICATOR
)
{
// Verify that the value of pucch_resource_indicator is valid
if
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
->
resourceList
.
list
.
count
<=
pucch_resource_indicator
)
{
LOG_E
(
PHY
,
"Value of pucch_resource_indicator is out of bounds! Possibly due to a false DCI.
\n
"
);
return
(
FALSE
);
}
/* check if resource indexing by pucch_resource_indicator of this set is compatible */
if
((
ready_pucch_resource_id
==
TRUE
)
||
(
mac
->
ULbwp
[
bwp_id
-
1
]
->
bwp_Dedicated
->
pucch_Config
->
choice
.
setup
->
resourceSetToAddModList
->
list
.
array
[
pucch_resource_set_id
]
->
resourceList
.
list
.
array
[
pucch_resource_indicator
][
0
]
!=
MAX_NB_OF_PUCCH_RESOURCES
))
{
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
fae78bc0
This diff is collapsed.
Click to expand it.
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