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
spbro
OpenXG-RAN
Commits
3380f1a4
Commit
3380f1a4
authored
Jan 11, 2021
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
send data from MAC to PHY when NDI toggles
parent
c9dcff3d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/mac_defs.h
+2
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+4
-3
No files found.
openair2/LAYER2/NR_MAC_UE/mac_defs.h
View file @
3380f1a4
...
@@ -245,6 +245,8 @@ typedef struct {
...
@@ -245,6 +245,8 @@ typedef struct {
uint8_t
generate_nr_prach
;
uint8_t
generate_nr_prach
;
/// SSB index from MIB decoding
/// SSB index from MIB decoding
uint8_t
mib_ssb
;
uint8_t
mib_ssb
;
/// Last NDI of UL HARQ processes
uint8_t
UL_ndi
[
NR_MAX_HARQ_PROCESSES
];
//// FAPI-like interface message
//// FAPI-like interface message
fapi_nr_ul_config_request_t
*
ul_config_request
;
fapi_nr_ul_config_request_t
*
ul_config_request
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
3380f1a4
...
@@ -1247,7 +1247,6 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
...
@@ -1247,7 +1247,6 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
ulcfg_pdu
->
pusch_config_pdu
.
dmrs_config_type
=
dmrs_config_type
;
ulcfg_pdu
->
pusch_config_pdu
.
dmrs_config_type
=
dmrs_config_type
;
ulcfg_pdu
->
pusch_config_pdu
.
num_dmrs_cdm_grps_no_data
=
1
;
ulcfg_pdu
->
pusch_config_pdu
.
num_dmrs_cdm_grps_no_data
=
1
;
ulcfg_pdu
->
pusch_config_pdu
.
nrOfLayers
=
1
;
ulcfg_pdu
->
pusch_config_pdu
.
nrOfLayers
=
1
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
=
0
;
ulcfg_pdu
->
pusch_config_pdu
.
pdu_bit_map
=
PUSCH_PDU_BITMAP_PUSCH_DATA
;
ulcfg_pdu
->
pusch_config_pdu
.
pdu_bit_map
=
PUSCH_PDU_BITMAP_PUSCH_DATA
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_ptrs
.
ptrs_time_density
=
ptrs_time_density
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_ptrs
.
ptrs_time_density
=
ptrs_time_density
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_ptrs
.
ptrs_freq_density
=
ptrs_freq_density
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_ptrs
.
ptrs_freq_density
=
ptrs_freq_density
;
...
@@ -1312,7 +1311,8 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
...
@@ -1312,7 +1311,8 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
TBS_bytes
=
TBS
/
8
;
TBS_bytes
=
TBS
/
8
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
tb_size
=
TBS_bytes
;
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
tb_size
=
TBS_bytes
;
if
(
IS_SOFTMODEM_NOS1
){
// Push data from MAC to PHY only when NDI toggles
if
(
IS_SOFTMODEM_NOS1
&&
(
mac
->
UL_ndi
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
!=
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
))
{
// Getting IP traffic to be transmitted
// Getting IP traffic to be transmitted
data_existing
=
nr_ue_get_sdu
(
mod_id
,
data_existing
=
nr_ue_get_sdu
(
mod_id
,
cc_id
,
cc_id
,
...
@@ -1323,6 +1323,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
...
@@ -1323,6 +1323,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
TBS_bytes
,
TBS_bytes
,
&
access_mode
);
&
access_mode
);
}
}
mac
->
UL_ndi
[
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
harq_process_id
]
=
ulcfg_pdu
->
pusch_config_pdu
.
pusch_data
.
new_data_indicator
;
//Random traffic to be transmitted if there is no IP traffic available for this Tx opportunity
//Random traffic to be transmitted if there is no IP traffic available for this Tx opportunity
if
(
!
IS_SOFTMODEM_NOS1
||
!
data_existing
)
{
if
(
!
IS_SOFTMODEM_NOS1
||
!
data_existing
)
{
...
...
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