Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
48cb7162
Commit
48cb7162
authored
Jan 05, 2022
by
Luis Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Rename pusch_proc_threads to thread_pool_size"
This reverts commit daf8b950e143948bb7c50ffdc6039a8edf7a2e25
parent
00f17f4a
Changes
44
Show whitespace changes
Inline
Side-by-side
Showing
44 changed files
with
121 additions
and
121 deletions
+121
-121
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
+1
-1
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
+1
-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
+1
-1
No files found.
ci-scripts/conf_files/benetel-5g.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
2
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -229,7 +229,7 @@ L1s = (
...
@@ -229,7 +229,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
thread_pool_size
=
2
;
pusch_proc_threads
=
2
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
}
}
);
);
...
...
ci-scripts/conf_files/gnb.band261.tm1.32PRB.usrpn300.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
6
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
6
;
pusch_proc_threads
=
6
;
}
}
);
);
RUs
= (
RUs
= (
...
...
executables/nr-gnb.c
View file @
48cb7162
...
@@ -400,8 +400,8 @@ void init_gNB_Tpool(int inst) {
...
@@ -400,8 +400,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
->
thread_pool_size
,
numCPU
);
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
);
int
threadCnt
=
min
(
numCPU
,
gNB
->
thread_pool_size
);
int
threadCnt
=
min
(
numCPU
,
gNB
->
pusch_proc_threads
);
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 @
48cb7162
...
@@ -891,7 +891,7 @@ typedef struct PHY_VARS_gNB_s {
...
@@ -891,7 +891,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
thread_pool_size
;
uint8_t
pusch_proc_threads
;
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 @
48cb7162
...
@@ -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_
THREAD_POOL_SIZE "thread_pool_size
"
#define CONFIG_STRING_L1_
PUSCH_PROC_THREADS "pusch_proc_threads
"
#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,7 +65,7 @@
...
@@ -65,7 +65,7 @@
{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_
THREAD_POOL_SIZE, NULL, 0, uptr:NULL, defintval:4, TYPE_UINT, 0},
\
{CONFIG_STRING_L1_
PUSCH_PROC_THREADS, NULL, 0, uptr:NULL, defintval:3, 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}, \
...
@@ -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_
THREAD_POOL_SIZE
9
#define L1_
PUSCH_PROC_THREADS
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 @
48cb7162
...
@@ -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
]
->
thread_pool_size
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_THREAD_POOL_SIZE
].
uptr
);
RC
.
gNB
[
j
]
->
pusch_proc_threads
=
*
(
L1_ParamList
.
paramarray
[
j
][
L1_PUSCH_PROC_THREADS
].
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpn300.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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
thread_pool_size
=
8
;
pusch_proc_threads
=
8
;
}
}
);
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
2
;
pusch_proc_threads
=
2
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
View file @
48cb7162
...
@@ -219,7 +219,7 @@ L1s = (
...
@@ -219,7 +219,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
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
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
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 @
48cb7162
...
@@ -220,7 +220,7 @@ L1s = (
...
@@ -220,7 +220,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
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
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf
View file @
48cb7162
...
@@ -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"
;
thread_pool_size
=
8
;
pusch_proc_threads
=
8
;
}
}
);
);
RUs
= (
RUs
= (
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
View file @
48cb7162
...
@@ -248,7 +248,7 @@ L1s = (
...
@@ -248,7 +248,7 @@ L1s = (
{
{
num_cc
=
1
;
num_cc
=
1
;
tr_n_preference
=
"local_mac"
;
tr_n_preference
=
"local_mac"
;
thread_pool_size
=
4
;
pusch_proc_threads
=
4
;
prach_dtx_threshold
=
120
;
prach_dtx_threshold
=
120
;
pucch0_dtx_threshold
=
120
;
pucch0_dtx_threshold
=
120
;
}
}
...
...
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