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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
5ac703b5
Commit
5ac703b5
authored
Nov 28, 2024
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code cleanup
Add const to function input pointer.
parent
054506f5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
executables/nr-ue.c
executables/nr-ue.c
+4
-3
openair1/SCHED_NR_UE/phy_frame_config_nr.h
openair1/SCHED_NR_UE/phy_frame_config_nr.h
+1
-1
openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c
openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c
+6
-6
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+1
-1
No files found.
executables/nr-ue.c
View file @
5ac703b5
...
...
@@ -443,6 +443,7 @@ static void UE_synch(void *arg) {
static
void
RU_write
(
nr_rxtx_thread_data_t
*
rxtxD
,
bool
sl_tx_action
)
{
PHY_VARS_NR_UE
*
UE
=
rxtxD
->
UE
;
const
fapi_nr_config_request_t
*
cfg
=
&
UE
->
nrUE_config
;
const
UE_nr_rxtx_proc_t
*
proc
=
&
rxtxD
->
proc
;
NR_DL_FRAME_PARMS
*
fp
=
&
UE
->
frame_parms
;
...
...
@@ -466,10 +467,10 @@ static void RU_write(nr_rxtx_thread_data_t *rxtxD, bool sl_tx_action)
flags
=
TX_BURST_START_AND_END
;
}
else
{
int
slots_frame
=
fp
->
slots_per_frame
;
int
curr_slot
=
nr_ue_slot_select
(
&
UE
->
nrUE_confi
g
,
slot
);
int
curr_slot
=
nr_ue_slot_select
(
cf
g
,
slot
);
if
(
curr_slot
!=
NR_DOWNLINK_SLOT
)
{
int
next_slot
=
nr_ue_slot_select
(
&
UE
->
nrUE_confi
g
,
(
slot
+
1
)
%
slots_frame
);
int
prev_slot
=
nr_ue_slot_select
(
&
UE
->
nrUE_confi
g
,
(
slot
+
slots_frame
-
1
)
%
slots_frame
);
int
next_slot
=
nr_ue_slot_select
(
cf
g
,
(
slot
+
1
)
%
slots_frame
);
int
prev_slot
=
nr_ue_slot_select
(
cf
g
,
(
slot
+
slots_frame
-
1
)
%
slots_frame
);
if
(
prev_slot
==
NR_DOWNLINK_SLOT
)
flags
=
TX_BURST_START
;
else
if
(
next_slot
==
NR_DOWNLINK_SLOT
)
...
...
openair1/SCHED_NR_UE/phy_frame_config_nr.h
View file @
5ac703b5
...
...
@@ -72,7 +72,7 @@ int slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_slot);
* @param nr_slot : slot number
@returns int : downlink, uplink or mixed slot type */
int
nr_ue_slot_select
(
fapi_nr_config_request_t
*
cfg
,
int
nr_slot
);
int
nr_ue_slot_select
(
const
fapi_nr_config_request_t
*
cfg
,
int
nr_slot
);
/** \brief This function frees tdd configuration for nr
* @param frame_parms NR DL Frame parameters
...
...
openair1/SCHED_NR_UE/phy_frame_config_nr_ue.c
View file @
5ac703b5
...
...
@@ -39,7 +39,7 @@
*
*********************************************************************/
int
nr_ue_slot_select
(
fapi_nr_config_request_t
*
cfg
,
int
nr_slot
)
int
nr_ue_slot_select
(
const
fapi_nr_config_request_t
*
cfg
,
int
nr_slot
)
{
if
(
cfg
->
cell_config
.
frame_duplex_type
==
FDD
)
return
NR_UPLINK_SLOT
|
NR_DOWNLINK_SLOT
;
...
...
@@ -47,7 +47,7 @@ int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_slot)
int
period
=
cfg
->
tdd_table_1
.
tdd_period_in_slots
+
(
cfg
->
tdd_table_2
?
cfg
->
tdd_table_2
->
tdd_period_in_slots
:
0
);
int
rel_slot
=
nr_slot
%
period
;
fapi_nr_tdd_table_t
*
tdd_table
=
&
cfg
->
tdd_table_1
;
const
fapi_nr_tdd_table_t
*
tdd_table
=
&
cfg
->
tdd_table_1
;
if
(
cfg
->
tdd_table_2
&&
rel_slot
>=
tdd_table
->
tdd_period_in_slots
)
{
rel_slot
-=
tdd_table
->
tdd_period_in_slots
;
tdd_table
=
cfg
->
tdd_table_2
;
...
...
@@ -56,7 +56,7 @@ int nr_ue_slot_select(fapi_nr_config_request_t *cfg, int nr_slot)
if
(
tdd_table
->
max_tdd_periodicity_list
==
NULL
)
// this happens before receiving TDD configuration
return
NR_DOWNLINK_SLOT
;
fapi_nr_max_tdd_periodicity_t
*
current_slot
=
&
tdd_table
->
max_tdd_periodicity_list
[
rel_slot
];
const
fapi_nr_max_tdd_periodicity_t
*
current_slot
=
&
tdd_table
->
max_tdd_periodicity_list
[
rel_slot
];
// if the 1st symbol is UL the whole slot is UL
if
(
current_slot
->
max_num_of_symbol_per_slot_list
[
0
].
slot_config
==
1
)
...
...
@@ -109,7 +109,7 @@ uint8_t sl_determine_if_sidelink_slot(uint8_t sl_startsym, uint8_t sl_lensym, ui
* Mixed Slot is a sidelink slot if the uplink symbols in Mixed slot
* overlaps with Sidelink start symbol and number of symbols.
*/
int
sl_nr_ue_slot_select
(
sl_nr_phy_config_request_t
*
cfg
,
int
slot
,
uint8_t
frame_duplex_type
)
int
sl_nr_ue_slot_select
(
const
sl_nr_phy_config_request_t
*
cfg
,
int
slot
,
uint8_t
frame_duplex_type
)
{
int
ul_sym
=
0
,
slot_type
=
0
;
...
...
@@ -122,9 +122,9 @@ int sl_nr_ue_slot_select(sl_nr_phy_config_request_t *cfg, int slot, uint8_t fram
int
period
=
cfg
->
tdd_table
.
tdd_period_in_slots
;
int
rel_slot
=
slot
%
period
;
fapi_nr_tdd_table_t
*
tdd_table
=
&
cfg
->
tdd_table
;
const
fapi_nr_tdd_table_t
*
tdd_table
=
&
cfg
->
tdd_table
;
fapi_nr_max_tdd_periodicity_t
*
current_slot
=
&
tdd_table
->
max_tdd_periodicity_list
[
rel_slot
];
const
fapi_nr_max_tdd_periodicity_t
*
current_slot
=
&
tdd_table
->
max_tdd_periodicity_list
[
rel_slot
];
for
(
int
symbol_count
=
0
;
symbol_count
<
NR_NUMBER_OF_SYMBOLS_PER_SLOT
;
symbol_count
++
)
{
if
(
current_slot
->
max_num_of_symbol_per_slot_list
[
symbol_count
].
slot_config
==
1
)
{
...
...
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
5ac703b5
...
...
@@ -447,7 +447,7 @@ uint8_t sl_determine_sci_1a_len(uint16_t *num_subchannels,
* @param nr_slot : slot number
* @param frame duplex type : Frame type
@returns int : 0 or Sidelink slot type */
int
sl_nr_ue_slot_select
(
sl_nr_phy_config_request_t
*
cfg
,
int
nr_slot
,
uint8_t
frame_duplex_type
);
int
sl_nr_ue_slot_select
(
const
sl_nr_phy_config_request_t
*
cfg
,
int
nr_slot
,
uint8_t
frame_duplex_type
);
void
nr_ue_sidelink_scheduler
(
nr_sidelink_indication_t
*
sl_ind
,
NR_UE_MAC_INST_t
*
mac
);
...
...
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