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
Michael Black
OpenXG-RAN
Commits
e8c74760
Commit
e8c74760
authored
3 years ago
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix to allow traffic to be put in msg3
parent
b6ef23a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+4
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+2
-2
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
e8c74760
...
...
@@ -952,12 +952,14 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
}
LOG_D
(
NR_MAC
,
"Flipping NDI for harq_id %d (Msg3)
\n
"
,
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
);
mac
->
UL_ndi
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
=
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
;
mac
->
first_ul_tx
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
=
0
;
mac
->
first_ul_tx
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
=
0
;
}
else
{
if
((
mac
->
UL_ndi
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
!=
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
||
mac
->
first_ul_tx
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
==
1
)
&&
((
get_softmodem_params
()
->
phy_test
==
1
)
||
(
ra
->
ra_state
==
RA_SUCCEEDED
))){
((
get_softmodem_params
()
->
phy_test
==
1
)
||
(
ra
->
ra_state
==
RA_SUCCEEDED
)
||
(
ra
->
ra_state
==
WAIT_RAR
&&
ra
->
cfra
))){
// Getting IP traffic to be transmitted
nr_ue_get_sdu
(
mod_id
,
frame_tx
,
slot_tx
,
gNB_index
,
ulsch_input_buffer
,
TBS_bytes
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
e8c74760
...
...
@@ -487,7 +487,7 @@ void nr_csi_meas_reporting(int Mod_idP,
// preparation is done in first slot of tdd period
if
(
frame
%
(
period
/
n_slots_frame
)
!=
offset
/
n_slots_frame
)
continue
;
LOG_
I
(
MAC
,
"CSI reporting in frame %d slot %d
\n
"
,
frame
,
sched_slot
);
LOG_
D
(
MAC
,
"CSI reporting in frame %d slot %d
\n
"
,
frame
,
sched_slot
);
const
NR_PUCCH_CSI_Resource_t
*
pucchcsires
=
csirep
->
reportConfigType
.
choice
.
periodic
->
pucch_CSI_ResourceList
.
list
.
array
[
0
];
const
NR_PUCCH_ResourceSet_t
*
pucchresset
=
pucch_Config
->
resourceSetToAddModList
->
list
.
array
[
1
];
// set with formats >1
...
...
@@ -986,7 +986,7 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
// verify if report with current id has been scheduled for this frame and slot
if
((
n_slots_frame
*
frame
+
slot
-
offset
)
%
period
==
0
)
{
reportQuantity_type
=
UE_info
->
csi_report_template
[
UE_id
][
csi_report_id
].
reportQuantity_type
;
LOG_
I
(
MAC
,
"SFN/SF:%d/%d reportQuantity type = %d
\n
"
,
frame
,
slot
,
reportQuantity_type
);
LOG_
D
(
MAC
,
"SFN/SF:%d/%d reportQuantity type = %d
\n
"
,
frame
,
slot
,
reportQuantity_type
);
switch
(
reportQuantity_type
){
case
NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP
:
evaluate_rsrp_report
(
UE_info
,
sched_ctrl
,
UE_id
,
csi_report_id
,
payload
,
&
cumul_bits
,
reportQuantity_type
);
...
...
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