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
40157242
Commit
40157242
authored
3 years ago
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a regression in UE (LCID loop)
parent
8cef72ef
x2_handle_sctp_shutdown
NRUE_usedlschparallel
NR_2port_CSIRS
NR_CSIRS_tomerge
NR_F1C_F1U_extensions
NR_RRCReconfiguration_BWP
NR_UE_SA
NR_UE_SSB_meas
NR_UE_reworking_UCI_procedures
NR_gNB_initial_MIB_fix
NR_new_ul_antennaports
NR_reworking_UL_antennaports
Test_SA_5GREC
bandwidth-testing
ci-add-sabox-support
ci-fix-module-ul-iperf
ci_nsa_2x2_implem
ci_test_nsa_2x2
ci_test_nsa_on_develop
ci_testinfra_as_code
ci_update_build_nasmesh
code-cleanup-20210716
debug-UL-5GRECORDS
develop
develop-NR_SA_F1AP_5GRECORDS
develop-NR_SA_F1AP_5GRECORDS-abs
develop-NR_SA_F1AP_5GRECORDS-lts
develop-NR_SA_F1AP_5GRECORDS_100M
develop-NSA_SA_fixes
develop-aw2sori
develop_fpga_ldpc
dongzhanyi-zte-develop1
episys-merge
fix-lte-ue-modem-in-docker-container
fix-physim-run-script-on-cluster
fix-retransmission-rbg
hack-bch-no-sched-sf-0
integration_2021_wk27
integration_2021_wk28
integration_2021_wk30
integration_2021_wk30_b
nfapi_nr_arch_mod
nr-dl-mimo-2layer
nr_improve_chanest
nr_ue_remove_high_speed_flag
phy-asan-fixes
scs_60_iisc
2021.w30
2021.w29
2021.w28
2021.w27
2021.w26
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+9
-8
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
40157242
...
@@ -1992,9 +1992,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
...
@@ -1992,9 +1992,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
// TO DO: Multiplex in the order defined by the logical channel prioritization
// TO DO: Multiplex in the order defined by the logical channel prioritization
for
(
lcid
=
UL_SCH_LCID_SRB1
;
for
(
lcid
=
UL_SCH_LCID_SRB1
;
lcid
<
MAX_LCID
;
lcid
++
)
{
lcid
<
MAX_LCID
;
lcid
++
)
{
lcid_buffer_occupancy_new
=
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
mac
->
crnti
,
eNB_index
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
);
if
(
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
mac
->
crnti
,
eNB_index
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
)
)
{
if
(
lcid_buffer_occupancy_new
)
{
buflen_remain
=
buflen_remain
=
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
LOG_D
(
NR_MAC
,
LOG_D
(
NR_MAC
,
...
@@ -2031,12 +2031,13 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
...
@@ -2031,12 +2031,13 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
num_sdus
++
;
num_sdus
++
;
}
}
/* Get updated BO after multiplexing this PDU */
lcid_buffer_occupancy_new
=
mac_rlc_get_buffer_occupancy_ind
(
module_idP
,
mac
->
crnti
,
eNB_index
,
frameP
,
subframe
,
ENB_FLAG_NO
,
lcid
);
buflen_remain
=
buflen_remain
=
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
}
}
}
}
}
}
// Generate ULSCH PDU
// Generate ULSCH PDU
if
(
num_sdus
>
0
)
{
if
(
num_sdus
>
0
)
{
...
@@ -2052,9 +2053,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
...
@@ -2052,9 +2053,9 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
0
,
// long_bsr
0
,
// long_bsr
0
,
// post_padding
0
,
// post_padding
buflen
);
// TBS in bytes
buflen
);
// TBS in bytes
}
}
else
{
else
return
0
;
return
0
;
}
// Padding: fill remainder of ULSCH with 0
// Padding: fill remainder of ULSCH with 0
if
(
buflen
-
payload_offset
>
0
){
if
(
buflen
-
payload_offset
>
0
){
...
...
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