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
Michael Black
OpenXG-RAN
Commits
0c6b5101
Commit
0c6b5101
authored
5 years ago
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge between FR2 and RRC branches
parent
18d717ea
Branches unavailable
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
2023.w07
2023.w06
2023.w05
2023.w03
2023.w02
2022.42
2022.41
2022.w51
2022.w50
2022.w49
2022.w48
2022.w47
2022.w46
2022.w45
2022.w43
2022.w42
2022.w42b
2022.w41
2022.w40
2022.w39
2022.w38
2022.w37
2022.w37b
2022.w36
2022.w35
2022.w33
2022.w32
2022.w31
2022.w31b
2022.w30
2022.w29
2022.w26
2022.w25
2022.w24
2022.w24b
2022.w23
2022.w22
2022.w21
2022.w20
2022.w19
2022.w18
2022.w17
2022.w15
2022.w15b
2022.w14a
2022.w13
2022.w13b
2022.w13a
2022.w12
2022.w10
2022.w09
2022.w09b
2022.w08
2022.w08b
2022.w07
2022.w07b
2022.w06
2022.w06a
2022.w05
2022.w05b
2022.w03_hotfix
2022.w03_b
2022.w02
2022.w01
2021.wk46
2021.wk14_a
2021.wk13_d
2021.wk13_c
2021.w51_c
2021.w51_a
2021.w50_a
2021.w49_b
2021.w49_a
2021.w48
2021.w47
2021.w46
2021.w46-powder
2021.w45
2021.w45_b
2021.w44
2021.w43
2021.w42
2021.w37
2021.w36
2021.w35
2021.w34
2021.w33
2021.w32
2021.w31
2021.w30
2021.w29
2021.w28
2021.w27
2021.w26
2021.w25
2021.w24
2021.w23
2021.w22
2021.w20
2021.w19
2021.w18_b
2021.w18_a
2021.w17_b
2021.w16
2021.w15
2021.w14
2021.w13_a
2021.w12
2021.w11
2021.w10
2021.w09
2021.w08
2021.w06
2021.w05
2021.w04
2021.w02
2020.w51_2
2020.w51
2020.w50
2020.w49
2020.w48_2
2020.w48
2020.w47
2020.w46_2
2020.w46
2020.w45_2
2020.w45
2020.w44
2020.w42_2
2020.w42
2020.w41
2020.w39
2020.w38
2020.w37
2020.w36
2020.w34
2020.w33
2020.w31
2020.w30
2020.w29
2020.w28
2020.w26
2020.w25
2020.w24
2020.w23
2020.w22
2020.w19
2020.w17
2020.w16
2020.w15
setparam
flexran-eol
benetel_phase_rotation
benetel_gnb_rel_2.0
benetel_gnb_rel_1.0
benetel_enb_rel_2.0
benetel_enb_rel_1.0
No related merge requests found
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
364 additions
and
35 deletions
+364
-35
executables/nr-ru.c
executables/nr-ru.c
+7
-0
executables/nr-softmodem-common.h
executables/nr-softmodem-common.h
+1
-1
executables/nr-softmodem.c
executables/nr-softmodem.c
+1
-1
executables/nr-ue.c
executables/nr-ue.c
+7
-3
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+10
-2
executables/nr-uesoftmodem.h
executables/nr-uesoftmodem.h
+2
-2
openair1/PHY/INIT/nr_init_ue.c
openair1/PHY/INIT/nr_init_ue.c
+4
-4
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+10
-3
openair1/PHY/MODULATION/slot_fep_nr.c
openair1/PHY/MODULATION/slot_fep_nr.c
+2
-2
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+3
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SCHED_UE/phy_procedures_lte_ue.c
+1
-1
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlschsim.c
+1
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+5
-3
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-2
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+1
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
+6
-5
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
+299
-0
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-softmodem.h
+1
-1
No files found.
executables/nr-ru.c
View file @
0c6b5101
...
@@ -1098,6 +1098,13 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
...
@@ -1098,6 +1098,13 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
}
else
{
}
else
{
AssertFatal
(
0
==
1
,
"N_RB %d not yet supported for numerology %d
\n
"
,
N_RB
,
mu
);
AssertFatal
(
0
==
1
,
"N_RB %d not yet supported for numerology %d
\n
"
,
N_RB
,
mu
);
}
}
}
else
if
(
mu
==
NR_MU_3
)
{
if
(
N_RB
==
66
)
{
cfg
->
sample_rate
=
122.88e6
;
cfg
->
samples_per_frame
=
1228800
;
cfg
->
tx_bw
=
100e6
;
cfg
->
rx_bw
=
100e6
;
}
}
else
{
}
else
{
AssertFatal
(
0
==
1
,
"Numerology %d not supported for the moment
\n
"
,
mu
);
AssertFatal
(
0
==
1
,
"Numerology %d not supported for the moment
\n
"
,
mu
);
}
}
...
...
This diff is collapsed.
Click to expand it.
executables/nr-softmodem-common.h
View file @
0c6b5101
...
@@ -127,7 +127,7 @@ extern pthread_mutex_t sync_mutex;
...
@@ -127,7 +127,7 @@ extern pthread_mutex_t sync_mutex;
extern
int
sync_var
;
extern
int
sync_var
;
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
extern
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
extern
int
rx_input_level_dBm
;
extern
int
rx_input_level_dBm
;
...
...
This diff is collapsed.
Click to expand it.
executables/nr-softmodem.c
View file @
0c6b5101
...
@@ -113,7 +113,7 @@ int single_thread_flag=1;
...
@@ -113,7 +113,7 @@ int single_thread_flag=1;
static
int8_t
threequarter_fs
=
0
;
static
int8_t
threequarter_fs
=
0
;
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
//Temp fix for inexisting NR upper layer
//Temp fix for inexisting NR upper layer
...
...
This diff is collapsed.
Click to expand it.
executables/nr-ue.c
View file @
0c6b5101
...
@@ -170,7 +170,6 @@ static void UE_synch(void *arg) {
...
@@ -170,7 +170,6 @@ static void UE_synch(void *arg) {
UE
->
is_synchronized
=
0
;
UE
->
is_synchronized
=
0
;
if
(
UE
->
UE_scan
==
0
)
{
if
(
UE
->
UE_scan
==
0
)
{
LOG_I
(
PHY
,
"[SCHED][UE] Check absolute frequency DL %"
PRIu64
", UL %"
PRIu64
" (oai_exit %d, rx_num_channels %d)
\n
"
,
LOG_I
(
PHY
,
"[SCHED][UE] Check absolute frequency DL %"
PRIu64
", UL %"
PRIu64
" (oai_exit %d, rx_num_channels %d)
\n
"
,
UE
->
frame_parms
.
dl_CarrierFreq
,
UE
->
frame_parms
.
ul_CarrierFreq
,
UE
->
frame_parms
.
dl_CarrierFreq
,
UE
->
frame_parms
.
ul_CarrierFreq
,
oai_exit
,
openair0_cfg
[
0
].
rx_num_channels
);
oai_exit
,
openair0_cfg
[
0
].
rx_num_channels
);
...
@@ -292,6 +291,12 @@ static void UE_synch(void *arg) {
...
@@ -292,6 +291,12 @@ static void UE_synch(void *arg) {
openair0_cfg
[
UE
->
rf_map
.
card
].
tx_bw
=
10.0e6
;
openair0_cfg
[
UE
->
rf_map
.
card
].
tx_bw
=
10.0e6
;
// openair0_cfg[0].rx_gain[0] -= 0;
// openair0_cfg[0].rx_gain[0] -= 0;
break
;
break
;
case
66
:
openair0_cfg
[
UE
->
rf_map
.
card
].
sample_rate
=
122.88e6
;
openair0_cfg
[
UE
->
rf_map
.
card
].
rx_bw
=
100.e6
;
openair0_cfg
[
UE
->
rf_map
.
card
].
tx_bw
=
100.e6
;
break
;
}
}
if
(
UE
->
mode
!=
loop_through_memory
)
{
if
(
UE
->
mode
!=
loop_through_memory
)
{
...
@@ -610,7 +615,6 @@ void *UE_thread(void *arg) {
...
@@ -610,7 +615,6 @@ void *UE_thread(void *arg) {
openair0_timestamp
timestamp
;
openair0_timestamp
timestamp
;
void
*
rxp
[
NB_ANTENNAS_RX
],
*
txp
[
NB_ANTENNAS_TX
];
void
*
rxp
[
NB_ANTENNAS_RX
],
*
txp
[
NB_ANTENNAS_TX
];
int
start_rx_stream
=
0
;
int
start_rx_stream
=
0
;
const
uint16_t
table_sf_slot
[
20
]
=
{
0
,
0
,
1
,
1
,
2
,
2
,
3
,
3
,
4
,
4
,
5
,
5
,
6
,
6
,
7
,
7
,
8
,
8
,
9
,
9
};
AssertFatal
(
0
==
openair0_device_load
(
&
(
UE
->
rfdevice
),
&
openair0_cfg
[
0
]),
""
);
AssertFatal
(
0
==
openair0_device_load
(
&
(
UE
->
rfdevice
),
&
openair0_cfg
[
0
]),
""
);
UE
->
rfdevice
.
host_type
=
RAU_HOST
;
UE
->
rfdevice
.
host_type
=
RAU_HOST
;
AssertFatal
(
UE
->
rfdevice
.
trx_start_func
(
&
UE
->
rfdevice
)
==
0
,
"Could not start the device
\n
"
);
AssertFatal
(
UE
->
rfdevice
.
trx_start_func
(
&
UE
->
rfdevice
)
==
0
,
"Could not start the device
\n
"
);
...
@@ -696,7 +700,7 @@ void *UE_thread(void *arg) {
...
@@ -696,7 +700,7 @@ void *UE_thread(void *arg) {
curMsg
->
UE
->
current_thread_id
[
slot_nr
]
=
thread_idx
;
curMsg
->
UE
->
current_thread_id
[
slot_nr
]
=
thread_idx
;
curMsg
->
proc
.
CC_id
=
0
;
curMsg
->
proc
.
CC_id
=
0
;
curMsg
->
proc
.
nr_tti_rx
=
slot_nr
;
curMsg
->
proc
.
nr_tti_rx
=
slot_nr
;
curMsg
->
proc
.
subframe_rx
=
table_sf_slot
[
slot_nr
]
;
curMsg
->
proc
.
subframe_rx
=
slot_nr
/
(
nb_slot_frame
/
10
)
;
curMsg
->
proc
.
nr_tti_tx
=
(
absolute_slot
+
DURATION_RX_TO_TX
)
%
nb_slot_frame
;
curMsg
->
proc
.
nr_tti_tx
=
(
absolute_slot
+
DURATION_RX_TO_TX
)
%
nb_slot_frame
;
curMsg
->
proc
.
subframe_tx
=
curMsg
->
proc
.
nr_tti_rx
;
curMsg
->
proc
.
subframe_tx
=
curMsg
->
proc
.
nr_tti_rx
;
curMsg
->
proc
.
frame_rx
=
((
absolute_slot
/
nb_slot_frame
)
+
UE
->
frame_gap
)
%
MAX_FRAME_NUMBER
;
curMsg
->
proc
.
frame_rx
=
((
absolute_slot
/
nb_slot_frame
)
+
UE
->
frame_gap
)
%
MAX_FRAME_NUMBER
;
...
...
This diff is collapsed.
Click to expand it.
executables/nr-uesoftmodem.c
View file @
0c6b5101
...
@@ -122,7 +122,7 @@ static double snr_dB=20;
...
@@ -122,7 +122,7 @@ static double snr_dB=20;
int
threequarter_fs
=
0
;
int
threequarter_fs
=
0
;
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
...
@@ -518,7 +518,15 @@ void init_openair0(void) {
...
@@ -518,7 +518,15 @@ void init_openair0(void) {
openair0_cfg
[
card
].
configFilename
=
NULL
;
openair0_cfg
[
card
].
configFilename
=
NULL
;
openair0_cfg
[
card
].
threequarter_fs
=
frame_parms
[
0
]
->
threequarter_fs
;
openair0_cfg
[
card
].
threequarter_fs
=
frame_parms
[
0
]
->
threequarter_fs
;
if
(
frame_parms
[
0
]
->
N_RB_DL
==
217
)
{
if
(
frame_parms
[
0
]
->
N_RB_DL
==
66
)
{
if
(
numerology
==
3
)
{
openair0_cfg
[
card
].
sample_rate
=
122.88e6
;
openair0_cfg
[
card
].
samples_per_frame
=
1228800
;
}
else
{
LOG_E
(
PHY
,
"Unsupported numerology! FR2 supports only 120KHz SCS for now.
\n
"
);
exit
(
-
1
);
}
}
else
if
(
frame_parms
[
0
]
->
N_RB_DL
==
217
)
{
if
(
numerology
==
1
)
{
if
(
numerology
==
1
)
{
if
(
frame_parms
[
0
]
->
threequarter_fs
)
{
if
(
frame_parms
[
0
]
->
threequarter_fs
)
{
openair0_cfg
[
card
].
sample_rate
=
92.16e6
;
openair0_cfg
[
card
].
sample_rate
=
92.16e6
;
...
...
This diff is collapsed.
Click to expand it.
executables/nr-uesoftmodem.h
View file @
0c6b5101
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
{"single-thread-disable", CONFIG_HLP_NOSNGLT, PARAMFLAG_BOOL, iptr:&single_thread_flag, defintval:1, TYPE_INT, 0}, \
{"single-thread-disable", CONFIG_HLP_NOSNGLT, PARAMFLAG_BOOL, iptr:&single_thread_flag, defintval:1, TYPE_INT, 0}, \
{"nr-dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&nr_dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
{"nr-dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&nr_dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
{"A" , CONFIG_HLP_TADV, 0, uptr:&timing_advance, defintval:0, TYPE_UINT, 0}, \
{"A" , CONFIG_HLP_TADV, 0, uptr:&timing_advance, defintval:0, TYPE_UINT, 0}, \
{"C" , CONFIG_HLP_DLF, 0, uptr:&(downlink_frequency[0][0]), defuintval:2680000000, TYPE_UINT, 0}, \
{"C" , CONFIG_HLP_DLF, 0, uptr:&(downlink_frequency[0][0]), defuintval:2680000000, TYPE_UINT
64
, 0}, \
{"a" , CONFIG_HLP_CHOFF, 0, iptr:&chain_offset, defintval:0, TYPE_INT, 0}, \
{"a" , CONFIG_HLP_CHOFF, 0, iptr:&chain_offset, defintval:0, TYPE_INT, 0}, \
{"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, uptr:&do_forms, defintval:0, TYPE_INT, 0}, \
{"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, uptr:&do_forms, defintval:0, TYPE_INT, 0}, \
{"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, iptr:&threequarter_fs, defintval:0, TYPE_INT, 0}, \
{"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, iptr:&threequarter_fs, defintval:0, TYPE_INT, 0}, \
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
{"S" , CONFIG_HLP_MSLOTS, PARAMFLAG_BOOL, u8ptr:&exit_missed_slots, defintval:1, TYPE_UINT8, 0}, \
{"S" , CONFIG_HLP_MSLOTS, PARAMFLAG_BOOL, u8ptr:&exit_missed_slots, defintval:1, TYPE_UINT8, 0}, \
{"T" , CONFIG_HLP_TDD, PARAMFLAG_BOOL, iptr:&tddflag, defintval:0, TYPE_INT, 0}, \
{"T" , CONFIG_HLP_TDD, PARAMFLAG_BOOL, iptr:&tddflag, defintval:0, TYPE_INT, 0}, \
{"V" , CONFIG_HLP_VCD, PARAMFLAG_BOOL, iptr:&vcdflag, defintval:0, TYPE_INT, 0}, \
{"V" , CONFIG_HLP_VCD, PARAMFLAG_BOOL, iptr:&vcdflag, defintval:0, TYPE_INT, 0}, \
{"numerology" , CONFIG_HLP_NUMEROLOGY,
PARAMFLAG_BOOL,
iptr:&numerology, defintval:0, TYPE_INT, 0}, \
{"numerology" , CONFIG_HLP_NUMEROLOGY,
0,
iptr:&numerology, defintval:0, TYPE_INT, 0}, \
{"emulate-rf" , CONFIG_HLP_EMULATE_RF, PARAMFLAG_BOOL, iptr:&emulate_rf, defintval:0, TYPE_INT, 0}, \
{"emulate-rf" , CONFIG_HLP_EMULATE_RF, PARAMFLAG_BOOL, iptr:&emulate_rf, defintval:0, TYPE_INT, 0}, \
{"parallel-config", CONFIG_HLP_PARALLEL_CMD,0, strptr:(char **)¶llel_config, defstrval:NULL, TYPE_STRING, 0}, \
{"parallel-config", CONFIG_HLP_PARALLEL_CMD,0, strptr:(char **)¶llel_config, defstrval:NULL, TYPE_STRING, 0}, \
{"worker-config", CONFIG_HLP_WORKER_CMD, 0, strptr:(char **)&worker_config, defstrval:NULL, TYPE_STRING, 0}, \
{"worker-config", CONFIG_HLP_WORKER_CMD, 0, strptr:(char **)&worker_config, defstrval:NULL, TYPE_STRING, 0}, \
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/INIT/nr_init_ue.c
View file @
0c6b5101
...
@@ -979,14 +979,14 @@ void set_default_frame_parms_single(nfapi_nr_config_request_t *config,
...
@@ -979,14 +979,14 @@ void set_default_frame_parms_single(nfapi_nr_config_request_t *config,
config
->
subframe_config
.
numerology_index_mu
.
value
=
1
;
config
->
subframe_config
.
numerology_index_mu
.
value
=
1
;
config
->
subframe_config
.
duplex_mode
.
value
=
1
;
//FDD
config
->
subframe_config
.
duplex_mode
.
value
=
1
;
//FDD
config
->
subframe_config
.
dl_cyclic_prefix_type
.
value
=
0
;
//NORMAL
config
->
subframe_config
.
dl_cyclic_prefix_type
.
value
=
0
;
//NORMAL
config
->
rf_config
.
dl_carrier_bandwidth
.
value
=
10
6
;
config
->
rf_config
.
dl_carrier_bandwidth
.
value
=
10
0
;
config
->
rf_config
.
ul_carrier_bandwidth
.
value
=
10
6
;
config
->
rf_config
.
ul_carrier_bandwidth
.
value
=
10
0
;
config
->
sch_config
.
physical_cell_id
.
value
=
0
;
config
->
sch_config
.
physical_cell_id
.
value
=
0
;
frame_parms
->
frame_type
=
FDD
;
frame_parms
->
frame_type
=
FDD
;
//frame_parms[CC_id]->tdd_config_S = 0;
//frame_parms[CC_id]->tdd_config_S = 0;
frame_parms
->
N_RB_DL
=
10
0
;
frame_parms
->
N_RB_DL
=
10
6
;
frame_parms
->
N_RB_UL
=
10
0
;
frame_parms
->
N_RB_UL
=
10
6
;
frame_parms
->
Ncp
=
NORMAL
;
frame_parms
->
Ncp
=
NORMAL
;
//frame_parms[CC_id]->Ncp_UL = NORMAL;
//frame_parms[CC_id]->Ncp_UL = NORMAL;
frame_parms
->
Nid_cell
=
0
;
frame_parms
->
Nid_cell
=
0
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/INIT/nr_parms.c
View file @
0c6b5101
...
@@ -191,9 +191,16 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu)
...
@@ -191,9 +191,16 @@ void set_scs_parameters (NR_DL_FRAME_PARMS *fp, int mu)
break
;
break
;
case
NR_MU_3
:
case
NR_MU_3
:
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_3
];
switch
(
N_RB_DL
){
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_3
];
case
66
:
fp
->
ssb_type
=
nr_ssb_type_D
;
fp
->
ofdm_symbol_size
=
1024
;
fp
->
first_carrier_offset
=
628
;
//1024 - ( (66*12) / 2 )
fp
->
nb_prefix_samples0
=
88
;
fp
->
nb_prefix_samples
=
72
;
fp
->
subcarrier_spacing
=
nr_subcarrier_spacing
[
NR_MU_3
];
fp
->
slots_per_subframe
=
nr_slots_per_subframe
[
NR_MU_3
];
fp
->
ssb_type
=
nr_ssb_type_D
;
}
break
;
break
;
case
NR_MU_4
:
case
NR_MU_4
:
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/MODULATION/slot_fep_nr.c
View file @
0c6b5101
...
@@ -117,8 +117,8 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
...
@@ -117,8 +117,8 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
return(-1);
return(-1);
}*/
}*/
if
(
Ns
<
0
||
Ns
>=
20
)
{
if
(
Ns
<
0
||
Ns
>=
(
frame_parms
->
slots_per_frame
-
1
)
)
{
printf
(
"slot_fep: Ns must be between 0 and
19
\n
"
);
printf
(
"slot_fep: Ns must be between 0 and
%d
\n
"
,
frame_parms
->
slots_per_frame
-
1
);
return
(
-
1
);
return
(
-
1
);
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
0c6b5101
...
@@ -86,7 +86,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
...
@@ -86,7 +86,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
if
((
slot
==
8
)
||
(
slot
==
9
)
||
(
slot
==
18
)
||
(
slot
==
19
)
||
(
slot
==
28
)
||
(
slot
==
29
))
if
((
slot
==
8
)
||
(
slot
==
9
)
||
(
slot
==
18
)
||
(
slot
==
19
)
||
(
slot
==
28
)
||
(
slot
==
29
))
gNB
->
skipped_slots
=
gNB
->
skipped_slots
+
1
;
gNB
->
skipped_slots
=
gNB
->
skipped_slots
+
1
;
else
{
else
{
if
(
rel_slot
<
slots_per_hf
&&
rel_slot
>=
0
)
{
if
(
rel_slot
<
38
&&
rel_slot
>=
0
)
{
// there is no SSB beyond slot 37
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
// max two SSB per frame
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
// max two SSB per frame
ssb_index
=
i
+
((
rel_slot
-
gNB
->
skipped_slots
)
<<
1
);
// computing the ssb_index
ssb_index
=
i
+
((
rel_slot
-
gNB
->
skipped_slots
)
<<
1
);
// computing the ssb_index
...
@@ -95,7 +95,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
...
@@ -95,7 +95,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
fp
->
ssb_index
=
ssb_index
;
fp
->
ssb_index
=
ssb_index
;
int
ssb_start_symbol_abs
=
nr_get_ssb_start_symbol
(
fp
);
// computing the starting symbol for current ssb
int
ssb_start_symbol_abs
=
nr_get_ssb_start_symbol
(
fp
);
// computing the starting symbol for current ssb
ssb_start_symbol
=
ssb_start_symbol_abs
%
fp
->
symbols_per_slot
;
// start symbol wrt slot
ssb_start_symbol
=
ssb_start_symbol_abs
%
fp
->
symbols_per_slot
;
// start symbol wrt slot
nr_set_ssb_first_subcarrier
(
cfg
,
fp
);
// setting the first subcarrier
nr_set_ssb_first_subcarrier
(
cfg
,
fp
);
// setting the first subcarrier
LOG_D
(
PHY
,
"SS TX: frame %d, slot %d, start_symbol %d
\n
"
,
frame
,
slot
,
ssb_start_symbol
);
LOG_D
(
PHY
,
"SS TX: frame %d, slot %d, start_symbol %d
\n
"
,
frame
,
slot
,
ssb_start_symbol
);
...
@@ -294,6 +294,7 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_
...
@@ -294,6 +294,7 @@ void nr_fill_rx_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_
case
106
:
timing_advance_update
/=
16
;
break
;
case
106
:
timing_advance_update
/=
16
;
break
;
case
217
:
timing_advance_update
/=
32
;
break
;
case
217
:
timing_advance_update
/=
32
;
break
;
case
273
:
timing_advance_update
/=
32
;
break
;
case
273
:
timing_advance_update
/=
32
;
break
;
case
66
:
timing_advance_update
/=
12
;
break
;
default:
abort
();
default:
abort
();
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
0c6b5101
...
@@ -128,7 +128,7 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
...
@@ -128,7 +128,7 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
*/
*/
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_UE/phy_procedures_lte_ue.c
View file @
0c6b5101
...
@@ -78,7 +78,7 @@ extern double cpuf;
...
@@ -78,7 +78,7 @@ extern double cpuf;
void
Msg1_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
void
Msg1_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
void
Msg3_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
void
Msg3_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
void
get_dumpparam
(
PHY_VARS_UE
*
ue
,
void
get_dumpparam
(
PHY_VARS_UE
*
ue
,
UE_rxtx_proc_t
*
proc
,
UE_rxtx_proc_t
*
proc
,
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlschsim.c
View file @
0c6b5101
...
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
...
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
//char input_val_str[50],input_val_str2[50];
//char input_val_str[50],input_val_str2[50];
//uint16_t NB_RB=25;
//uint16_t NB_RB=25;
SCM_t
channel_model
=
AWGN
;
//Rayleigh1_anticorr;
SCM_t
channel_model
=
AWGN
;
//Rayleigh1_anticorr;
uint16_t
N_RB_DL
=
106
,
mu
=
1
;
uint16_t
N_RB_DL
=
106
,
mu
=
1
;
//unsigned char frame_type = 0;
//unsigned char frame_type = 0;
unsigned
char
pbch_phase
=
0
;
unsigned
char
pbch_phase
=
0
;
int
frame
=
0
,
slot
=
0
;
int
frame
=
0
,
slot
=
0
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
0c6b5101
...
@@ -202,7 +202,6 @@ int main(int argc, char **argv)
...
@@ -202,7 +202,6 @@ int main(int argc, char **argv)
int
N_RB_DL
=
106
,
mu
=
1
;
int
N_RB_DL
=
106
,
mu
=
1
;
nfapi_nr_dl_tti_pdsch_pdu_rel15_t
dlsch_config
;
nfapi_nr_dl_tti_pdsch_pdu_rel15_t
dlsch_config
;
//unsigned char frame_type = 0;
//unsigned char frame_type = 0;
int
frame
=
0
,
slot
=
1
;
int
frame
=
0
,
slot
=
1
;
...
@@ -381,6 +380,7 @@ int main(int argc, char **argv)
...
@@ -381,6 +380,7 @@ int main(int argc, char **argv)
case
'I'
:
case
'I'
:
run_initial_sync
=
1
;
run_initial_sync
=
1
;
target_error_rate
=
0
.
1
;
target_error_rate
=
0
.
1
;
slot
=
0
;
break
;
break
;
case
'L'
:
case
'L'
:
...
@@ -546,6 +546,10 @@ int main(int argc, char **argv)
...
@@ -546,6 +546,10 @@ int main(int argc, char **argv)
fs
=
61.44e6
;
fs
=
61.44e6
;
bw
=
40e6
;
bw
=
40e6
;
}
}
else
if
(
mu
==
3
&&
N_RB_DL
==
66
)
{
fs
=
122.88e6
;
bw
=
100e6
;
}
else
AssertFatal
(
1
==
0
,
"Unsupported numerology for mu %d, N_RB %d
\n
"
,
mu
,
N_RB_DL
);
else
AssertFatal
(
1
==
0
,
"Unsupported numerology for mu %d, N_RB %d
\n
"
,
mu
,
N_RB_DL
);
gNB2UE
=
new_channel_desc_scm
(
n_tx
,
gNB2UE
=
new_channel_desc_scm
(
n_tx
,
...
@@ -619,7 +623,6 @@ int main(int argc, char **argv)
...
@@ -619,7 +623,6 @@ int main(int argc, char **argv)
nr_gold_pbch
(
UE
);
nr_gold_pbch
(
UE
);
nr_gold_pdcch
(
UE
,
0
,
2
);
nr_gold_pdcch
(
UE
,
0
,
2
);
nr_l2_init_ue
(
NULL
);
nr_l2_init_ue
(
NULL
);
UE_mac
=
get_mac_inst
(
0
);
UE_mac
=
get_mac_inst
(
0
);
...
@@ -651,7 +654,6 @@ int main(int argc, char **argv)
...
@@ -651,7 +654,6 @@ int main(int argc, char **argv)
if
(
mcsIndex_set
==
0
)
dlsch_config
.
mcsIndex
[
0
]
=
9
;
if
(
mcsIndex_set
==
0
)
dlsch_config
.
mcsIndex
[
0
]
=
9
;
if
(
rbSize_set
==
0
)
dlsch_config
.
rbSize
=
N_RB_DL
;
if
(
rbSize_set
==
0
)
dlsch_config
.
rbSize
=
N_RB_DL
;
if
(
rbStart_set
==
0
)
dlsch_config
.
rbStart
=
0
;
if
(
rbStart_set
==
0
)
dlsch_config
.
rbStart
=
0
;
//Configure UE
//Configure UE
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
0c6b5101
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
extern
uint16_t
sf_ahead
;
extern
uint16_t
sf_ahead
;
extern
int
config_check_band_frequencies
(
int
ind
,
int16_t
band
,
uint
32
_t
downlink_frequency
,
extern
int
config_check_band_frequencies
(
int
ind
,
int16_t
band
,
uint
64
_t
downlink_frequency
,
int32_t
uplink_frequency_offset
,
uint32_t
frame_type
);
int32_t
uplink_frequency_offset
,
uint32_t
frame_type
);
void
prepare_scc
(
NR_ServingCellConfigCommon_t
*
scc
)
{
void
prepare_scc
(
NR_ServingCellConfigCommon_t
*
scc
)
{
...
@@ -646,7 +646,6 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -646,7 +646,6 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
// Parse optional physical parameters
// Parse optional physical parameters
sprintf
(
gnbpath
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
k
),
sprintf
(
gnbpath
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
k
),
printf
(
"SSB SCO %d
\n
"
,
ssb_SubcarrierOffset
);
printf
(
"SSB SCO %d
\n
"
,
ssb_SubcarrierOffset
);
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ssb_SubcarrierOffset
=
ssb_SubcarrierOffset
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
ssb_SubcarrierOffset
=
ssb_SubcarrierOffset
;
printf
(
"pdsch_AntennaPorts %d
\n
"
,
pdsch_AntennaPorts
);
printf
(
"pdsch_AntennaPorts %d
\n
"
,
pdsch_AntennaPorts
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
0c6b5101
...
@@ -230,7 +230,7 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
...
@@ -230,7 +230,7 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
}
}
break
;
break
;
default:
default:
AssertFatal
(
1
==
0
,
"SSB bitmap size value %d undefined (allowed values 1,2,3)
\n
"
,
scc
->
ssb_PositionsInBurst
->
present
)
;
AssertFatal
(
1
==
0
,
"SSB bitmap size value %d undefined (allowed values 1,2,3)
\n
"
,
scc
->
ssb_PositionsInBurst
->
present
)
}
}
cfg
->
ssb_table
.
ssb_mask_list
[
0
].
ssb_mask
.
tl
.
tag
=
NFAPI_NR_CONFIG_SSB_MASK_TAG
;
cfg
->
ssb_table
.
ssb_mask_list
[
0
].
ssb_mask
.
tl
.
tag
=
NFAPI_NR_CONFIG_SSB_MASK_TAG
;
cfg
->
num_tlv
++
;
cfg
->
num_tlv
++
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
0c6b5101
...
@@ -42,6 +42,7 @@ void config_common(int Mod_idP,
...
@@ -42,6 +42,7 @@ void config_common(int Mod_idP,
int
pdsch_AntennaPorts
,
int
pdsch_AntennaPorts
,
NR_ServingCellConfigCommon_t
*
scc
NR_ServingCellConfigCommon_t
*
scc
);
);
int
rrc_mac_config_req_gNB
(
module_id_t
Mod_idP
,
int
rrc_mac_config_req_gNB
(
module_id_t
Mod_idP
,
int
ssb_SubcarrierOffset
,
int
ssb_SubcarrierOffset
,
int
pdsch_AntennaPorts
,
int
pdsch_AntennaPorts
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
View file @
0c6b5101
...
@@ -64,7 +64,8 @@ nr_bandentry_t nr_bandtable[] = {
...
@@ -64,7 +64,8 @@ nr_bandentry_t nr_bandtable[] = {
{
82
,
832000
,
862000
,
000
,
000
,
20
,
166400
},
{
82
,
832000
,
862000
,
000
,
000
,
20
,
166400
},
{
83
,
703000
,
748000
,
000
,
000
,
20
,
140600
},
{
83
,
703000
,
748000
,
000
,
000
,
20
,
140600
},
{
84
,
1920000
,
1980000
,
000
,
000
,
20
,
384000
},
{
84
,
1920000
,
1980000
,
000
,
000
,
20
,
384000
},
{
86
,
1710000
,
1785000
,
000
,
000
,
20
,
342000
}
{
86
,
1710000
,
1785000
,
000
,
000
,
20
,
342000
},
{
257
,
26500000
,
29500000
,
26500000
,
29500000
,
1
,
2054167
}
};
};
#define NR_BANDTABLE_SIZE (sizeof(nr_bandtable)/sizeof(nr_bandentry_t))
#define NR_BANDTABLE_SIZE (sizeof(nr_bandtable)/sizeof(nr_bandentry_t))
...
@@ -234,8 +235,8 @@ uint32_t to_nrarfcn(int nr_bandP,
...
@@ -234,8 +235,8 @@ uint32_t to_nrarfcn(int nr_bandP,
int
i
;
int
i
;
LOG_I
(
MAC
,
"Searching for nr band %d DL Carrier frequency %llu bw %u
\n
"
,
nr_bandP
,(
long
long
unsigned
int
)
dl_CarrierFreq
,
bw
);
LOG_I
(
MAC
,
"Searching for nr band %d DL Carrier frequency %llu bw %u
\n
"
,
nr_bandP
,(
long
long
unsigned
int
)
dl_CarrierFreq
,
bw
);
AssertFatal
(
nr_bandP
<
86
,
"nr_band %d > 86
\n
"
,
nr_bandP
);
AssertFatal
(
nr_bandP
<
258
,
"nr_band %d > 257
\n
"
,
nr_bandP
);
for
(
i
=
0
;
i
<
3
0
&&
nr_bandtable
[
i
].
band
!=
nr_bandP
;
i
++
);
for
(
i
=
0
;
i
<
3
3
&&
nr_bandtable
[
i
].
band
!=
nr_bandP
;
i
++
);
AssertFatal
(
dl_CarrierFreq_by_1k
>=
nr_bandtable
[
i
].
dl_min
,
AssertFatal
(
dl_CarrierFreq_by_1k
>=
nr_bandtable
[
i
].
dl_min
,
"Band %d, bw %u : DL carrier frequency %llu kHz < %llu
\n
"
,
"Band %d, bw %u : DL carrier frequency %llu kHz < %llu
\n
"
,
...
@@ -267,8 +268,8 @@ uint64_t from_nrarfcn(int nr_bandP,
...
@@ -267,8 +268,8 @@ uint64_t from_nrarfcn(int nr_bandP,
if
(
nr_bandP
<
77
||
nr_bandP
>
79
)
deltaFglobal
=
5
;
if
(
nr_bandP
<
77
||
nr_bandP
>
79
)
deltaFglobal
=
5
;
else
deltaFglobal
=
15
;
else
deltaFglobal
=
15
;
AssertFatal
(
nr_bandP
<
87
,
"nr_band %d > 86
\n
"
,
nr_bandP
);
AssertFatal
(
nr_bandP
<
258
,
"nr_band %d > 257
\n
"
,
nr_bandP
);
for
(
i
=
0
;
i
<
3
1
&&
nr_bandtable
[
i
].
band
!=
nr_bandP
;
i
++
);
for
(
i
=
0
;
i
<
3
3
&&
nr_bandtable
[
i
].
band
!=
nr_bandP
;
i
++
);
AssertFatal
(
dl_nrarfcn
>=
nr_bandtable
[
i
].
N_OFFs_DL
,
"dl_nrarfcn %u < N_OFFs_DL %llu
\n
"
,
dl_nrarfcn
,
(
long
long
unsigned
int
)
nr_bandtable
[
i
].
N_OFFs_DL
);
AssertFatal
(
dl_nrarfcn
>=
nr_bandtable
[
i
].
N_OFFs_DL
,
"dl_nrarfcn %u < N_OFFs_DL %llu
\n
"
,
dl_nrarfcn
,
(
long
long
unsigned
int
)
nr_bandtable
[
i
].
N_OFFs_DL
);
LOG_I
(
PHY
,
"Computing dl_frequency (pointA %llu => %llu (dlmin %llu, nr_bandtable[%d].N_OFFs_DL %llu))
\n
"
,
LOG_I
(
PHY
,
"Computing dl_frequency (pointA %llu => %llu (dlmin %llu, nr_bandtable[%d].N_OFFs_DL %llu))
\n
"
,
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
0 → 100644
View file @
0c6b5101
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.h
View file @
0c6b5101
...
@@ -264,7 +264,7 @@ extern pthread_cond_t sync_cond;
...
@@ -264,7 +264,7 @@ extern pthread_cond_t sync_cond;
extern
pthread_mutex_t
sync_mutex
;
extern
pthread_mutex_t
sync_mutex
;
extern
int
sync_var
;
extern
int
sync_var
;
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
extern
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
extern
int
rx_input_level_dBm
;
extern
int
rx_input_level_dBm
;
...
...
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