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
9b30cebb
Commit
9b30cebb
authored
Nov 08, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nr_pdsch' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into nr_pdsch
parents
cb5b7ce5
66fc9f7c
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
190 additions
and
195 deletions
+190
-195
ci-scripts/Jenkinsfile-gitlab
ci-scripts/Jenkinsfile-gitlab
+155
-175
ci-scripts/Jenkinsfile-tmp-ran
ci-scripts/Jenkinsfile-tmp-ran
+1
-2
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-3
cmake_targets/phy_simulators/CMakeLists.txt
cmake_targets/phy_simulators/CMakeLists.txt
+1
-1
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+2
-6
openair1/SIMULATION/LTE_PHY/ulsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
+2
-0
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
+12
-2
targets/RT/USER/nr-ue.c
targets/RT/USER/nr-ue.c
+15
-6
No files found.
ci-scripts/Jenkinsfile-gitlab
View file @
9b30cebb
This diff is collapsed.
Click to expand it.
ci-scripts/Jenkinsfile-tmp-ran
View file @
9b30cebb
...
...
@@ -61,6 +61,7 @@ pipeline {
options
{
disableConcurrentBuilds
()
ansiColor
(
'xterm'
)
lock
(
ciSmartPhoneResource
)
}
// the following parameter options are commented out so it shows the ones
// that you SHALL have to run the job.
...
...
@@ -184,7 +185,6 @@ pipeline {
steps
{
script
{
dir
(
'ci-scripts'
)
{
lock
(
ciSmartPhoneResource
)
{
try
{
echo
"\u2705 \u001B[32m${testStageName}\u001B[0m"
withCredentials
([
...
...
@@ -197,7 +197,6 @@ pipeline {
}
catch
(
Exception
e
)
{
currentBuild
.
result
=
'FAILURE'
}
}
}
}
}
...
...
cmake_targets/CMakeLists.txt
View file @
9b30cebb
...
...
@@ -2556,9 +2556,8 @@ add_executable(nr_dlschsim ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c
${
CONFIG_SOURCES
}
)
target_link_libraries
(
nr_dlschsim -Wl,--start-group UTIL SIMU PHY PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB
${
CONFIG_LIBRARIES
}
-Wl,--end-group m pthread dl rt
${
CONFIG_LIBRARIES
}
${
ATLAS_LIBRARIES
}
)
add_executable
(
nr_pbchsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/pbchsim.c
)
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
dl
)
add_executable
(
nr_pbchsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/pbchsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
foreach
(
myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
)
...
...
cmake_targets/phy_simulators/CMakeLists.txt
View file @
9b30cebb
...
...
@@ -9,5 +9,5 @@ set(MU_RECIEVER False)
set
(
NAS_UE False
)
set
(
MESSAGE_CHART_GENERATOR False
)
set
(
RRC_ASN1_VERSION
"Rel14"
)
set
(
T_TRACER
Fals
e
)
set
(
T_TRACER
Tru
e
)
include
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/../CMakeLists.txt
)
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
9b30cebb
...
...
@@ -546,7 +546,7 @@ int main(int argc, char **argv)
int
c
;
int
k
,
i
,
j
,
aa
;
int
re
;
int
loglvl
=
OAILOG_
DEBU
G
;
int
loglvl
=
OAILOG_
WARNIN
G
;
int
s
,
Kr
,
Kr_bytes
;
...
...
@@ -1073,12 +1073,8 @@ int main(int argc, char **argv)
AssertFatal
(
load_configmodule
(
argc
,
argv
)
!=
NULL
,
"cannot load configuration module, exiting
\n
"
);
logInit
();
// enable these lines if you need debug info
set_glog
(
loglvl
);
// moreover you need to init itti with the following line
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
//itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
T_stdout
=
1
;
if
(
common_flag
==
0
)
{
...
...
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @
9b30cebb
...
...
@@ -497,6 +497,8 @@ int main(int argc, char **argv) {
AssertFatal
(
load_configmodule
(
argc
,
argv
)
!=
NULL
,
"cannot load configuration module, exiting
\n
"
);
logInit
();
set_glog
(
OAILOG_WARNING
);
T_stdout
=
1
;
// enable these lines if you need debug info
// however itti will catch all signals, so ctrl-c won't work anymore
// alternatively you can disable ITTI completely in CMakeLists.txt
...
...
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @
9b30cebb
...
...
@@ -131,16 +131,17 @@ int main(int argc, char **argv)
int
ret
;
int
run_initial_sync
=
0
;
int
loglvl
=
OAILOG_WARNING
;
cpuf
=
get_cpu_freq_GHz
();
if
(
load_configmodule
(
argc
,
argv
)
==
0
)
{
exit_fun
(
"[SOFTMODEM] Error, configuration module init failed
\n
"
);
}
logInit
();
randominit
(
0
);
while
((
c
=
getopt
(
argc
,
argv
,
"f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:I"
))
!=
-
1
)
{
while
((
c
=
getopt
(
argc
,
argv
,
"f:hA:pf:g:i:j:n:s:S:t:x:y:z:N:F:GR:dP:I
L:
"
))
!=
-
1
)
{
switch
(
c
)
{
case
'f'
:
write_output_file
=
1
;
...
...
@@ -296,6 +297,11 @@ int main(int argc, char **argv)
case
'I'
:
run_initial_sync
=
1
;
break
;
case
'L'
:
loglvl
=
atoi
(
optarg
);
break
;
default:
case
'h'
:
printf
(
"%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId
\n
"
,
...
...
@@ -325,6 +331,10 @@ int main(int argc, char **argv)
}
}
logInit
();
set_glog
(
loglvl
);
T_stdout
=
1
;
if
(
snr1set
==
0
)
snr1
=
snr0
+
10
;
...
...
targets/RT/USER/nr-ue.c
View file @
9b30cebb
...
...
@@ -59,8 +59,13 @@
#include "T.h"
#ifdef XFORMS
#include "PHY/TOOLS/nr_phy_scope.h"
extern
char
do_forms
;
#endif
extern
double
cpuf
;
//static nfapi_nr_config_request_t config_t;
//static nfapi_nr_config_request_t* config =&config_t;
...
...
@@ -589,12 +594,16 @@ static void *UE_thread_synch(void *arg) {
break
;
}
extern
FD_lte_phy_scope_ue
*
form_ue
[
NUMBER_OF_UE_MAX
];
phy_scope_UE
(
form_ue
[
0
],
PHY_vars_UE_g
[
0
][
0
],
0
,
0
,
7
);
#ifdef XFORMS
if
(
do_forms
)
{
extern
FD_lte_phy_scope_ue
*
form_ue
[
NUMBER_OF_UE_MAX
];
phy_scope_UE
(
form_ue
[
0
],
PHY_vars_UE_g
[
0
][
0
],
0
,
0
,
7
);
}
#endif
AssertFatal
(
0
==
pthread_mutex_lock
(
&
UE
->
proc
.
mutex_synch
),
""
);
// indicate readiness
UE
->
proc
.
instance_cnt_synch
--
;
...
...
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