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
597ddf75
Commit
597ddf75
authored
4 years ago
by
Mario Hudon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged in some FR2 fixes from Rakesh
parent
384fc315
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
8 deletions
+22
-8
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+11
-4
openair1/PHY/MODULATION/slot_fep_nr.c
openair1/PHY/MODULATION/slot_fep_nr.c
+8
-2
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+1
-0
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/config_ue.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+1
-1
No files found.
executables/nr-uesoftmodem.c
View file @
597ddf75
...
...
@@ -691,9 +691,9 @@ int main( int argc, char **argv ) {
nr_init_frame_parms_ue
(
frame_parms
[
CC_id
],
nrUE_config
,
NORMAL
);
// Overwrite DL frequency (for FR2 testing)
if
(
downlink_frequency
[
0
][
0
]
!=
0
)
frame_parms
[
CC_id
]
->
dl_CarrierFreq
=
downlink_frequency
[
0
][
0
];
//
if (downlink_frequency[0][0]!=0)
//
frame_parms[CC_id]->dl_CarrierFreq = downlink_frequency[0][0];
init_nr_ue_vars
(
UE
[
CC_id
],
frame_parms
[
CC_id
],
0
,
abstraction_flag
);
UE
[
CC_id
]
->
mac_enabled
=
1
;
...
...
@@ -752,7 +752,14 @@ int main( int argc, char **argv ) {
UE
[
CC_id
]
->
N_TA_offset
=
(
int
)(
N_TA_offset
*
factor
);
LOG_I
(
PHY
,
"UE %d Setting N_TA_offset to %d samples (factor %f, UL Freq %lu, N_RB %d)
\n
"
,
UE
[
CC_id
]
->
Mod_id
,
UE
[
CC_id
]
->
N_TA_offset
,
factor
,
UE
[
CC_id
]
->
frame_parms
.
ul_CarrierFreq
,
N_RB
);
}
}
// Overwrite DL frequency (for FR2 testing)
if
(
downlink_frequency
[
0
][
0
]
!=
0
){
frame_parms
[
CC_id
]
->
dl_CarrierFreq
=
downlink_frequency
[
0
][
0
];
if
(
frame_parms
[
CC_id
]
->
frame_type
==
TDD
)
frame_parms
[
CC_id
]
->
ul_CarrierFreq
=
downlink_frequency
[
0
][
0
];
}
}
// printf("tx_max_power = %d -> amp %d\n",tx_max_power[0],get_tx_amp(tx_max_poHwer,tx_max_power));
init_openair0
();
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/MODULATION/slot_fep_nr.c
View file @
597ddf75
...
...
@@ -461,9 +461,15 @@ int nr_slot_fep_ul(NR_DL_FRAME_PARMS *frame_parms,
dft
(
dftsize
,(
int16_t
*
)
&
tmp_dft_in
,
(
int16_t
*
)
&
rxdataF
[
symbol
*
frame_parms
->
ofdm_symbol_size
],
1
);
}
else
dft
(
dftsize
,(
int16_t
*
)
&
rxdata
[
rxdata_offset
-
sample_offset
],
else
{
//dft(dftsize,(int16_t *)&rxdata[rxdata_offset-sample_offset],
// (int16_t *)&rxdataF[symbol * frame_parms->ofdm_symbol_size], 1);
memcpy
((
void
*
)
tmp_dft_in
,
(
void
*
)
&
rxdata
[
rxdata_offset
-
sample_offset
],
(
frame_parms
->
ofdm_symbol_size
)
*
sizeof
(
int
));
dft
(
dftsize
,(
int16_t
*
)
&
tmp_dft_in
,
(
int16_t
*
)
&
rxdataF
[
symbol
*
frame_parms
->
ofdm_symbol_size
],
1
);
}
// clear DC carrier from OFDM symbols
rxdataF
[
symbol
*
frame_parms
->
ofdm_symbol_size
]
=
0
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
597ddf75
...
...
@@ -1151,6 +1151,7 @@ static void build_ro_list(NR_ServingCellConfigCommon_t *scc) {
prach_occasion_p
->
frame
=
frame
;
prach_occasion_p
->
slot
=
slot
;
prach_occasion_p
->
format
=
format
;
printf
(
"
\n
prach_conf_period_idx : %d, .nb_of_prach_occasion : %d
\n
"
,
prach_conf_period_idx
,
prach_assoc_pattern
.
prach_conf_period_list
[
prach_conf_period_idx
].
nb_of_prach_occasion
);
prach_assoc_pattern
.
prach_conf_period_list
[
prach_conf_period_idx
].
nb_of_prach_occasion
++
;
LOG_D
(
MAC
,
"Adding a PRACH occasion: fdm %d, frame %d, slot-symbol %d-%d, occ_in_time-occ_in-freq %d-%d, nb ROs in conf period %d, for this slot: RO# in time %d, RO# in freq %d
\n
"
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/config_ue.c
View file @
597ddf75
...
...
@@ -205,7 +205,7 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
uint16_t
band
;
int32_t
offset
;
get_band
((
cfg
->
carrier_config
.
dl_frequency
)
*
1000
,
get_band
((
uint64_t
)(
cfg
->
carrier_config
.
dl_frequency
)
*
1000
,
&
band
,
&
offset
,
&
frame_type
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
597ddf75
...
...
@@ -125,7 +125,7 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
uint16_t
band
;
int32_t
offset
;
get_band
((
cfg
->
carrier_config
.
dl_frequency
.
value
)
*
1000
,
get_band
((
uint64_t
)(
cfg
->
carrier_config
.
dl_frequency
.
value
)
*
1000
,
&
band
,
&
offset
,
&
frame_type
);
...
...
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