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
c1bec3e5
Commit
c1bec3e5
authored
Dec 24, 2021
by
luis_pereira87
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename pusch_proc_threads to thread_pool_size
parent
264e8299
Changes
44
Hide whitespace changes
Inline
Side-by-side
Showing
44 changed files
with
460 additions
and
122 deletions
+460
-122
ci-scripts/conf_files/benetel-5g.conf
ci-scripts/conf_files/benetel-5g.conf
+3
-3
ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+1
-1
ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+2
-2
ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
+3
-3
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
+1
-1
ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
...cripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
+4
-4
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
...pts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+1
-1
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+1
-1
ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.usrpn310.conf
ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.usrpn310.conf
+1
-1
ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
+3
-3
ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
...cripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+1
-1
ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
...cripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+3
-3
executables/nr-gnb.c
executables/nr-gnb.c
+2
-2
openair1/PHY/defs_gNB.h
openair1/PHY/defs_gNB.h
+1
-1
openair2/GNB_APP/L1_nr_paramdef.h
openair2/GNB_APP/L1_nr_paramdef.h
+4
-4
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf
+4
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf
...ROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf
...RIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf
+5
-5
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
+6
-6
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
+6
-6
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf
...S/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf
...S/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf
...S/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf
+6
-6
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
+6
-6
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
...s/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf
+3
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
...s/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
+3
-3
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+3
-3
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
...ENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+6
-3
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
...IC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
+1
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
...ENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+5
-1
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
...-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
+3
-3
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
...IC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
+331
-0
No files found.
ci-scripts/conf_files/benetel-5g.conf
View file @
c1bec3e5
...
@@ -215,11 +215,11 @@ MACRLCs = (
...
@@ -215,11 +215,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
View file @
c1bec3e5
...
@@ -232,7 +232,7 @@ L1s = (
...
@@ -232,7 +232,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
2
;
thread_pool_size
=
2
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
pucch0_dtx_threshold
=
150
;
pucch0_dtx_threshold
=
150
;
}
}
...
...
ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
View file @
c1bec3e5
...
@@ -229,9 +229,9 @@ L1s = (
...
@@ -229,9 +229,9 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
2
;
thread_pool_size
=
2
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -211,12 +211,12 @@ MACRLCs = (
...
@@ -211,12 +211,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -198,7 +198,7 @@ L1s = (
...
@@ -198,7 +198,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
...
...
ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
View file @
c1bec3e5
...
@@ -210,12 +210,12 @@ MACRLCs = (
...
@@ -210,12 +210,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
View file @
c1bec3e5
...
@@ -234,7 +234,7 @@ L1s = (
...
@@ -234,7 +234,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
4
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
# pucch0_dtx_threshold = 150;
# pucch0_dtx_threshold = 150;
}
}
...
...
ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
View file @
c1bec3e5
...
@@ -239,7 +239,7 @@ L1s = (
...
@@ -239,7 +239,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
4
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
# pucch0_dtx_threshold = 150;
# pucch0_dtx_threshold = 150;
}
}
...
...
ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.usrpn310.conf
View file @
c1bec3e5
...
@@ -239,7 +239,7 @@ L1s = (
...
@@ -239,7 +239,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
4
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
# pucch0_dtx_threshold = 150;
# pucch0_dtx_threshold = 150;
}
}
...
...
ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -194,11 +194,11 @@ MACRLCs = (
...
@@ -194,11 +194,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
View file @
c1bec3e5
...
@@ -213,7 +213,7 @@ L1s = (
...
@@ -213,7 +213,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
6
;
thread_pool_size
=
6
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
...
...
ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
View file @
c1bec3e5
...
@@ -210,11 +210,11 @@ MACRLCs = (
...
@@ -210,11 +210,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
6
;
thread_pool_size
=
6
;
}
}
);
);
RUs
= (
RUs
= (
...
...
executables/nr-gnb.c
View file @
c1bec3e5
...
@@ -398,8 +398,8 @@ void init_gNB_Tpool(int inst) {
...
@@ -398,8 +398,8 @@ void init_gNB_Tpool(int inst) {
// ULSCH decoding threadpool
// ULSCH decoding threadpool
gNB
->
threadPool
=
(
tpool_t
*
)
malloc
(
sizeof
(
tpool_t
));
gNB
->
threadPool
=
(
tpool_t
*
)
malloc
(
sizeof
(
tpool_t
));
int
numCPU
=
sysconf
(
_SC_NPROCESSORS_ONLN
);
int
numCPU
=
sysconf
(
_SC_NPROCESSORS_ONLN
);
LOG_I
(
PHY
,
"Number of threads requested in config file: %d, Number of threads available on this machine: %d
\n
"
,
gNB
->
pusch_proc_threads
,
numCPU
);
LOG_I
(
PHY
,
"Number of threads requested in config file: %d, Number of threads available on this machine: %d
\n
"
,
gNB
->
thread_pool_size
,
numCPU
);
int
threadCnt
=
min
(
numCPU
,
gNB
->
pusch_proc_threads
);
int
threadCnt
=
min
(
numCPU
,
gNB
->
thread_pool_size
);
if
(
threadCnt
<
2
)
LOG_E
(
PHY
,
"Number of threads for gNB should be more than 1. Allocated only %d
\n
"
,
threadCnt
);
if
(
threadCnt
<
2
)
LOG_E
(
PHY
,
"Number of threads for gNB should be more than 1. Allocated only %d
\n
"
,
threadCnt
);
char
pool
[
80
];
char
pool
[
80
];
sprintf
(
pool
,
"-1"
);
sprintf
(
pool
,
"-1"
);
...
...
openair1/PHY/defs_gNB.h
View file @
c1bec3e5
...
@@ -890,7 +890,7 @@ typedef struct PHY_VARS_gNB_s {
...
@@ -890,7 +890,7 @@ typedef struct PHY_VARS_gNB_s {
notifiedFIFO_t
*
resp_RU_tx
;
notifiedFIFO_t
*
resp_RU_tx
;
tpool_t
*
threadPool
;
tpool_t
*
threadPool
;
int
nbDecode
;
int
nbDecode
;
uint8_t
pusch_proc_threads
;
uint8_t
thread_pool_size
;
int
number_of_nr_dlsch_max
;
int
number_of_nr_dlsch_max
;
int
number_of_nr_ulsch_max
;
int
number_of_nr_ulsch_max
;
void
*
scopeData
;
void
*
scopeData
;
...
...
openair2/GNB_APP/L1_nr_paramdef.h
View file @
c1bec3e5
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
#define CONFIG_STRING_L1_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_L1_LOCAL_N_PORTD "local_n_portd"
#define CONFIG_STRING_L1_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_L1_REMOTE_N_PORTD "remote_n_portd"
#define CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define CONFIG_STRING_L1_
PUSCH_PROC_THREADS "pusch_proc_threads
"
#define CONFIG_STRING_L1_
THREAD_POOL_SIZE "thread_pool_size
"
#define CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR "ofdm_offset_divisor"
#define CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR "ofdm_offset_divisor"
#define CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD "pucch0_dtx_threshold"
#define CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD "pucch0_dtx_threshold"
#define CONFIG_STRING_L1_PRACH_DTX_THRESHOLD "prach_dtx_threshold"
#define CONFIG_STRING_L1_PRACH_DTX_THRESHOLD "prach_dtx_threshold"
...
@@ -65,8 +65,8 @@
...
@@ -65,8 +65,8 @@
{CONFIG_STRING_L1_REMOTE_N_PORTC, NULL, 0, uptr:NULL, defintval:50030, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_REMOTE_N_PORTC, NULL, 0, uptr:NULL, defintval:50030, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_LOCAL_N_PORTD, NULL, 0, uptr:NULL, defintval:50031, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_LOCAL_N_PORTD, NULL, 0, uptr:NULL, defintval:50031, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_REMOTE_N_PORTD, NULL, 0, uptr:NULL, defintval:50031, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_REMOTE_N_PORTD, NULL, 0, uptr:NULL, defintval:50031, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_
PUSCH_PROC_THREADS, NULL, 0, uptr:NULL, defintval:3, TYPE_UINT, 0},
\
{CONFIG_STRING_L1_
THREAD_POOL_SIZE, NULL, 0, uptr:NULL, defintval:4, TYPE_UINT, 0},
\
{CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR, NULL, 0, uptr:NULL, defuintval:8, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR, NULL, 0, uptr:NULL, defuintval:8, TYPE_UINT, 0},
\
{CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD, NULL, 0, uptr:NULL, defintval:100, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD, NULL, 0, uptr:NULL, defintval:100, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_PRACH_DTX_THRESHOLD, NULL, 0, uptr:NULL, defintval:150, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_PRACH_DTX_THRESHOLD, NULL, 0, uptr:NULL, defintval:150, TYPE_UINT, 0}, \
{CONFIG_STRING_L1_PUSCH_DTX_THRESHOLD, NULL, 0, uptr:NULL, defintval:50, TYPE_UINT, 0} \
{CONFIG_STRING_L1_PUSCH_DTX_THRESHOLD, NULL, 0, uptr:NULL, defintval:50, TYPE_UINT, 0} \
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
#define L1_REMOTE_N_PORTC_IDX 6
#define L1_REMOTE_N_PORTC_IDX 6
#define L1_LOCAL_N_PORTD_IDX 7
#define L1_LOCAL_N_PORTD_IDX 7
#define L1_REMOTE_N_PORTD_IDX 8
#define L1_REMOTE_N_PORTD_IDX 8
#define L1_
PUSCH_PROC_THREADS
9
#define L1_
THREAD_POOL_SIZE
9
#define L1_OFDM_OFFSET_DIVISOR 10
#define L1_OFDM_OFFSET_DIVISOR 10
#define L1_PUCCH0_DTX_THRESHOLD 11
#define L1_PUCCH0_DTX_THRESHOLD 11
#define L1_PRACH_DTX_THRESHOLD 12
#define L1_PRACH_DTX_THRESHOLD 12
...
...
openair2/GNB_APP/gnb_config.c
View file @
c1bec3e5
...
@@ -653,7 +653,7 @@ void RCconfig_NR_L1(void) {
...
@@ -653,7 +653,7 @@ void RCconfig_NR_L1(void) {
RC
.
gNB
[
j
]
->
Mod_id
=
j
;
RC
.
gNB
[
j
]
->
Mod_id
=
j
;
}
}
RC
.
gNB
[
j
]
->
pusch_proc_threads
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_PUSCH_PROC_THREADS
].
uptr
);
RC
.
gNB
[
j
]
->
thread_pool_size
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_THREAD_POOL_SIZE
].
uptr
);
RC
.
gNB
[
j
]
->
ofdm_offset_divisor
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_OFDM_OFFSET_DIVISOR
].
uptr
);
RC
.
gNB
[
j
]
->
ofdm_offset_divisor
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_OFDM_OFFSET_DIVISOR
].
uptr
);
RC
.
gNB
[
j
]
->
pucch0_thres
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_PUCCH0_DTX_THRESHOLD
].
uptr
);
RC
.
gNB
[
j
]
->
pucch0_thres
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_PUCCH0_DTX_THRESHOLD
].
uptr
);
RC
.
gNB
[
j
]
->
prach_thres
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_PRACH_DTX_THRESHOLD
].
uptr
);
RC
.
gNB
[
j
]
->
prach_thres
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_PRACH_DTX_THRESHOLD
].
uptr
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/benetel-5g.conf
View file @
c1bec3e5
...
@@ -216,11 +216,11 @@ MACRLCs = (
...
@@ -216,11 +216,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -210,12 +210,12 @@ MACRLCs = (
...
@@ -210,12 +210,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
View file @
c1bec3e5
...
@@ -196,12 +196,12 @@ MACRLCs = (
...
@@ -196,12 +196,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -193,12 +193,12 @@ MACRLCs = (
...
@@ -193,12 +193,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band261.tm1.32PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -210,12 +210,12 @@ MACRLCs = (
...
@@ -210,12 +210,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -194,12 +194,12 @@ MACRLCs = (
...
@@ -194,12 +194,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.106PRB.usrpx300.conf
View file @
c1bec3e5
...
@@ -194,12 +194,12 @@ MACRLCs = (
...
@@ -194,12 +194,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.slave.conf
View file @
c1bec3e5
...
@@ -209,12 +209,12 @@ MACRLCs = (
...
@@ -209,12 +209,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.PTRS.usrpx300.conf
View file @
c1bec3e5
...
@@ -242,12 +242,12 @@ MACRLCs = (
...
@@ -242,12 +242,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
View file @
c1bec3e5
...
@@ -193,12 +193,12 @@ MACRLCs = (
...
@@ -193,12 +193,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -192,12 +192,12 @@ MACRLCs = (
...
@@ -192,12 +192,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
View file @
c1bec3e5
...
@@ -192,12 +192,12 @@ MACRLCs = (
...
@@ -192,12 +192,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -209,12 +209,12 @@ MACRLCs = (
...
@@ -209,12 +209,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
View file @
c1bec3e5
...
@@ -193,12 +193,12 @@ MACRLCs = (
...
@@ -193,12 +193,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpb210.conf
View file @
c1bec3e5
...
@@ -192,12 +192,12 @@ MACRLCs = (
...
@@ -192,12 +192,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -192,12 +192,12 @@ MACRLCs = (
...
@@ -192,12 +192,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.24PRB.usrpx300.conf
View file @
c1bec3e5
...
@@ -192,12 +192,12 @@ MACRLCs = (
...
@@ -192,12 +192,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
View file @
c1bec3e5
...
@@ -193,12 +193,12 @@ MACRLCs = (
...
@@ -193,12 +193,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/oaiL1.nfapi.usrpx300.conf
View file @
c1bec3e5
...
@@ -28,7 +28,7 @@ L1s = (
...
@@ -28,7 +28,7 @@ L1s = (
remote_n_portc
=
50001
; //
vnf
p5
port
remote_n_portc
=
50001
; //
vnf
p5
port
local_n_portd
=
50010
; //
pnf
p7
port
local_n_portd
=
50010
; //
pnf
p7
port
remote_n_portd
=
50011
; //
vnf
p7
port
remote_n_portd
=
50011
; //
vnf
p7
port
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
}
}
);
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
View file @
c1bec3e5
...
@@ -210,12 +210,12 @@ MACRLCs = (
...
@@ -210,12 +210,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_24PRB.conf
View file @
c1bec3e5
...
@@ -211,12 +211,12 @@ MACRLCs = (
...
@@ -211,12 +211,12 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_nsa_n310.conf
View file @
c1bec3e5
...
@@ -210,11 +210,11 @@ MACRLCs = (
...
@@ -210,11 +210,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
View file @
c1bec3e5
...
@@ -208,11 +208,11 @@ MACRLCs = (
...
@@ -208,11 +208,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
2
;
thread_pool_size
=
2
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
View file @
c1bec3e5
...
@@ -35,6 +35,7 @@ gNBs =
...
@@ -35,6 +35,7 @@ gNBs =
ssb_SubcarrierOffset
=
0
;
ssb_SubcarrierOffset
=
0
;
pdsch_AntennaPorts
=
1
;
pdsch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
min_rxtxtime
=
6
;
sib1_tda
=
0
;
sib1_tda
=
0
;
pdcch_ConfigSIB1
= (
pdcch_ConfigSIB1
= (
...
@@ -66,7 +67,7 @@ gNBs =
...
@@ -66,7 +67,7 @@ gNBs =
#initialDownlinkBWP
#initialDownlinkBWP
#genericParameters
#genericParameters
# this is RBstart=27,L=48 (275*(L-1))+RBstart
# this is RBstart=27,L=48 (275*(L-1))+RBstart
initialDLBWPlocationAndBandwidth
=
12952
;
# 6366 12925 12956 28875 12952
initialDLBWPlocationAndBandwidth
=
28875
;
# 6366 12925 12956 28875 12952
# subcarrierSpacing
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialDLBWPsubcarrierSpacing
=
1
;
initialDLBWPsubcarrierSpacing
=
1
;
...
@@ -86,7 +87,7 @@ gNBs =
...
@@ -86,7 +87,7 @@ gNBs =
pMax
=
20
;
pMax
=
20
;
#initialUplinkBWP
#initialUplinkBWP
#genericParameters
#genericParameters
initialULBWPlocationAndBandwidth
=
12952
;
initialULBWPlocationAndBandwidth
=
28875
;
# subcarrierSpacing
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialULBWPsubcarrierSpacing
=
1
;
initialULBWPsubcarrierSpacing
=
1
;
...
@@ -218,7 +219,7 @@ L1s = (
...
@@ -218,7 +219,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
pucch0_dtx_threshold
=
150
;
pucch0_dtx_threshold
=
150
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
...
@@ -296,5 +297,7 @@ log_config :
...
@@ -296,5 +297,7 @@ log_config :
rrc_log_verbosity
=
"medium"
;
rrc_log_verbosity
=
"medium"
;
ngap_log_level
=
"debug"
;
ngap_log_level
=
"debug"
;
ngap_log_verbosity
=
"medium"
;
ngap_log_verbosity
=
"medium"
;
f1ap_log_level
=
"debug"
;
f1ap_log_verbosity
=
"medium"
;
};
};
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
View file @
c1bec3e5
...
@@ -218,7 +218,7 @@ L1s = (
...
@@ -218,7 +218,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
4
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
#pucch0_dtx_threshold = 120;
#pucch0_dtx_threshold = 120;
}
}
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
View file @
c1bec3e5
...
@@ -35,7 +35,9 @@ gNBs =
...
@@ -35,7 +35,9 @@ gNBs =
ssb_SubcarrierOffset
=
0
;
ssb_SubcarrierOffset
=
0
;
pdsch_AntennaPorts
=
1
;
pdsch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
1
;
min_rxtxtime
=
6
;
sib1_tda
=
0
;
sib1_tda
=
0
;
do_SRS
=
1
;
pdcch_ConfigSIB1
= (
pdcch_ConfigSIB1
= (
{
{
...
@@ -218,7 +220,7 @@ L1s = (
...
@@ -218,7 +220,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
pucch0_dtx_threshold
=
150
;
pucch0_dtx_threshold
=
150
;
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
ofdm_offset_divisor
=
8
;
#set this to UINT_MAX for offset 0
...
@@ -296,5 +298,7 @@ log_config :
...
@@ -296,5 +298,7 @@ log_config :
rrc_log_verbosity
=
"medium"
;
rrc_log_verbosity
=
"medium"
;
ngap_log_level
=
"debug"
;
ngap_log_level
=
"debug"
;
ngap_log_verbosity
=
"medium"
;
ngap_log_verbosity
=
"medium"
;
f1ap_log_level
=
"debug"
;
f1ap_log_verbosity
=
"medium"
;
};
};
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
View file @
c1bec3e5
...
@@ -225,11 +225,11 @@ MACRLCs = (
...
@@ -225,11 +225,11 @@ MACRLCs = (
);
);
L1s
= (
L1s
= (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
pusch_proc_threads
=
8
;
thread_pool_size
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
0 → 100644
View file @
c1bec3e5
Active_gNBs
= (
"gNB-OAI"
);
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity
=
"none"
;
gNBs
=
(
{
//////////
Identification
parameters
:
gNB_ID
=
0
xe00
;
gNB_name
=
"gNB-OAI"
;
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
1
;
plmn_list
= ({
mcc
=
208
;
mnc
=
99
;
mnc_length
=
2
;
snssaiList
= (
{
sst
=
1
;
sd
=
0
x1
; //
0
false
,
else
true
},
{
sst
=
1
;
sd
=
0
x112233
; //
0
false
,
else
true
}
);
});
nr_cellid
=
12345678
L
;
//////////
Physical
parameters
:
ssb_SubcarrierOffset
=
0
;
pdsch_AntennaPorts
=
1
;
pusch_AntennaPorts
=
2
;
# do_CSIRS = 1;
min_rxtxtime_pdsch
=
2
;
ul_prbblacklist
=
"79,80,81,82"
pdcch_ConfigSIB1
= (
{
controlResourceSetZero
=
11
;
searchSpaceZero
=
10
;
}
);
servingCellConfigCommon
= (
{
#spCellConfigCommon
physCellId
=
0
;
# downlinkConfigCommon
#frequencyInfoDL
# this is 3300.60 MHz + 81*12*30e-3 MHz = 3329.76
absoluteFrequencySSB
=
621984
;
# this is 3300.60 MHz
dl_absoluteFrequencyPointA
=
620040
;
#scs-SpecificCarrierList
dl_offstToCarrier
=
0
;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
dl_subcarrierSpacing
=
1
;
dl_carrierBandwidth
=
162
;
#initialDownlinkBWP
#genericParameters
# this is RBstart=0,L=162 (275*(275-L+1))+(274-RBstart))
initialDLBWPlocationAndBandwidth
=
31899
;
#
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialDLBWPsubcarrierSpacing
=
1
;
#pdcch-ConfigCommon
initialDLBWPcontrolResourceSetZero
=
11
;
initialDLBWPsearchSpaceZero
=
10
;
#pdsch-ConfigCommon
#pdschTimeDomainAllocationList (up to 16 entries)
initialDLBWPk0_0
=
0
;
#initialULBWPmappingType
#0=typeA,1=typeB
initialDLBWPmappingType_0
=
0
;
#this is SS=1,L=13
initialDLBWPstartSymbolAndLength_0
=
40
;
initialDLBWPk0_1
=
0
;
initialDLBWPmappingType_1
=
0
;
#this is SS=1,L=5
initialDLBWPstartSymbolAndLength_1
=
57
;
#uplinkConfigCommon
#frequencyInfoUL
ul_frequencyBand
=
78
;
#scs-SpecificCarrierList
ul_offstToCarrier
=
0
;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
ul_subcarrierSpacing
=
1
;
ul_carrierBandwidth
=
162
;
pMax
=
20
;
#initialUplinkBWP
#genericParameters
initialULBWPlocationAndBandwidth
=
31899
;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialULBWPsubcarrierSpacing
=
1
;
#rach-ConfigCommon
#rach-ConfigGeneric
prach_ConfigurationIndex
=
98
;
#prach_msg1_FDM
#0 = one, 1=two, 2=four, 3=eight
prach_msg1_FDM
=
0
;
prach_msg1_FrequencyStart
=
0
;
zeroCorrelationZoneConfig
=
12
;
preambleReceivedTargetPower
= -
104
;
#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
preambleTransMax
=
6
;
#powerRampingStep
# 0=dB0,1=dB2,2=dB4,3=dB6
powerRampingStep
=
1
;
#ra_ReponseWindow
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
3
;
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
#ra_ContentionResolutionTimer
#(0..7) 8,16,24,32,40,48,56,64
ra_ContentionResolutionTimer
=
7
;
rsrp_ThresholdSSB
=
19
;
#prach-RootSequenceIndex_PR
#1 = 839, 2 = 139
prach_RootSequenceIndex_PR
=
2
;
prach_RootSequenceIndex
=
1
;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
msg1_SubcarrierSpacing
=
1
,
# restrictedSetConfig
# 0=unrestricted, 1=restricted type A, 2=restricted type B
restrictedSetConfig
=
0
,
# pusch-ConfigCommon (up to 16 elements)
initialULBWPk2_0
=
2
;
initialULBWPmappingType_0
=
1
# this is SS=2 L=13
initialULBWPstartSymbolAndLength_0
=
41
;
initialULBWPk2_1
=
2
;
initialULBWPmappingType_1
=
1
;
# this is SS=0 L=4
initialULBWPstartSymbolAndLength_1
=
52
;
initialULBWPk2_2
=
7
;
initialULBWPmappingType_2
=
1
;
# this is SS=10 L=4
initialULBWPstartSymbolAndLength_2
=
52
;
msg3_DeltaPreamble
=
1
;
p0_NominalWithGrant
=-
90
;
# pucch-ConfigCommon setup :
# pucchGroupHopping
# 0 = neither, 1= group hopping, 2=sequence hopping
pucchGroupHopping
=
0
;
hoppingId
=
40
;
p0_nominal
= -
70
;
# ssb_PositionsInBurs_BitmapPR
# 1=short, 2=medium, 3=long
ssb_PositionsInBurst_PR
=
2
;
ssb_PositionsInBurst_Bitmap
=
1
;
# ssb_periodicityServingCell
# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
ssb_periodicityServingCell
=
2
;
# dmrs_TypeA_position
# 0 = pos2, 1 = pos3
dmrs_TypeA_Position
=
0
;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
subcarrierSpacing
=
1
;
#tdd-UL-DL-ConfigurationCommon
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
referenceSubcarrierSpacing
=
1
;
# pattern1
# dl_UL_TransmissionPeriodicity
# 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
dl_UL_TransmissionPeriodicity
=
6
;
nrofDownlinkSlots
=
7
;
nrofDownlinkSymbols
=
6
;
nrofUplinkSlots
=
2
;
nrofUplinkSymbols
=
4
;
ssPBCH_BlockPower
= -
25
;
}
);
# ------- SCTP definitions
SCTP
:
{
# Number of streams to use in input/output
SCTP_INSTREAMS
=
2
;
SCTP_OUTSTREAMS
=
2
;
};
//////////
AMF
parameters
:
amf_ip_address
= ( {
ipv4
=
"192.168.70.132"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
preference
=
"ipv4"
;
}
);
NETWORK_INTERFACES
:
{
GNB_INTERFACE_NAME_FOR_NG_AMF
=
"demo-oai"
;
GNB_IPV4_ADDRESS_FOR_NG_AMF
=
"192.168.70.129/24"
;
GNB_INTERFACE_NAME_FOR_NGU
=
"demo-oai"
;
GNB_IPV4_ADDRESS_FOR_NGU
=
"192.168.70.129/24"
;
GNB_PORT_FOR_S1U
=
2152
;
# Spec 2152
};
}
);
MACRLCs
= (
{
num_cc
=
1
;
tr_s_preference
=
"local_L1"
;
tr_n_preference
=
"local_RRC"
;
pusch_TargetSNRx10
=
200
;
pucch_TargetSNRx10
=
200
;
ulsch_max_frame_inactivity
=
0
;
}
);
L1s
= (
{
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
thread_pool_size
=
4
;
prach_dtx_threshold
=
120
;
pucch0_dtx_threshold
=
120
;
}
);
RUs
= (
{
local_rf
=
"yes"
nb_tx
=
2
nb_rx
=
2
att_tx
=
0
att_rx
=
0
;
bands
= [
78
];
max_pdschReferenceSignalPower
= -
27
;
max_rxgain
=
75
;
sf_extension
=
0
;
eNB_instances
= [
0
];
##beamforming 1x2 matrix: 1 layer x 2 antennas
bf_weights
= [
0
x00007fff
,
0
x0000
];
#clock_src = "internal";
sdr_addrs
=
"mgmt_addr=192.168.10.2,addr=192.168.10.2,clock_source=internal,time_source=internal"
}
);
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_SINGLE_THREAD"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_ENABLE"
;
}
);
rfsimulator
:
{
serveraddr
=
"server"
;
serverport
=
"4043"
;
options
= ();
#("saviq"); or/and "chanmod"
modelname
=
"AWGN"
;
IQfile
=
"/tmp/rfsimulator.iqs"
;
};
security
= {
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms
= (
"nea0"
);
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms
= (
"nia2"
,
"nia0"
);
# setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
# what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
drb_ciphering
=
"yes"
;
drb_integrity
=
"no"
;
};
log_config
:
{
global_log_level
=
"info"
;
global_log_verbosity
=
"medium"
;
hw_log_level
=
"info"
;
hw_log_verbosity
=
"medium"
;
phy_log_level
=
"info"
;
phy_log_verbosity
=
"medium"
;
mac_log_level
=
"info"
;
mac_log_verbosity
=
"high"
;
rlc_log_level
=
"info"
;
rlc_log_verbosity
=
"medium"
;
pdcp_log_level
=
"info"
;
pdcp_log_verbosity
=
"medium"
;
rrc_log_level
=
"info"
;
rrc_log_verbosity
=
"medium"
;
ngap_log_level
=
"debug"
;
ngap_log_verbosity
=
"medium"
;
f1ap_log_level
=
"debug"
;
f1ap_log_verbosity
=
"medium"
;
};
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