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
f87c9794
Commit
f87c9794
authored
Dec 11, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new mac array for tdd-beam association in FR2
parent
908c8999
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
19 deletions
+17
-19
executables/nr-ru.c
executables/nr-ru.c
+1
-1
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
+1
-1
openair1/PHY/INIT/nr_init_ru.c
openair1/PHY/INIT/nr_init_ru.c
+0
-1
openair1/SCHED_NR/phy_frame_config_nr.c
openair1/SCHED_NR/phy_frame_config_nr.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+12
-10
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+0
-4
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+2
-1
No files found.
executables/nr-ru.c
View file @
f87c9794
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
View file @
f87c9794
openair1/PHY/INIT/nr_init_ru.c
View file @
f87c9794
...
...
@@ -152,7 +152,6 @@ int nr_phy_init_RU(RU_t *ru) {
ru
->
common
.
beam_id
[
i
]
=
(
uint8_t
*
)
malloc16_clear
(
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
*
sizeof
(
uint8_t
));
memset
(
ru
->
common
.
beam_id
[
i
],
255
,
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
);
}
}
// !=IF5
ru
->
common
.
sync_corr
=
(
uint32_t
*
)
malloc16_clear
(
LTE_NUMBER_OF_SUBFRAMES_PER_FRAME
*
sizeof
(
uint32_t
)
*
fp
->
samples_per_subframe_wCP
);
...
...
openair1/SCHED_NR/phy_frame_config_nr.c
View file @
f87c9794
...
...
@@ -179,7 +179,7 @@ int set_tdd_config_nr( nfapi_nr_config_request_scf_t *cfg,
LOG_E(PHY,"set_tdd_configuration_nr: additionnal tdd configuration 2 is not supported for tdd configuration \n");
return (-1);
}*/
return
(
0
);
return
(
nb_periods_per_frame
);
}
/*******************************************************************
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
f87c9794
...
...
@@ -309,17 +309,19 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
}
if
(
cfg
->
cell_config
.
frame_duplex_type
.
value
==
TDD
){
LOG_I
(
MAC
,
"Setting TDD configuration period to %d
\n
"
,
cfg
->
tdd_table
.
tdd_period
.
value
);
int
return_tdd
=
set_tdd_config_nr
(
cfg
,
int
periods_per_frame
=
set_tdd_config_nr
(
cfg
,
scc
->
uplinkConfigCommon
->
frequencyInfoUL
->
scs_SpecificCarrierList
.
list
.
array
[
0
]
->
subcarrierSpacing
,
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofDownlinkSlots
,
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofDownlinkSymbols
,
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofUplinkSlots
,
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
.
nrofUplinkSymbols
);
if
(
return_tdd
!=
0
)
if
(
periods_per_frame
<
0
)
LOG_E
(
MAC
,
"TDD configuration can not be done
\n
"
);
else
else
{
LOG_I
(
MAC
,
"TDD has been properly configurated
\n
"
);
RC
.
nrmac
[
Mod_idP
]
->
tdd_beam_association
=
(
uint8_t
*
)
malloc16
(
periods_per_frame
*
sizeof
(
uint8_t
));
}
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
f87c9794
...
...
@@ -296,10 +296,6 @@ NR_SearchSpace_t *get_searchspace(
NR_BWP_Downlink_t
*
bwp
,
NR_SearchSpace__searchSpaceType_PR
target_ss
);
void
find_aggregation_candidates
(
uint8_t
*
aggregation_level
,
uint8_t
*
nr_of_candidates
,
NR_SearchSpace_t
*
ss
);
long
get_K2
(
NR_BWP_Uplink_t
*
ubwp
,
int
time_domain_assignment
,
int
mu
);
void
nr_save_pusch_fields
(
const
NR_ServingCellConfigCommon_t
*
scc
,
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
f87c9794
...
...
@@ -547,7 +547,8 @@ typedef struct gNB_MAC_INST_s {
time_stats_t
schedule_pch
;
/// CCE lists
int
cce_list
[
MAX_NUM_BWP
][
MAX_NUM_CORESET
][
MAX_NUM_CCE
];
/// list of allocated beams per period
uint8_t
*
tdd_beam_association
;
/// DL preprocessor for differentiated scheduling
nr_pp_impl_dl
pre_processor_dl
;
/// UL preprocessor for differentiated scheduling
...
...
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