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
zzha zzha
OpenXG-RAN
Commits
8363849c
Commit
8363849c
authored
Oct 26, 2020
by
Francesco Mani
Committed by
Robert Schmidt
Nov 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modification of TA update procedure
parent
fd3d49bb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
27 deletions
+21
-27
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+16
-24
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+2
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+1
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
8363849c
...
@@ -634,24 +634,15 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -634,24 +634,15 @@ void nr_schedule_ue_spec(module_id_t module_id,
NR_UE_info_t
*
UE_info
=
&
gNB_mac
->
UE_info
;
NR_UE_info_t
*
UE_info
=
&
gNB_mac
->
UE_info
;
const
int
CC_id
=
0
;
const
int
CC_id
=
0
;
/* calculate number of slots since last DL scheduling, since the scheduler is
* not called in every slot. */
const
NR_COMMON_channels_t
*
cc
=
gNB_mac
->
common_channels
;
const
NR_ServingCellConfigCommon_t
*
scc
=
cc
->
ServingCellConfigCommon
;
const
NR_TDD_UL_DL_Pattern_t
*
tdd_pattern
=
&
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
;
const
int
slot_diff
=
(
slot
%
num_slots_per_tdd
)
==
0
?
tdd_pattern
->
nrofUplinkSlots
+
1
:
1
;
NR_UE_list_t
*
UE_list
=
&
UE_info
->
list
;
NR_UE_list_t
*
UE_list
=
&
UE_info
->
list
;
for
(
int
UE_id
=
UE_list
->
head
;
UE_id
>=
0
;
UE_id
=
UE_list
->
next
[
UE_id
])
{
for
(
int
UE_id
=
UE_list
->
head
;
UE_id
>=
0
;
UE_id
=
UE_list
->
next
[
UE_id
])
{
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE_info
->
UE_sched_ctrl
[
UE_id
];
/* update TA and set ta_apply upon expiry. If such UE is not scheduled now,
/* update TA and set ta_apply every 10 frames.
* it will be by the preprocessor later. If we add the CE, ta_apply will be
* Possible improvement: take the periodicity from input file.
* reset */
* If such UE is not scheduled now, it will be by the preprocessor later.
if
(
sched_ctrl
->
ta_timer
>
0
)
* If we add the CE, ta_apply will be reset */
sched_ctrl
->
ta_timer
-=
slot_diff
;
if
(
frame
>=
(
sched_ctrl
->
ta_frame
+
10
)
%
1023
)
else
sched_ctrl
->
ta_apply
=
true
;
/* the timer is reset once TA CE is scheduled */
sched_ctrl
->
ta_apply
=
true
;
/* the timer is reset once TA CE is scheduled */
if
(
sched_ctrl
->
rbSize
<=
0
&&
!
get_softmodem_params
()
->
phy_test
)
if
(
sched_ctrl
->
rbSize
<=
0
&&
!
get_softmodem_params
()
->
phy_test
)
...
@@ -751,15 +742,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -751,15 +742,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
/* reserve space for timing advance of UE if necessary,
/* reserve space for timing advance of UE if necessary,
* nr_generate_dlsch_pdu() checks for ta_apply and add TA CE if necessary */
* nr_generate_dlsch_pdu() checks for ta_apply and add TA CE if necessary */
const
int
ta_len
=
(
sched_ctrl
->
ta_apply
)
?
2
:
0
;
const
int
ta_len
=
(
sched_ctrl
->
ta_apply
)
?
2
:
0
;
if
(
sched_ctrl
->
ta_apply
)
{
LOG_I
(
MAC
,
"%d.%2d UE %d TA scheduled, resetting timer to 100
\n
"
,
frame
,
slot
,
UE_id
);
sched_ctrl
->
ta_apply
=
false
;
sched_ctrl
->
ta_timer
=
100
;
}
/* Get RLC data TODO: remove random data retrieval */
/* Get RLC data TODO: remove random data retrieval */
int
header_length_total
=
0
;
int
header_length_total
=
0
;
...
@@ -803,7 +785,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -803,7 +785,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
sdu_length_total
+=
sdu_lengths
[
num_sdus
];
sdu_length_total
+=
sdu_lengths
[
num_sdus
];
header_length_last
=
1
+
1
+
(
sdu_lengths
[
num_sdus
]
>=
128
);
header_length_last
=
1
+
1
+
(
sdu_lengths
[
num_sdus
]
>=
128
);
header_length_total
+=
header_length_last
;
header_length_total
+=
header_length_last
;
num_sdus
++
;
num_sdus
++
;
//ue_sched_ctl->uplane_inactivity_timer = 0;
//ue_sched_ctl->uplane_inactivity_timer = 0;
...
@@ -867,6 +848,17 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -867,6 +848,17 @@ void nr_schedule_ue_spec(module_id_t module_id,
retInfo
->
mcs
=
sched_ctrl
->
mcs
;
retInfo
->
mcs
=
sched_ctrl
->
mcs
;
retInfo
->
numDmrsCdmGrpsNoData
=
sched_ctrl
->
numDmrsCdmGrpsNoData
;
retInfo
->
numDmrsCdmGrpsNoData
=
sched_ctrl
->
numDmrsCdmGrpsNoData
;
// ta command is sent, values are reset
if
(
sched_ctrl
->
ta_apply
)
{
sched_ctrl
->
ta_apply
=
false
;
sched_ctrl
->
ta_frame
=
frame
;
LOG_D
(
MAC
,
"%d.%2d UE %d TA scheduled, resetting TA frame
\n
"
,
frame
,
slot
,
UE_id
);
}
T
(
T_GNB_MAC_DL_PDU_WITH_DATA
,
T_INT
(
module_id
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T
(
T_GNB_MAC_DL_PDU_WITH_DATA
,
T_INT
(
module_id
),
T_INT
(
CC_id
),
T_INT
(
rnti
),
T_INT
(
frame
),
T_INT
(
slot
),
T_INT
(
current_harq_pid
),
T_BUFFER
(
buf
,
TBS
));
T_INT
(
frame
),
T_INT
(
slot
),
T_INT
(
current_harq_pid
),
T_BUFFER
(
buf
,
TBS
));
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
8363849c
...
@@ -1784,9 +1784,9 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP){
...
@@ -1784,9 +1784,9 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP){
memset
((
void
*
)
&
UE_info
->
UE_sched_ctrl
[
UE_id
],
memset
((
void
*
)
&
UE_info
->
UE_sched_ctrl
[
UE_id
],
0
,
0
,
sizeof
(
NR_UE_sched_ctrl_t
));
sizeof
(
NR_UE_sched_ctrl_t
));
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_frame
=
0
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_timer
=
100
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_update
=
31
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_update
=
31
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_apply
=
false
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
ul_rssi
=
0
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
ul_rssi
=
0
;
UE_info
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
=
(
NR_sched_pucch
**
)
malloc
(
num_slots_ul
*
sizeof
(
NR_sched_pucch
*
));
UE_info
->
UE_sched_ctrl
[
UE_id
].
sched_pucch
=
(
NR_sched_pucch
**
)
malloc
(
num_slots_ul
*
sizeof
(
NR_sched_pucch
*
));
for
(
int
s
=
0
;
s
<
num_slots_ul
;
s
++
)
for
(
int
s
=
0
;
s
<
num_slots_ul
;
s
++
)
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
8363849c
...
@@ -361,6 +361,8 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
...
@@ -361,6 +361,8 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
current_rnti
,
current_rnti
,
UE_id
,
UE_id
,
ra
->
rnti
);
ra
->
rnti
);
// re-initialize ta update variables afrer RA procedure completion
UE_info
->
UE_sched_ctrl
[
UE_id
].
ta_frame
=
frameP
;
}
}
return
;
return
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
8363849c
...
@@ -372,7 +372,7 @@ typedef struct {
...
@@ -372,7 +372,7 @@ typedef struct {
/// Retransmission-related information
/// Retransmission-related information
NR_UE_ret_info_t
retInfo
[
NR_MAX_NB_HARQ_PROCESSES
];
NR_UE_ret_info_t
retInfo
[
NR_MAX_NB_HARQ_PROCESSES
];
uint16_t
ta_
timer
;
uint16_t
ta_
frame
;
int16_t
ta_update
;
int16_t
ta_update
;
bool
ta_apply
;
bool
ta_apply
;
uint8_t
tpc0
;
uint8_t
tpc0
;
...
...
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