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
4511e70f
Commit
4511e70f
authored
Apr 05, 2021
by
Laurent OpenCells
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix from ci results
parent
c0ef3e6f
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
57 additions
and
84 deletions
+57
-84
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-2
common/utils/system.h
common/utils/system.h
+2
-2
common/utils/telnetsrv/telnetsrv.c
common/utils/telnetsrv/telnetsrv.c
+1
-1
openair1/PHY/LTE_REFSIG/primary_synch.h
openair1/PHY/LTE_REFSIG/primary_synch.h
+1
-0
openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c
openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c
+0
-36
openair1/PHY/NR_REFSIG/ul_ref_seq_nr.h
openair1/PHY/NR_REFSIG/ul_ref_seq_nr.h
+38
-0
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+1
-1
openair1/SIMULATION/TOOLS/phase_noise.c
openair1/SIMULATION/TOOLS/phase_noise.c
+1
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-1
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+1
-25
openair2/PHY_INTERFACE/phy_stub_UE.h
openair2/PHY_INTERFACE/phy_stub_UE.h
+1
-1
openair2/RRC/LTE/plmn_data.h
openair2/RRC/LTE/plmn_data.h
+2
-1
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+2
-3
openair2/UTIL/OCG/OCG.h
openair2/UTIL/OCG/OCG.h
+0
-6
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+3
-3
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
No files found.
cmake_targets/CMakeLists.txt
View file @
4511e70f
...
...
@@ -338,11 +338,11 @@ endif ()
add_definitions
(
"-DASN_DISABLE_OER_SUPPORT"
)
#########################
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-
-sanitize=address -
Wl,-rpath -Wl,
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-Wl,-rpath -Wl,
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
#########################
# set a flag for changes in the source code
# these changes are related to hardcoded path to include .h files
set
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS
}
-g3 -O0 -
-sanitize=address -
DMALLOC_CHECK_=3"
)
set
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS
}
-g3 -O0 -DMALLOC_CHECK_=3"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
-g3 -DMALLOC_CHECK_=3 -O2 -fno-delete-null-pointer-checks"
)
set
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS
}
-O3"
)
...
...
common/utils/system.h
View file @
4511e70f
...
...
@@ -49,8 +49,8 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
#define SCHED_OAI SCHED_RR
#define OAI_PRIORITY_RT_LOW sched_get_priority_min(SCHED_OAI)
#define OAI_PRIORITY_RT
sched_get_priority_min(SCHED_OAI)+1
#define OAI_PRIORITY_RT_MAX sched_get_priority_m
in(SCHED_OAI)+
2
#define OAI_PRIORITY_RT
((sched_get_priority_min(SCHED_OAI)+sched_get_priority_min(SCHED_OAI))/2)
#define OAI_PRIORITY_RT_MAX sched_get_priority_m
ax(SCHED_OAI)-
2
void
thread_top_init
(
char
*
thread_name
,
int
affinity
,
...
...
common/utils/telnetsrv/telnetsrv.c
View file @
4511e70f
...
...
@@ -702,7 +702,7 @@ void poll_telnetcmdq(void *qid, void *arg) {
*/
void
exec_moduleinit
(
char
*
modname
)
{
void
(
*
fptr
)(
void
);
char
initfunc
[
TELNET_CMD_MAXSIZE
+
9
];
char
initfunc
[
TELNET_CMD_MAXSIZE
+
10
];
if
(
strlen
(
modname
)
>
TELNET_CMD_MAXSIZE
)
{
fprintf
(
stderr
,
"[TELNETSRV] module %s not loaded, name exceeds the %i size limit
\n
"
,
...
...
openair1/PHY/LTE_REFSIG/primary_synch.h
View file @
4511e70f
...
...
@@ -18,6 +18,7 @@
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
short
primary_synch0
[
144
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
32767
,
0
,
-
26120
,
-
19785
,
11971
,
-
30502
,
-
24020
,
-
22288
,
32117
,
6492
,
31311
,
9658
,
-
16384
,
-
28378
,
25100
,
-
21063
,
-
7292
,
-
31946
,
20429
,
25618
,
14948
,
29158
,
11971
,
-
30502
,
31311
,
9658
,
25100
,
-
21063
,
-
16384
,
28377
,
-
24020
,
22287
,
32117
,
6492
,
-
7292
,
31945
,
20429
,
25618
,
-
26120
,
-
19785
,
-
16384
,
-
28378
,
-
16384
,
28377
,
-
26120
,
-
19785
,
-
32402
,
4883
,
31311
,
-
9659
,
32117
,
6492
,
-
7292
,
-
31946
,
32767
,
-
1
,
25100
,
-
21063
,
-
24020
,
22287
,
-
32402
,
4883
,
-
32402
,
4883
,
-
24020
,
22287
,
25100
,
-
21063
,
32767
,
-
1
,
-
7292
,
-
31946
,
32117
,
6492
,
31311
,
-
9659
,
-
32402
,
4883
,
-
26120
,
-
19785
,
-
16384
,
28377
,
-
16384
,
-
28378
,
-
26120
,
-
19785
,
20429
,
25618
,
-
7292
,
31945
,
32117
,
6492
,
-
24020
,
22287
,
-
16384
,
28377
,
25100
,
-
21063
,
31311
,
9658
,
11971
,
-
30502
,
14948
,
29158
,
20429
,
25618
,
-
7292
,
-
31946
,
25100
,
-
21063
,
-
16384
,
-
28378
,
31311
,
9658
,
32117
,
6492
,
-
24020
,
-
22288
,
11971
,
-
30502
,
-
26120
,
-
19785
,
32767
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
primary_synch1
[
144
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
32767
,
0
,
-
31754
,
-
8086
,
-
24020
,
-
22288
,
2448
,
32675
,
-
26120
,
19784
,
27073
,
18458
,
-
16384
,
28377
,
25100
,
21062
,
-
29523
,
14217
,
-
7292
,
31945
,
-
13477
,
-
29868
,
-
24020
,
-
22288
,
27073
,
18458
,
25100
,
21062
,
-
16384
,
-
28378
,
2448
,
-
32676
,
-
26120
,
19784
,
-
29523
,
-
14218
,
-
7292
,
31945
,
-
31754
,
-
8086
,
-
16384
,
28377
,
-
16384
,
-
28378
,
-
31754
,
-
8086
,
31311
,
-
9659
,
27073
,
-
18459
,
-
26120
,
19784
,
-
29523
,
14217
,
32767
,
-
1
,
25100
,
21062
,
2448
,
-
32676
,
31311
,
-
9659
,
31311
,
-
9659
,
2448
,
-
32676
,
25100
,
21062
,
32767
,
0
,
-
29523
,
14217
,
-
26120
,
19784
,
27073
,
-
18459
,
31311
,
-
9659
,
-
31754
,
-
8086
,
-
16384
,
-
28378
,
-
16384
,
28377
,
-
31754
,
-
8086
,
-
7292
,
31945
,
-
29523
,
-
14218
,
-
26120
,
19784
,
2448
,
-
32676
,
-
16384
,
-
28378
,
25100
,
21062
,
27073
,
18458
,
-
24020
,
-
22288
,
-
13477
,
-
29868
,
-
7292
,
31945
,
-
29523
,
14217
,
25100
,
21062
,
-
16384
,
28377
,
27073
,
18458
,
-
26120
,
19784
,
2448
,
32675
,
-
24020
,
-
22288
,
-
31754
,
-
8086
,
32767
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
primary_synch2
[
144
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
32767
,
0
,
-
31754
,
8085
,
-
24020
,
22287
,
2448
,
-
32676
,
-
26120
,
-
19785
,
27073
,
-
18459
,
-
16384
,
-
28378
,
25100
,
-
21063
,
-
29523
,
-
14218
,
-
7292
,
-
31946
,
-
13477
,
29867
,
-
24020
,
22287
,
27073
,
-
18459
,
25100
,
-
21063
,
-
16384
,
28377
,
2448
,
32675
,
-
26120
,
-
19785
,
-
29523
,
14217
,
-
7292
,
-
31946
,
-
31754
,
8085
,
-
16384
,
-
28378
,
-
16384
,
28377
,
-
31754
,
8085
,
31311
,
9658
,
27073
,
18458
,
-
26120
,
-
19785
,
-
29523
,
-
14218
,
32767
,
0
,
25100
,
-
21063
,
2448
,
32675
,
31311
,
9658
,
31311
,
9658
,
2448
,
32675
,
25100
,
-
21063
,
32767
,
0
,
-
29523
,
-
14218
,
-
26120
,
-
19785
,
27073
,
18458
,
31311
,
9658
,
-
31754
,
8085
,
-
16384
,
28377
,
-
16384
,
-
28378
,
-
31754
,
8085
,
-
7292
,
-
31946
,
-
29523
,
14217
,
-
26120
,
-
19785
,
2448
,
32675
,
-
16384
,
28377
,
25100
,
-
21063
,
27073
,
-
18459
,
-
24020
,
22287
,
-
13477
,
29867
,
-
7292
,
-
31946
,
-
29523
,
-
14218
,
25100
,
-
21063
,
-
16384
,
-
28378
,
27073
,
-
18459
,
-
26120
,
-
19785
,
2448
,
-
32676
,
-
24020
,
22287
,
-
31754
,
8085
,
32767
,
-
1
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
...
...
openair1/PHY/NR_REFSIG/ul_ref_seq_nr.c
View file @
4511e70f
...
...
@@ -54,42 +54,6 @@
*
*********************************************************************/
/* Table 5.2.2.2-2: Definition of phi ( n ) for M ZC = 12 */
const
char
phi_M_ZC_12
[
12
*
U_GROUP_NUMBER
]
=
{
/* 0 1 2 3 4 5 6 7 8 9 10 11 */
/* 0 */
1
,
-
1
,
3
,
1
,
1
,
-
1
,
-
1
,
-
1
,
1
,
3
,
-
3
,
1
,
/* 1 */
-
1
,
-
1
,
-
1
,
-
1
,
1
,
-
3
,
-
1
,
3
,
3
,
-
1
,
-
3
,
1
,
/* 2 */
-
3
,
1
,
-
3
,
-
3
,
-
3
,
3
,
-
3
,
-
1
,
1
,
1
,
1
,
-
3
,
/* 3 */
-
3
,
3
,
1
,
3
,
-
3
,
1
,
1
,
1
,
1
,
3
,
-
3
,
3
,
/* 4 */
-
3
,
1
,
3
,
-
1
,
-
1
,
-
3
,
-
3
,
-
1
,
-
1
,
3
,
1
,
-
3
,
/* 5 */
-
1
,
1
,
1
,
-
1
,
1
,
3
,
3
,
-
1
,
-
1
,
-
3
,
1
,
-
3
,
/* 6 */
-
3
,
-
3
,
-
1
,
3
,
3
,
3
,
-
3
,
3
,
-
3
,
1
,
-
1
,
-
3
,
/* 7 */
-
3
,
3
,
-
3
,
3
,
3
,
-
3
,
-
1
,
-
1
,
3
,
3
,
1
,
-
3
,
/* 8 */
-
3
,
-
1
,
-
3
,
-
1
,
-
1
,
-
3
,
3
,
3
,
-
1
,
-
1
,
1
,
-
3
,
/* 9 */
-
3
,
3
,
3
,
3
,
-
1
,
-
3
,
-
3
,
-
1
,
-
3
,
1
,
3
,
-
3
,
/* 10 */
1
,
3
,
-
3
,
1
,
3
,
3
,
3
,
1
,
-
1
,
1
,
-
1
,
3
,
/* 11 */
-
1
,
-
3
,
3
,
-
1
,
-
3
,
-
3
,
-
3
,
-
1
,
1
,
-
1
,
1
,
-
3
,
/* 12 */
3
,
1
,
3
,
1
,
3
,
-
3
,
-
1
,
1
,
3
,
1
,
-
1
,
-
3
,
/* 13 */
-
3
,
-
3
,
3
,
3
,
3
,
-
3
,
-
1
,
1
,
-
3
,
3
,
1
,
-
3
,
/* 14 */
-
3
,
-
1
,
1
,
-
3
,
1
,
3
,
3
,
3
,
-
1
,
-
3
,
3
,
3
,
/* 15 */
-
3
,
-
3
,
3
,
1
,
-
3
,
-
3
,
-
3
,
-
1
,
3
,
-
1
,
1
,
3
,
/* 16 */
-
1
,
1
,
3
,
-
3
,
1
,
-
1
,
1
,
-
1
,
-
1
,
-
3
,
1
,
-
1
,
/* 17 */
-
3
,
-
1
,
-
1
,
1
,
3
,
1
,
1
,
-
1
,
1
,
-
1
,
-
3
,
1
,
/* 18 */
-
3
,
-
1
,
3
,
-
3
,
-
3
,
-
1
,
-
3
,
1
,
-
1
,
-
3
,
3
,
3
,
/* 19 */
-
3
,
-
3
,
3
,
-
3
,
-
1
,
3
,
3
,
3
,
-
1
,
-
3
,
1
,
-
3
,
/* 20 */
-
3
,
1
,
-
1
,
-
1
,
3
,
3
,
-
3
,
-
1
,
-
1
,
-
3
,
-
1
,
-
3
,
/* 21 */
-
3
,
1
,
3
,
3
,
-
1
,
-
1
,
-
3
,
3
,
3
,
-
3
,
3
,
-
3
,
/* 22 */
-
3
,
-
1
,
-
1
,
-
3
,
-
3
,
-
1
,
-
3
,
3
,
1
,
3
,
-
1
,
-
3
,
/* 23 */
-
3
,
-
1
,
3
,
1
,
-
3
,
-
1
,
-
3
,
3
,
1
,
3
,
3
,
1
,
/* 24 */
-
3
,
3
,
3
,
1
,
-
3
,
3
,
-
1
,
1
,
3
,
-
3
,
3
,
-
3
,
/* 25 */
3
,
-
1
,
-
3
,
3
,
-
3
,
-
1
,
3
,
3
,
3
,
-
3
,
-
1
,
-
3
,
/* 26 */
1
,
-
1
,
3
,
-
1
,
-
1
,
-
1
,
-
3
,
-
1
,
1
,
1
,
1
,
-
3
,
/* 27 */
-
3
,
3
,
1
,
-
3
,
1
,
3
,
-
1
,
-
1
,
1
,
3
,
3
,
3
,
/* 28 */
-
3
,
3
,
-
3
,
3
,
-
3
,
-
3
,
3
,
-
1
,
-
1
,
1
,
3
,
-
3
,
/* 29 */
-
3
,
3
,
1
,
-
1
,
3
,
3
,
-
3
,
1
,
-
1
,
1
,
-
1
,
1
,
}
;
int16_t
*
base_sequence_less_than_36
(
unsigned
int
M_ZC
,
unsigned
int
u
,
unsigned
int
scaling
)
...
...
openair1/PHY/NR_REFSIG/ul_ref_seq_nr.h
View file @
4511e70f
...
...
@@ -141,6 +141,44 @@ EXTERN const char phi_M_ZC_6[6*U_GROUP_NUMBER]
}
#endif
;
/* Table 5.2.2.2-2: Definition of phi ( n ) for M ZC = 12 */
EXTERN
const
char
phi_M_ZC_12
[
12
*
U_GROUP_NUMBER
]
#ifdef INIT_VARIABLES_LOWPAPR_SEQUENCES_NR_H
=
{
/* 0 1 2 3 4 5 6 7 8 9 10 11 */
/* 0 */
1
,
-
1
,
3
,
1
,
1
,
-
1
,
-
1
,
-
1
,
1
,
3
,
-
3
,
1
,
/* 1 */
-
1
,
-
1
,
-
1
,
-
1
,
1
,
-
3
,
-
1
,
3
,
3
,
-
1
,
-
3
,
1
,
/* 2 */
-
3
,
1
,
-
3
,
-
3
,
-
3
,
3
,
-
3
,
-
1
,
1
,
1
,
1
,
-
3
,
/* 3 */
-
3
,
3
,
1
,
3
,
-
3
,
1
,
1
,
1
,
1
,
3
,
-
3
,
3
,
/* 4 */
-
3
,
1
,
3
,
-
1
,
-
1
,
-
3
,
-
3
,
-
1
,
-
1
,
3
,
1
,
-
3
,
/* 5 */
-
1
,
1
,
1
,
-
1
,
1
,
3
,
3
,
-
1
,
-
1
,
-
3
,
1
,
-
3
,
/* 6 */
-
3
,
-
3
,
-
1
,
3
,
3
,
3
,
-
3
,
3
,
-
3
,
1
,
-
1
,
-
3
,
/* 7 */
-
3
,
3
,
-
3
,
3
,
3
,
-
3
,
-
1
,
-
1
,
3
,
3
,
1
,
-
3
,
/* 8 */
-
3
,
-
1
,
-
3
,
-
1
,
-
1
,
-
3
,
3
,
3
,
-
1
,
-
1
,
1
,
-
3
,
/* 9 */
-
3
,
3
,
3
,
3
,
-
1
,
-
3
,
-
3
,
-
1
,
-
3
,
1
,
3
,
-
3
,
/* 10 */
1
,
3
,
-
3
,
1
,
3
,
3
,
3
,
1
,
-
1
,
1
,
-
1
,
3
,
/* 11 */
-
1
,
-
3
,
3
,
-
1
,
-
3
,
-
3
,
-
3
,
-
1
,
1
,
-
1
,
1
,
-
3
,
/* 12 */
3
,
1
,
3
,
1
,
3
,
-
3
,
-
1
,
1
,
3
,
1
,
-
1
,
-
3
,
/* 13 */
-
3
,
-
3
,
3
,
3
,
3
,
-
3
,
-
1
,
1
,
-
3
,
3
,
1
,
-
3
,
/* 14 */
-
3
,
-
1
,
1
,
-
3
,
1
,
3
,
3
,
3
,
-
1
,
-
3
,
3
,
3
,
/* 15 */
-
3
,
-
3
,
3
,
1
,
-
3
,
-
3
,
-
3
,
-
1
,
3
,
-
1
,
1
,
3
,
/* 16 */
-
1
,
1
,
3
,
-
3
,
1
,
-
1
,
1
,
-
1
,
-
1
,
-
3
,
1
,
-
1
,
/* 17 */
-
3
,
-
1
,
-
1
,
1
,
3
,
1
,
1
,
-
1
,
1
,
-
1
,
-
3
,
1
,
/* 18 */
-
3
,
-
1
,
3
,
-
3
,
-
3
,
-
1
,
-
3
,
1
,
-
1
,
-
3
,
3
,
3
,
/* 19 */
-
3
,
-
3
,
3
,
-
3
,
-
1
,
3
,
3
,
3
,
-
1
,
-
3
,
1
,
-
3
,
/* 20 */
-
3
,
1
,
-
1
,
-
1
,
3
,
3
,
-
3
,
-
1
,
-
1
,
-
3
,
-
1
,
-
3
,
/* 21 */
-
3
,
1
,
3
,
3
,
-
1
,
-
1
,
-
3
,
3
,
3
,
-
3
,
3
,
-
3
,
/* 22 */
-
3
,
-
1
,
-
1
,
-
3
,
-
3
,
-
1
,
-
3
,
3
,
1
,
3
,
-
1
,
-
3
,
/* 23 */
-
3
,
-
1
,
3
,
1
,
-
3
,
-
1
,
-
3
,
3
,
1
,
3
,
3
,
1
,
/* 24 */
-
3
,
3
,
3
,
1
,
-
3
,
3
,
-
1
,
1
,
3
,
-
3
,
3
,
-
3
,
/* 25 */
3
,
-
1
,
-
3
,
3
,
-
3
,
-
1
,
3
,
3
,
3
,
-
3
,
-
1
,
-
3
,
/* 26 */
1
,
-
1
,
3
,
-
1
,
-
1
,
-
1
,
-
3
,
-
1
,
1
,
1
,
1
,
-
3
,
/* 27 */
-
3
,
3
,
1
,
-
3
,
1
,
3
,
-
1
,
-
1
,
1
,
3
,
3
,
3
,
/* 28 */
-
3
,
3
,
-
3
,
3
,
-
3
,
-
3
,
3
,
-
1
,
-
1
,
1
,
3
,
-
3
,
/* 29 */
-
3
,
3
,
1
,
-
1
,
3
,
3
,
-
3
,
1
,
-
1
,
1
,
-
1
,
1
,
}
#endif
;
/* Table 5.2.2.2-3: Definition of phi (n ) for M_ZC = 18 */
EXTERN
const
char
phi_M_ZC_18
[
18
*
U_GROUP_NUMBER
]
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
4511e70f
...
...
@@ -40,6 +40,7 @@
#include "common/utils/LOG/log.h"
#include <common/utils/system.h>
#include "common/utils/LOG/vcd_signal_dumper.h"
#include <nfapi/oai_integration/nfapi_pnf.h>
#include "assertions.h"
#include "msc.h"
...
...
@@ -51,7 +52,6 @@
#define MBMS_NFAPI_SCHEDULER
extern
nfapi_ue_release_request_body_t
release_rntis
;
int16_t
get_hundred_times_delta_IF_eNB
(
PHY_VARS_eNB
*
eNB
,
uint16_t
UE_id
,
uint8_t
harq_pid
,
uint8_t
bw_factor
)
{
uint32_t
Nre
,
sumKr
,
MPR_x100
,
Kr
,
r
;
...
...
openair1/SIMULATION/TOOLS/phase_noise.c
View file @
4511e70f
...
...
@@ -26,7 +26,7 @@
#include "sim.h"
uint16_t
LUTSin
[
ResolSinCos
+
1
];
static
uint16_t
LUTSin
[
ResolSinCos
+
1
];
/* linear phase noise model */
void
phase_noise
(
double
ts
,
int16_t
*
InRe
,
int16_t
*
InIm
)
{
...
...
openair2/GNB_APP/gnb_config.c
View file @
4511e70f
...
...
@@ -175,7 +175,7 @@ void prepare_scc(NR_ServingCellConfigCommon_t *scc) {
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
msg3_DeltaPreamble
=
CALLOC
(
1
,
sizeof
(
long
));
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
p0_NominalWithGrant
=
CALLOC
(
1
,
sizeof
(
long
));
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
=
CALLOC
(
1
,
sizeof
(
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch
_ConfigCommon
));
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
=
CALLOC
(
1
,
sizeof
(
struct
NR_SetupRelease_PUCCH
_ConfigCommon
));
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
present
=
NR_SetupRelease_PUCCH_ConfigCommon_PR_setup
;
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
struct
NR_PUCCH_ConfigCommon
));
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
p0_nominal
=
CALLOC
(
1
,
sizeof
(
long
));
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
4511e70f
...
...
@@ -375,7 +375,6 @@ int pdcp_fifo_read_input_sdus_fromnetlinksock (const protocol_ctxt_t *const ctx
protocol_ctxt_t
ctxt
;
hash_key_t
key
=
HASHTABLE_NOT_A_KEY_VALUE
;
hashtable_rc_t
h_rc
;
module_id_t
ue_id
=
0
;
pdcp_t
*
pdcp_p
=
NULL
;
static
unsigned
char
pdcp_read_state_g
=
0
;
rb_id_t
rab_id
=
0
;
...
...
@@ -469,30 +468,7 @@ int pdcp_fifo_read_input_sdus_fromnetlinksock (const protocol_ctxt_t *const ctx
}
else
{
// rb_id =0, thus interpreated as broadcast and transported as multiple unicast
// is a broadcast packet, we have to send this packet on all default RABS of all connected UEs
//#warning CODE TO BE REVIEWED, ONLY WORK FOR SIMPLE TOPOLOGY CASES
for
(
ue_id
=
0
;
ue_id
<
NB_UE_INST
;
ue_id
++
)
{
if
(
oai_emulation
.
info
.
eNB_ue_module_id_to_rnti
[
ctxt_cpy
.
module_id
][
ue_id
]
!=
NOT_A_RNTI
)
{
ctxt
.
rnti
=
oai_emulation
.
info
.
eNB_ue_module_id_to_rnti
[
ctxt_cpy
.
module_id
][
ue_id
];
LOG_D
(
PDCP
,
"[FRAME %5u][eNB][IP][INSTANCE %u][RB %ld][--- PDCP_DATA_REQ / %d Bytes --->][PDCP][MOD %u][UE %u][RB DEFAULT_RAB_ID %u]
\n
"
,
ctxt
.
frame
,
pdcp_read_header_g
.
inst
,
pdcp_read_header_g
.
rb_id
,
pdcp_read_header_g
.
data_size
,
ctxt
.
module_id
,
ctxt
.
rnti
,
DEFAULT_RAB_ID
);
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
DEFAULT_RAB_ID
,
RLC_MUI_UNDEFINED
,
RLC_SDU_CONFIRM_NO
,
pdcp_read_header_g
.
data_size
,
(
unsigned
char
*
)
NLMSG_DATA
(
nas_nlh_rx
),
PDCP_TRANSMISSION_MODE_DATA
,
NULL
,
NULL
);
}
}
// never finished code, dropped
}
}
else
{
// ctxt.enb_flag => UE
if
(
NFAPI_MODE
==
NFAPI_UE_STUB_PNF
)
{
...
...
openair2/PHY_INTERFACE/phy_stub_UE.h
View file @
4511e70f
...
...
@@ -18,6 +18,7 @@
//#include "openair1/PHY/LTE_TRANSPORT/defs.h"
//below 2 difinitions move to phy_stub_UE.c to add initialization when difinition.
extern
int
tx_req_num_elems
;
extern
UL_IND_t
*
UL_INFO
;
extern
nfapi_tx_request_pdu_t
*
tx_request_pdu_list
;
// New
...
...
@@ -27,7 +28,6 @@ extern nfapi_dl_config_request_t* dl_config_req;
extern
nfapi_ul_config_request_t
*
ul_config_req
;
extern
nfapi_hi_dci0_request_t
*
hi_dci0_req
;
extern
int
tx_req_num_elems
;
//below 2 difinitions move to lte-ue.c to add initialization when difinition.
//int next_ra_frame;
...
...
openair2/RRC/LTE/plmn_data.h
View file @
4511e70f
...
...
@@ -2232,6 +2232,7 @@ static const plmn_data_t plmn_data[] = {
310 900 Mid-Rivers Communications Mid-Rivers Wireless Operational
*/
{
310
,
910
,
"Verizon Wireless"
,
"Verizon USA"
},
{
0
,
0
,
""
,
""
}
/*
310 920 Get Mobile Inactive
310 930 Copper Valley Wireless Inactive
...
...
@@ -2295,7 +2296,7 @@ static const plmn_data_t plmn_data[] = {
648 4 Econet Wireless Econet Operational
*/
{
0
,
0
,
""
,
""
}
};
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
4511e70f
...
...
@@ -6557,10 +6557,9 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
(
int
)
DRB_configList
->
list
.
array
[
i
]
->
drb_Identity
,
(
int
)
*
DRB_configList
->
list
.
array
[
i
]
->
logicalChannelIdentity
);
/* For pre-ci tests */
LOG_I
(
RRC
,
"[eNB %d] Frame %d : Logical Channel UL-DCCH, Received LTE_RRCConnectionReconfigurationComplete
from UE %u
, reconfiguring DRB %d/LCID %d
\n
"
,
LOG_I
(
RRC
,
"[eNB %d] Frame %d : Logical Channel UL-DCCH, Received LTE_RRCConnectionReconfigurationComplete, reconfiguring DRB %d/LCID %d
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
oai_emulation
.
info
.
eNB_ue_local_uid_to_ue_module_id
[
ctxt_pP
->
module_id
][
ue_context_pP
->
local_uid
],
(
int
)
DRB_configList
->
list
.
array
[
i
]
->
drb_Identity
,
(
int
)
*
DRB_configList
->
list
.
array
[
i
]
->
logicalChannelIdentity
);
...
...
@@ -6585,7 +6584,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
"[eNB %d] Config the oai%d to send/receive pkt on DRB %ld to/from the protocol stack
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
module_id
,
(
long
int
)((
ue_context_pP
->
local_uid
*
LTE_maxDRB
)
+
DRB_configList
->
list
.
array
[
i
]
->
drb_Identity
));
ue_module_id
=
oai_emulation
.
info
.
eNB_ue_local_uid_to_ue_module_id
[
ctxt_pP
->
module_id
][
ue_context_pP
->
local_uid
];
ue_module_id
=
0
;
// Was
oai_emulation.info.eNB_ue_local_uid_to_ue_module_id[ctxt_pP->module_id][ue_context_pP->local_uid];
rb_conf_ipv4
(
0
,
//add
ue_module_id
,
//cx
ctxt_pP
->
module_id
,
//inst
...
...
openair2/UTIL/OCG/OCG.h
View file @
4511e70f
...
...
@@ -716,12 +716,6 @@ typedef struct {
*/
unsigned
char
slot_isr
;
int
slot_sfd
;
rnti_t
eNB_ue_module_id_to_rnti
[
NUMBER_OF_eNB_MAX
][
NUMBER_OF_UE_MAX
];
/*!< \brief used by eNB, this array can be filled:
by local virtualization: set directly by UE, or by remote UEs: TODO add signalisation on ethernet emulation link from UE to eNB*/
module_id_t
eNB_ue_local_uid_to_ue_module_id
[
NUMBER_OF_eNB_MAX
][
NUMBER_OF_UE_MAX
];
/*!< \brief used by eNB, this array can be filled:
by local virtualization: set directly by UE, or by remote UEs: TODO add signalisation on ethernet emulation link from UE to eNB*/
}
Info
;
/* @}*/
...
...
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @
4511e70f
...
...
@@ -153,7 +153,7 @@ int check_ref_locked(usrp_state_t *s,size_t mboard) {
}
static
int
sync_to_gps
(
openair0_device
*
device
)
{
uhd
::
set_thread_priority_safe
();
//
uhd::set_thread_priority_safe();
//std::string args;
//Set up program options
//po::options_description desc("Allowed options");
...
...
@@ -589,7 +589,7 @@ void *trx_usrp_write_thread(void * arg){
int
trx_usrp_write_init
(
openair0_device
*
device
){
uhd
::
set_thread_priority_safe
(
1.0
);
//
uhd::set_thread_priority_safe(1.0);
openair0_thread_t
*
write_thread
=
&
device
->
write_thread
;
printf
(
"initializing tx write thread
\n
"
);
...
...
@@ -940,7 +940,7 @@ extern "C" {
// hotfix! to be checked later
uhd
::
set_thread_priority_safe
(
1.0
);
//
uhd::set_thread_priority_safe(1.0);
// Initialize USRP device
int
vers
=
0
,
subvers
=
0
,
subsubvers
=
0
;
int
bw_gain_adjust
=
0
;
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
View file @
4511e70f
...
...
@@ -269,7 +269,7 @@ RUs = (
eNB_instances
= [
0
];
#beamforming 1x4 matrix:
bf_weights
= [
0
x00007fff
,
0
x0000
,
0
x0000
,
0
x0000
];
clock_src
=
"
ex
ternal"
;
clock_src
=
"
in
ternal"
;
}
);
...
...
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