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
c25cf248
Commit
c25cf248
authored
Nov 20, 2023
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tmp
parent
f731a618
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+3
-0
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
c25cf248
...
...
@@ -1284,7 +1284,7 @@ void nr_ue_configure_pucch(NR_UE_MAC_INST_t *mac,
pucch_pdu
->
rnti
=
rnti
;
LOG_
D
(
NR_MAC
,
"initial_pucch_id %d, pucch_resource %p
\n
"
,
pucch
->
initial_pucch_id
,
pucch
->
pucch_resource
);
LOG_
I
(
NR_MAC
,
"initial_pucch_id %d, pucch_resource %p
\n
"
,
pucch
->
initial_pucch_id
,
pucch
->
pucch_resource
);
// configure pucch from Table 9.2.1-1
// only for ack/nack
if
(
pucch
->
initial_pucch_id
>
-
1
&&
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
c25cf248
...
...
@@ -1030,6 +1030,7 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
if
(
ulcfg_pdu
)
{
while
(
ulcfg_pdu
->
pdu_type
!=
FAPI_NR_END
)
{
uint8_t
*
ulsch_input_buffer
=
ulsch_input_buffer_array
[
tx_req
.
number_of_pdus
];
LOG_I
(
NR_MAC
,
"slot %d, processing UL request type: %d
\n
"
,
slot_tx
,
ulcfg_pdu
->
pdu_type
);
if
(
ulcfg_pdu
->
pdu_type
==
FAPI_NR_UL_CONFIG_TYPE_PUSCH
)
{
int
mac_pdu_exist
=
0
;
uint16_t
TBS_bytes
=
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
tb_size
;
...
...
@@ -2102,6 +2103,8 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, vo
mac
->
nr_ue_emul_l1
.
num_csi_reports
=
pucch
[
j
].
n_csi
;
fapi_nr_ul_config_request_pdu_t
*
pdu
=
lockGet_ul_config
(
mac
,
frameP
,
slotP
,
FAPI_NR_UL_CONFIG_TYPE_PUCCH
);
mac
->
nr_ue_emul_l1
.
active_uci_sfn_slot
=
NFAPI_SFNSLOT2HEX
(
frameP
,
slotP
);
if
(
mac
->
crnti
!=
rnti
=
mac
->
ra
.
t_crnti
)
abort
();
nr_ue_configure_pucch
(
mac
,
slotP
,
mac
->
crnti
,
// FIXME not sure this is valid for all pucch instances
...
...
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