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
d06b3c92
Commit
d06b3c92
authored
Aug 29, 2016
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-59-tm4
parents
b9f6333c
fa69a005
Changes
23
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
755 additions
and
263 deletions
+755
-263
.gitlab-ci.yml
.gitlab-ci.yml
+5
-3
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
+3
-3
cmake_targets/autotests/test_case_list.xml
cmake_targets/autotests/test_case_list.xml
+96
-100
cmake_targets/autotests/tools/remove_old_programs.bash
cmake_targets/autotests/tools/remove_old_programs.bash
+26
-1
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+2
-1
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/INIT/lte_param_init.c
+3
-1
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+2
-2
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci.c
+1
-1
openair1/SIMULATION/LTE_PHY/mbmssim.c
openair1/SIMULATION/LTE_PHY/mbmssim.c
+1
-63
openair1/SIMULATION/LTE_PHY/pbchsim.c
openair1/SIMULATION/LTE_PHY/pbchsim.c
+1
-1
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
+79
-67
openair2/RRC/LITE/defs.h
openair2/RRC/LITE/defs.h
+2
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.generic.oaisim.local_no_mme.conf
...-LTE-EPC/CONF/enb.band38.generic.oaisim.local_no_mme.conf
+5
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.generic.oaisim.local_no_mme.conf
...-EPC/CONF/enb.band38.tm1.generic.oaisim.local_no_mme.conf
+150
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf
...ERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf
+6
-3
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
...C-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
+5
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_mme.conf
...-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_mme.conf
+180
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_no_mme.conf
...E-EPC/CONF/enb.band7.tm1.generic.oaisim.local_no_mme.conf
+149
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
...ets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
+1
-1
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/init_lte.c
+2
-1
targets/SIMU/USER/init_lte.h
targets/SIMU/USER/init_lte.h
+1
-0
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim.c
+30
-7
targets/SIMU/USER/oaisim_functions.c
targets/SIMU/USER/oaisim_functions.c
+5
-4
No files found.
.gitlab-ci.yml
View file @
d06b3c92
...
@@ -8,6 +8,8 @@ job1:
...
@@ -8,6 +8,8 @@ job1:
-
echo $EXTERNAL_SHARE_DIR
-
echo $EXTERNAL_SHARE_DIR
-
echo $SHELL
-
echo $SHELL
-
echo $OAI_TEST_CASE_GROUP
-
echo $OAI_TEST_CASE_GROUP
-
echo $MACHINELIST
-
echo $MACHINELISTGENERIC
-
git rev-parse --abbrev-ref HEAD
-
git rev-parse --abbrev-ref HEAD
-
git_repo=`git config --get remote.origin.url`
-
git_repo=`git config --get remote.origin.url`
-
git_head=`git rev-parse HEAD`
-
git_head=`git rev-parse HEAD`
...
@@ -25,11 +27,11 @@ job1:
...
@@ -25,11 +27,11 @@ job1:
-
echo $NRUNS_LTE_SOFTMODEM
-
echo $NRUNS_LTE_SOFTMODEM
-
echo $TIMEOUT_CMD
-
echo $TIMEOUT_CMD
-
mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
-
mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -c -5GRepo $git_repo -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS $OAI_EXTRA_ARGS -g "$OAI_TEST_CASE_GROUP">& $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -c -5GRepo $git_repo -
MachineList "$MACHINELIST" -MachineListGeneric "$MACHINELISTGENERIC" -
5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS $OAI_EXTRA_ARGS -g "$OAI_TEST_CASE_GROUP">& $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepo $git_repo -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS `echo $OAI_EXTRA_ARGS` -g "$OAI_TEST_CASE_GROUP" --nrun_lte_softmodem $NRUNS_LTE_SOFTMODEM --timeout_cmd $TIMEOUT_CMD >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
-
python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepo $git_repo -
MachineList "$MACHINELIST" -MachineListGeneric "$MACHINELISTGENERIC" -
5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS `echo $OAI_EXTRA_ARGS` -g "$OAI_TEST_CASE_GROUP" --nrun_lte_softmodem $NRUNS_LTE_SOFTMODEM --timeout_cmd $TIMEOUT_CMD >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
-
mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log
-
mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log
-
mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log
-
mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log
-
sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $NFS_TEST_RESULTS_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR
-
sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $NFS_TEST_RESULTS_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR
-
sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $EXTERNAL_SHARE_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$EXTERNAL_SHARE_DIR
-
sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no " --rsync-path="mkdir -p $EXTERNAL_SHARE_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$EXTERNAL_SHARE_DIR
-
cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml
-
cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml
when
:
manual
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
View file @
d06b3c92
...
@@ -313,7 +313,7 @@ def SSHSessionWrapper(machine, username, key_file, password, logdir_remote, logd
...
@@ -313,7 +313,7 @@ def SSHSessionWrapper(machine, username, key_file, password, logdir_remote, logd
# \param CleanUpAluLteBox program to terminate AlU Bell Labs LTE Box
# \param CleanUpAluLteBox program to terminate AlU Bell Labs LTE Box
# \param ExmimoRfStop String to stop EXMIMO card (specified in test_case_list.xml)
# \param ExmimoRfStop String to stop EXMIMO card (specified in test_case_list.xml)
def
cleanOldPrograms
(
oai
,
programList
,
CleanUpAluLteBox
,
ExmimoRfStop
,
logdir
,
logdirOAI5GRepo
):
def
cleanOldPrograms
(
oai
,
programList
,
CleanUpAluLteBox
,
ExmimoRfStop
,
logdir
,
logdirOAI5GRepo
):
cmd
=
'killall -9 -q -r '
+
programList
cmd
=
'
sudo -E
killall -9 -q -r '
+
programList
result
=
oai
.
send
(
cmd
,
True
)
result
=
oai
.
send
(
cmd
,
True
)
print
"Killing old programs..."
+
result
print
"Killing old programs..."
+
result
programArray
=
programList
.
split
()
programArray
=
programList
.
split
()
...
@@ -1268,7 +1268,8 @@ except KeyError:
...
@@ -1268,7 +1268,8 @@ except KeyError:
sys
.
exit
(
1
)
sys
.
exit
(
1
)
print
"Killing zombie ssh sessions from earlier sessions..."
print
"Killing zombie ssh sessions from earlier sessions..."
cmd
=
'ps aux |grep
\"
/usr/bin/ssh -q -l guptar
\"
|tr -s
\"
\"
:|cut -f 2 -d :|xargs kill -9 '
cmd
=
'ps aux |grep
\"
/usr/bin/ssh -q -l guptar
\"
| awk
\'
{print $2}
\'
| sudo xargs kill -9 '
os
.
system
(
cmd
)
os
.
system
(
cmd
)
if
flag_start_testcase
==
False
:
if
flag_start_testcase
==
False
:
...
@@ -1449,7 +1450,6 @@ for oai in oai_list:
...
@@ -1449,7 +1450,6 @@ for oai in oai_list:
#cmd = cmd + 'mkdir -p ' + logdir + '\n'
#cmd = cmd + 'mkdir -p ' + logdir + '\n'
cmd
=
cmd
+
'cd '
+
logdir
+
'
\n
'
cmd
=
cmd
+
'cd '
+
logdir
+
'
\n
'
cmd
=
cmd
+
'sudo apt-get install -y git
\n
'
cmd
=
cmd
+
'sudo apt-get install -y git
\n
'
cmd
=
cmd
+
'git config --global http.sslVerify false
\n
'
cmd
=
cmd
+
'chmod 700 '
+
logdir
+
'/git-retry.sh
\n
'
cmd
=
cmd
+
'chmod 700 '
+
logdir
+
'/git-retry.sh
\n
'
cmd
=
cmd
+
logdir
+
'/git-retry.sh clone '
+
GitOAI5GRepo
+
'
\n
'
cmd
=
cmd
+
logdir
+
'/git-retry.sh clone '
+
GitOAI5GRepo
+
'
\n
'
cmd
=
cmd
+
logdir
+
'/git-retry.sh clone '
+
GitOpenaircnRepo
+
'
\n
'
cmd
=
cmd
+
logdir
+
'/git-retry.sh clone '
+
GitOpenaircnRepo
+
'
\n
'
...
...
cmake_targets/autotests/test_case_list.xml
View file @
d06b3c92
This diff is collapsed.
Click to expand it.
cmake_targets/autotests/tools/remove_old_programs.bash
View file @
d06b3c92
#!/bin/bash
#!/bin/bash
#$1 programs to be killed and checked
#$1 programs to be killed and checked
var
=
`
ps
-A
|grep
-E
-i
$1
`
echo
"removing old programs..."
echo
"args =
$1
"
echo
"script name =
$0
"
filename
=
$(
basename
"
$0
"
)
echo
"filename =
$filename
"
echo
"programs to be killed...
$1
"
echo
"bash PID =
$$
"
pid
=
"
$$
"
echo
"pid =
$pid
"
echo
"Killing programs now..."
ps
-aux
|grep
-E
-i
-w
"
$1
"
var
=
`
ps
-aux
|grep
-E
-i
-w
"
$1
"
|awk
'{print $2}'
|
tr
'\n'
' '
|
sed
"s/
$pid
/ /"
`
echo
"Killing processes...
$var
"
#var=`ps -aux |grep -E -i '$1' |awk '{print $2}'| tr '\n' ' ' | sed "s/$pid/ /"`
#echo $var
if
[
-n
"
$var
"
]
;
then
sudo kill
-9
$var
;
fi
#| sudo xargs kill -9
echo
"checking for old programs..."
var
=
`
ps
-aux
|grep
-E
-i
-w
'$1'
|grep
-Ev
'grep'
|
grep
-Ev
'$filename'
`
echo
$var
echo
$var
if
[
-n
"
$var
"
]
;
then
echo
'Match found'
;
else
echo
'Match not found'
;
fi
if
[
-n
"
$var
"
]
;
then
echo
'Match found'
;
else
echo
'Match not found'
;
fi
cmake_targets/tools/build_helper
View file @
d06b3c92
...
@@ -369,7 +369,6 @@ check_install_oai_software() {
...
@@ -369,7 +369,6 @@ check_install_oai_software() {
libxml2 \
libxml2 \
libxml2-dev \
libxml2-dev \
libxslt1-dev \
libxslt1-dev \
linux-headers-`uname -r` \
mscgen \
mscgen \
octave \
octave \
octave-signal \
octave-signal \
...
@@ -385,6 +384,8 @@ check_install_oai_software() {
...
@@ -385,6 +384,8 @@ check_install_oai_software() {
$SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
$SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
#Sometimes linux headers are not available in apt-get if kernel is custom or new
$SUDO apt-get install linux-headers-`uname -r` || true
# First we remove gnutls/nettle installation and then install from sources
# First we remove gnutls/nettle installation and then install from sources
$SUDO apt-get remove -y libgnutls-dev nettle-dev nettle-bin
$SUDO apt-get remove -y libgnutls-dev nettle-dev nettle-bin
install_nettle_from_source
install_nettle_from_source
...
...
openair1/PHY/INIT/lte_param_init.c
View file @
d06b3c92
...
@@ -51,7 +51,9 @@ void lte_param_init(unsigned char N_tx,
...
@@ -51,7 +51,9 @@ void lte_param_init(unsigned char N_tx,
lte_frame_parms
->
nb_antennas_tx
=
N_tx
;
lte_frame_parms
->
nb_antennas_tx
=
N_tx
;
lte_frame_parms
->
nb_antennas_rx
=
N_rx
;
lte_frame_parms
->
nb_antennas_rx
=
N_rx
;
lte_frame_parms
->
nb_antennas_tx_eNB
=
(
transmission_mode
==
1
)
?
1
:
2
;
lte_frame_parms
->
nb_antennas_tx_eNB
=
(
transmission_mode
==
1
)
?
1
:
2
;
lte_frame_parms
->
phich_config_common
.
phich_resource
=
one
;
lte_frame_parms
->
phich_config_common
.
phich_resource
=
oneSixth
;
lte_frame_parms
->
phich_config_common
.
phich_duration
=
normal
;
lte_frame_parms
->
tdd_config
=
tdd_config
;
lte_frame_parms
->
tdd_config
=
tdd_config
;
lte_frame_parms
->
frame_type
=
frame_type
;
lte_frame_parms
->
frame_type
=
frame_type
;
// lte_frame_parms->Csrs = 2;
// lte_frame_parms->Csrs = 2;
...
...
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
View file @
d06b3c92
...
@@ -41,8 +41,8 @@ static int16_t temp_out_ifft_0[2048*4] __attribute__((aligned(16)));
...
@@ -41,8 +41,8 @@ static int16_t temp_out_ifft_0[2048*4] __attribute__((aligned(16)));
static
int16_t
temp_out_ifft_1
[
2048
*
4
]
__attribute__
((
aligned
(
16
)));
static
int16_t
temp_out_ifft_1
[
2048
*
4
]
__attribute__
((
aligned
(
16
)));
static
int32_t
temp_in_ifft_0
[
2048
*
2
]
__attribute__
((
aligned
(
16
)));
static
int32_t
temp_in_ifft_0
[
2048
*
2
]
__attribute__
((
aligned
(
32
)));
static
int32_t
temp_in_ifft_1
[
2048
*
2
]
__attribute__
((
aligned
(
16
)));
static
int32_t
temp_in_ifft_1
[
2048
*
2
]
__attribute__
((
aligned
(
32
)));
static
int32_t
temp_in_fft_0
[
2048
*
2
]
__attribute__
((
aligned
(
16
)));
static
int32_t
temp_in_fft_0
[
2048
*
2
]
__attribute__
((
aligned
(
16
)));
static
int32_t
temp_in_fft_1
[
2048
*
2
]
__attribute__
((
aligned
(
16
)));
static
int32_t
temp_in_fft_1
[
2048
*
2
]
__attribute__
((
aligned
(
16
)));
...
...
openair1/PHY/LTE_TRANSPORT/dci.c
View file @
d06b3c92
...
@@ -1754,7 +1754,7 @@ int32_t rx_pdcch(LTE_UE_COMMON *lte_ue_common_vars,
...
@@ -1754,7 +1754,7 @@ int32_t rx_pdcch(LTE_UE_COMMON *lte_ue_common_vars,
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
avgs
=
cmax
(
avgs
,
avgP
[(
aarx
<<
1
)
+
aatx
]);
avgs
=
cmax
(
avgs
,
avgP
[(
aarx
<<
1
)
+
aatx
]);
log2_maxh
=
(
log2_approx
(
avgs
)
/
2
)
+
6
+
frame_parms
->
nb_antennas_rx
-
1
;
log2_maxh
=
(
log2_approx
(
avgs
)
/
2
)
+
5
;
//+frame_parms->nb_antennas_rx
;
#ifdef DEBUG_PHY
#ifdef DEBUG_PHY
LOG_I
(
PHY
,
"subframe %d: pdcch log2_maxh = %d (%d,%d)
\n
"
,
subframe
,
log2_maxh
,
avgP
[
0
],
avgs
);
LOG_I
(
PHY
,
"subframe %d: pdcch log2_maxh = %d (%d,%d)
\n
"
,
subframe
,
log2_maxh
,
avgP
[
0
],
avgs
);
#endif
#endif
...
...
openair1/SIMULATION/LTE_PHY/mbmssim.c
View file @
d06b3c92
...
@@ -56,69 +56,7 @@
...
@@ -56,69 +56,7 @@
PHY_VARS_eNB
*
PHY_vars_eNB
;
PHY_VARS_eNB
*
PHY_vars_eNB
;
PHY_VARS_UE
*
PHY_vars_UE
;
PHY_VARS_UE
*
PHY_vars_UE
;
void
lte_param_init
(
unsigned
char
N_tx
,
unsigned
char
N_rx
,
unsigned
char
transmission_mode
,
uint8_t
extended_prefix_flag
,
lte_frame_type_t
frame_type
,
uint16_t
Nid_cell
,
uint8_t
tdd_config
,
uint8_t
N_RB_DL
,
uint8_t
osf
,
uint32_t
perfect_ce
)
{
LTE_DL_FRAME_PARMS
*
lte_frame_parms
;
printf
(
"Start lte_param_init
\n
"
);
PHY_vars_eNB
=
malloc
(
sizeof
(
PHY_VARS_eNB
));
PHY_vars_UE
=
malloc
(
sizeof
(
PHY_VARS_UE
));
//PHY_config = malloc(sizeof(PHY_CONFIG));
mac_xface
=
malloc
(
sizeof
(
MAC_xface
));
srand
(
1
);
randominit
(
1
);
set_taus_seed
(
1
);
lte_frame_parms
=
&
(
PHY_vars_eNB
->
lte_frame_parms
);
lte_frame_parms
->
N_RB_DL
=
N_RB_DL
;
//50 for 10MHz and 25 for 5 MHz
lte_frame_parms
->
N_RB_UL
=
N_RB_DL
;
lte_frame_parms
->
Ncp
=
extended_prefix_flag
;
lte_frame_parms
->
Nid_cell
=
Nid_cell
;
lte_frame_parms
->
Nid_cell_mbsfn
=
1
;
lte_frame_parms
->
nushift
=
Nid_cell
%
6
;
lte_frame_parms
->
nb_antennas_tx
=
N_tx
;
lte_frame_parms
->
nb_antennas_rx
=
N_rx
;
lte_frame_parms
->
phich_config_common
.
phich_resource
=
oneSixth
;
lte_frame_parms
->
tdd_config
=
tdd_config
;
lte_frame_parms
->
frame_type
=
frame_type
;
// lte_frame_parms->Csrs = 2;
// lte_frame_parms->Bsrs = 0;
// lte_frame_parms->kTC = 0;44
// lte_frame_parms->n_RRC = 0;
lte_frame_parms
->
mode1_flag
=
(
transmission_mode
==
1
)
?
1
:
0
;
init_frame_parms
(
lte_frame_parms
,
osf
);
//copy_lte_parms_to_phy_framing(lte_frame_parms, &(PHY_config->PHY_framing));
PHY_vars_UE
->
is_secondary_ue
=
0
;
PHY_vars_UE
->
lte_frame_parms
=
*
lte_frame_parms
;
PHY_vars_eNB
->
lte_frame_parms
=
*
lte_frame_parms
;
phy_init_lte_top
(
lte_frame_parms
);
dump_frame_parms
(
lte_frame_parms
);
PHY_vars_UE
->
PHY_measurements
.
n_adj_cells
=
2
;
PHY_vars_UE
->
PHY_measurements
.
adj_cell_id
[
0
]
=
Nid_cell
+
1
;
PHY_vars_UE
->
PHY_measurements
.
adj_cell_id
[
1
]
=
Nid_cell
+
2
;
lte_gold_mbsfn
(
lte_frame_parms
,
PHY_vars_UE
->
lte_gold_mbsfn_table
,
Nid_cell
);
lte_gold_mbsfn
(
lte_frame_parms
,
PHY_vars_eNB
->
lte_gold_mbsfn_table
,
Nid_cell
);
phy_init_lte_ue
(
PHY_vars_UE
,
1
,
0
);
phy_init_lte_eNB
(
PHY_vars_eNB
,
0
,
0
,
0
);
PHY_vars_UE
->
perfect_ce
=
perfect_ce
;
printf
(
"Done lte_param_init
\n
"
);
}
DCI1E_5MHz_2A_M10PRB_TDD_t
DLSCH_alloc_pdu2_1E
[
2
];
DCI1E_5MHz_2A_M10PRB_TDD_t
DLSCH_alloc_pdu2_1E
[
2
];
#define UL_RB_ALLOC 0x1ff;
#define UL_RB_ALLOC 0x1ff;
#define CCCH_RB_ALLOC computeRIV(PHY_vars_eNB->lte_frame_parms.N_RB_UL,0,2)
#define CCCH_RB_ALLOC computeRIV(PHY_vars_eNB->lte_frame_parms.N_RB_UL,0,2)
...
@@ -315,7 +253,7 @@ int main(int argc, char **argv)
...
@@ -315,7 +253,7 @@ int main(int argc, char **argv)
if
(
transmission_mode
==
2
)
if
(
transmission_mode
==
2
)
n_tx
=
2
;
n_tx
=
2
;
lte_param_init
(
n_tx
,
n_rx
,
transmission_mode
,
extended_prefix_flag
,
frame_type
,
Nid_cell
,
tdd_config
,
N_RB_DL
,
osf
,
perfect_ce
);
lte_param_init
(
n_tx
,
n_rx
,
transmission_mode
,
extended_prefix_flag
,
frame_type
,
Nid_cell
,
tdd_config
,
N_RB_DL
,
0
,
osf
,
perfect_ce
);
...
...
openair1/SIMULATION/LTE_PHY/pbchsim.c
View file @
d06b3c92
...
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
...
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
if
(
transmission_mode
>=
2
)
if
(
transmission_mode
>=
2
)
n_tx
=
2
;
n_tx
=
2
;
lte_param_init
(
n_tx
,
n_rx
,
transmission_mode
,
extended_prefix_flag
,
frame_type
,
Nid_cell
,
N_RB_DL
,
osf
);
lte_param_init
(
n_tx
,
n_rx
,
transmission_mode
,
extended_prefix_flag
,
frame_type
,
Nid_cell
,
3
,
N_RB_DL
,
0
,
osf
,
0
);
PHY_vars_eNB1
=
malloc
(
sizeof
(
PHY_VARS_eNB
));
PHY_vars_eNB1
=
malloc
(
sizeof
(
PHY_VARS_eNB
));
PHY_vars_eNB2
=
malloc
(
sizeof
(
PHY_VARS_eNB
));
PHY_vars_eNB2
=
malloc
(
sizeof
(
PHY_VARS_eNB
));
...
...
openair1/SIMULATION/LTE_PHY/pdcchsim.c
View file @
d06b3c92
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/defs.h
View file @
d06b3c92
...
@@ -434,7 +434,9 @@ typedef struct eNB_RRC_INST_s {
...
@@ -434,7 +434,9 @@ typedef struct eNB_RRC_INST_s {
#endif
#endif
//RRC configuration
//RRC configuration
#if defined(ENABLE_ITTI)
RrcConfigurationReq
configuration
;
RrcConfigurationReq
configuration
;
#endif
}
eNB_RRC_INST
;
}
eNB_RRC_INST
;
#define MAX_UE_CAPABILITY_SIZE 255
#define MAX_UE_CAPABILITY_SIZE 255
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.generic.oaisim.local_no_mme.conf
View file @
d06b3c92
...
@@ -33,8 +33,9 @@ eNBs =
...
@@ -33,8 +33,9 @@ eNBs =
Nid_cell
=
0
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
N_RB_DL
=
25
;
Nid_cell_mbsfn
=
0
;
Nid_cell_mbsfn
=
0
;
nb_antennas_tx
=
1
;
nb_antenna_ports
=
2
;
nb_antennas_rx
=
1
;
nb_antennas_tx
=
2
;
nb_antennas_rx
=
2
;
tx_gain
=
25
;
tx_gain
=
25
;
rx_gain
=
20
;
rx_gain
=
20
;
prach_root
=
0
;
prach_root
=
0
;
...
@@ -97,6 +98,8 @@ eNBs =
...
@@ -97,6 +98,8 @@ eNBs =
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
2
;
}
}
);
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.generic.oaisim.local_no_mme.conf
0 → 100644
View file @
d06b3c92
Active_eNBs
= (
"eNB_Eurecom_LTEBox"
);
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity
=
"none"
;
eNBs
=
(
{
//////////
Identification
parameters
:
eNB_ID
=
0
xe00
;
cell_type
=
"CELL_MACRO_ENB"
;
eNB_name
=
"eNB_Eurecom_LTEBox"
;
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
"1"
;
mobile_country_code
=
"208"
;
mobile_network_code
=
"10"
;
//////////
Physical
parameters
:
component_carriers
= (
{
frame_type
=
"TDD"
;
tdd_config
=
3
;
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
38
;
downlink_frequency
=
2580000000
L
;
uplink_frequency_offset
=
0
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
Nid_cell_mbsfn
=
0
;
nb_antenna_ports
=
1
;
nb_antennas_tx
=
1
;
nb_antennas_rx
=
1
;
tx_gain
=
25
;
rx_gain
=
20
;
prach_root
=
0
;
prach_config_index
=
0
;
prach_high_speed
=
"DISABLE"
;
prach_zero_correlation
=
1
;
prach_freq_offset
=
2
;
pucch_delta_shift
=
1
;
pucch_nRB_CQI
=
1
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
32
;
pdsch_referenceSignalPower
=
0
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_enable64QAM
=
"DISABLE"
;
pusch_hoppingMode
=
"interSubFrame"
;
pusch_hoppingOffset
=
0
;
pusch_groupHoppingEnabled
=
"ENABLE"
;
pusch_groupAssignment
=
0
;
pusch_sequenceHoppingEnabled
=
"DISABLE"
;
pusch_nDMRS1
=
0
;
phich_duration
=
"NORMAL"
;
phich_resource
=
"ONESIXTH"
;
srs_enable
=
"DISABLE"
;
/*
srs_BandwidthConfig
=;
srs_SubframeConfig
=;
srs_ackNackST
=;
srs_MaxUpPts
=;*/
pusch_p0_Nominal
= -
108
;
pusch_alpha
=
"AL1"
;
pucch_p0_Nominal
= -
108
;
msg3_delta_Preamble
=
6
;
pucch_deltaF_Format1
=
"deltaF2"
;
pucch_deltaF_Format1b
=
"deltaF3"
;
pucch_deltaF_Format2
=
"deltaF0"
;
pucch_deltaF_Format2a
=
"deltaF0"
;
pucch_deltaF_Format2b
=
"deltaF0"
;
rach_numberOfRA_Preambles
=
64
;
rach_preamblesGroupAConfig
=
"DISABLE"
;
/*
rach_sizeOfRA_PreamblesGroupA
= ;
rach_messageSizeGroupA
= ;
rach_messagePowerOffsetGroupB
= ;
*/
rach_powerRampingStep
=
2
;
rach_preambleInitialReceivedTargetPower
= -
100
;
rach_preambleTransMax
=
10
;
rach_raResponseWindowSize
=
10
;
rach_macContentionResolutionTimer
=
48
;
rach_maxHARQ_Msg3Tx
=
4
;
pcch_default_PagingCycle
=
128
;
pcch_nB
=
"oneT"
;
bcch_modificationPeriodCoeff
=
2
;
ue_TimersAndConstants_t300
=
1000
;
ue_TimersAndConstants_t301
=
1000
;
ue_TimersAndConstants_t310
=
1000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
}
);
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"0.0.0.0"
;
ipv6
=
"0::0"
;
active
=
"yes"
;
preference
=
"ipv4"
;
}
);
NETWORK_INTERFACES
:
{
ENB_INTERFACE_NAME_FOR_S1_MME
=
"none"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"0.0.0.0/24"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"none"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"0.0.0.0/24"
;
ENB_PORT_FOR_S1U
=
2153
;
# Spec 2152
};
log_config
:
{
global_log_level
=
"trace"
;
global_log_verbosity
=
"medium"
;
hw_log_level
=
"info"
;
hw_log_verbosity
=
"medium"
;
phy_log_level
=
"trace"
;
phy_log_verbosity
=
"medium"
;
mac_log_level
=
"trace"
;
mac_log_verbosity
=
"medium"
;
rlc_log_level
=
"trace"
;
rlc_log_verbosity
=
"medium"
;
pdcp_log_level
=
"trace"
;
pdcp_log_verbosity
=
"medium"
;
rrc_log_level
=
"trace"
;
rrc_log_verbosity
=
"medium"
;
gtpu_log_level
=
"debug"
;
gtpu_log_verbosity
=
"medium"
;
udp_log_level
=
"debug"
;
udp_log_verbosity
=
"medium"
;
osa_log_level
=
"debug"
;
osa_log_verbosity
=
"low"
;
};
}
);
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf
View file @
d06b3c92
...
@@ -33,8 +33,9 @@ eNBs =
...
@@ -33,8 +33,9 @@ eNBs =
Nid_cell
=
0
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
N_RB_DL
=
25
;
Nid_cell_mbsfn
=
0
;
Nid_cell_mbsfn
=
0
;
nb_antennas_tx
=
1
;
nb_antenna_ports
=
2
;
nb_antennas_rx
=
1
;
nb_antennas_tx
=
2
;
nb_antennas_rx
=
2
;
tx_gain
=
25
;
tx_gain
=
25
;
rx_gain
=
20
;
rx_gain
=
20
;
prach_root
=
0
;
prach_root
=
0
;
...
@@ -96,7 +97,9 @@ eNBs =
...
@@ -96,7 +97,9 @@ eNBs =
ue_TimersAndConstants_t310
=
1000
;
ue_TimersAndConstants_t310
=
1000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
2
;
}
}
);
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
View file @
d06b3c92
...
@@ -33,8 +33,9 @@ eNBs =
...
@@ -33,8 +33,9 @@ eNBs =
Nid_cell
=
0
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
N_RB_DL
=
25
;
Nid_cell_mbsfn
=
0
;
Nid_cell_mbsfn
=
0
;
nb_antennas_tx
=
1
;
nb_antenna_ports
=
2
;
nb_antennas_rx
=
1
;
nb_antennas_tx
=
2
;
nb_antennas_rx
=
2
;
tx_gain
=
25
;
tx_gain
=
25
;
rx_gain
=
20
;
rx_gain
=
20
;
prach_root
=
0
;
prach_root
=
0
;
...
@@ -97,6 +98,8 @@ eNBs =
...
@@ -97,6 +98,8 @@ eNBs =
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
2
;
}
}
);
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_mme.conf
0 → 100644
View file @
d06b3c92
Active_eNBs
= (
"eNB_Eurecom_LTEBox"
);
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity
=
"none"
;
eNBs
=
(
{
//////////
Identification
parameters
:
eNB_ID
=
0
xe00
;
cell_type
=
"CELL_MACRO_ENB"
;
eNB_name
=
"eNB_Eurecom_LTEBox"
;
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
"1"
;
mobile_country_code
=
"208"
;
mobile_network_code
=
"10"
;
//////////
Physical
parameters
:
component_carriers
= (
{
frame_type
=
"FDD"
;
tdd_config
=
3
;
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
7
;
downlink_frequency
=
2680000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
Nid_cell_mbsfn
=
0
;
nb_antenna_ports
=
1
;
nb_antennas_tx
=
1
;
nb_antennas_rx
=
1
;
tx_gain
=
25
;
rx_gain
=
20
;
prach_root
=
0
;
prach_config_index
=
0
;
prach_high_speed
=
"DISABLE"
;
prach_zero_correlation
=
1
;
prach_freq_offset
=
2
;
pucch_delta_shift
=
1
;
pucch_nRB_CQI
=
1
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
32
;
pdsch_referenceSignalPower
=
0
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_enable64QAM
=
"DISABLE"
;
pusch_hoppingMode
=
"interSubFrame"
;
pusch_hoppingOffset
=
0
;
pusch_groupHoppingEnabled
=
"ENABLE"
;
pusch_groupAssignment
=
0
;
pusch_sequenceHoppingEnabled
=
"DISABLE"
;
pusch_nDMRS1
=
0
;
phich_duration
=
"NORMAL"
;
phich_resource
=
"ONESIXTH"
;
srs_enable
=
"DISABLE"
;
/*
srs_BandwidthConfig
=;
srs_SubframeConfig
=;
srs_ackNackST
=;
srs_MaxUpPts
=;*/
pusch_p0_Nominal
= -
108
;
pusch_alpha
=
"AL1"
;
pucch_p0_Nominal
= -
108
;
msg3_delta_Preamble
=
6
;
pucch_deltaF_Format1
=
"deltaF2"
;
pucch_deltaF_Format1b
=
"deltaF3"
;
pucch_deltaF_Format2
=
"deltaF0"
;
pucch_deltaF_Format2a
=
"deltaF0"
;
pucch_deltaF_Format2b
=
"deltaF0"
;
rach_numberOfRA_Preambles
=
64
;
rach_preamblesGroupAConfig
=
"DISABLE"
;
/*
rach_sizeOfRA_PreamblesGroupA
= ;
rach_messageSizeGroupA
= ;
rach_messagePowerOffsetGroupB
= ;
*/
rach_powerRampingStep
=
2
;
rach_preambleInitialReceivedTargetPower
= -
100
;
rach_preambleTransMax
=
10
;
rach_raResponseWindowSize
=
10
;
rach_macContentionResolutionTimer
=
48
;
rach_maxHARQ_Msg3Tx
=
4
;
pcch_default_PagingCycle
=
128
;
pcch_nB
=
"oneT"
;
bcch_modificationPeriodCoeff
=
2
;
ue_TimersAndConstants_t300
=
1000
;
ue_TimersAndConstants_t301
=
1000
;
ue_TimersAndConstants_t310
=
1000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
}
);
srb1_parameters
:
{
# timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
timer_poll_retransmit
=
80
;
# timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
timer_reordering
=
35
;
# timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
timer_status_prohibit
=
0
;
# poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
poll_pdu
=
4
;
# poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
poll_byte
=
99999
;
# max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
max_retx_threshold
=
4
;
}
# ------- SCTP definitions
SCTP
:
{
# Number of streams to use in input/output
SCTP_INSTREAMS
=
2
;
SCTP_OUTSTREAMS
=
2
;
};
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"192.188.2.2"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
preference
=
"ipv4"
;
}
);
NETWORK_INTERFACES
:
{
ENB_INTERFACE_NAME_FOR_S1_MME
=
"tun2"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"192.188.2.2/24"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"lo"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"127.0.0.1/8"
;
ENB_PORT_FOR_S1U
=
2153
;
# Spec 2152
};
log_config
:
{
global_log_level
=
"trace"
;
global_log_verbosity
=
"medium"
;
hw_log_level
=
"info"
;
hw_log_verbosity
=
"medium"
;
phy_log_level
=
"trace"
;
phy_log_verbosity
=
"medium"
;
mac_log_level
=
"trace"
;
mac_log_verbosity
=
"medium"
;
rlc_log_level
=
"trace"
;
rlc_log_verbosity
=
"medium"
;
pdcp_log_level
=
"trace"
;
pdcp_log_verbosity
=
"medium"
;
rrc_log_level
=
"trace"
;
rrc_log_verbosity
=
"medium"
;
gtpu_log_level
=
"debug"
;
gtpu_log_verbosity
=
"medium"
;
udp_log_level
=
"debug"
;
udp_log_verbosity
=
"medium"
;
osa_log_level
=
"debug"
;
osa_log_verbosity
=
"low"
;
};
}
);
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_no_mme.conf
0 → 100644
View file @
d06b3c92
Active_eNBs
= (
"eNB_Eurecom_LTEBox"
);
# Asn1_verbosity, choice in: none, info, annoying
Asn1_verbosity
=
"none"
;
eNBs
=
(
{
//////////
Identification
parameters
:
eNB_ID
=
0
xe00
;
cell_type
=
"CELL_MACRO_ENB"
;
eNB_name
=
"eNB_Eurecom_LTEBox"
;
//
Tracking
area
code
,
0
x0000
and
0
xfffe
are
reserved
values
tracking_area_code
=
"1"
;
mobile_country_code
=
"208"
;
mobile_network_code
=
"10"
;
//////////
Physical
parameters
:
component_carriers
= (
{
frame_type
=
"FDD"
;
tdd_config
=
3
;
tdd_config_s
=
0
;
prefix_type
=
"NORMAL"
;
eutra_band
=
7
;
downlink_frequency
=
2680000000
L
;
uplink_frequency_offset
= -
120000000
;
Nid_cell
=
0
;
N_RB_DL
=
25
;
Nid_cell_mbsfn
=
0
;
nb_antenna_ports
=
1
;
nb_antennas_tx
=
1
;
nb_antennas_rx
=
1
;
tx_gain
=
25
;
rx_gain
=
20
;
prach_root
=
0
;
prach_config_index
=
0
;
prach_high_speed
=
"DISABLE"
;
prach_zero_correlation
=
1
;
prach_freq_offset
=
2
;
pucch_delta_shift
=
1
;
pucch_nRB_CQI
=
1
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
32
;
pdsch_referenceSignalPower
=
0
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_enable64QAM
=
"DISABLE"
;
pusch_hoppingMode
=
"interSubFrame"
;
pusch_hoppingOffset
=
0
;
pusch_groupHoppingEnabled
=
"ENABLE"
;
pusch_groupAssignment
=
0
;
pusch_sequenceHoppingEnabled
=
"DISABLE"
;
pusch_nDMRS1
=
0
;
phich_duration
=
"NORMAL"
;
phich_resource
=
"ONESIXTH"
;
srs_enable
=
"DISABLE"
;
/*
srs_BandwidthConfig
=;
srs_SubframeConfig
=;
srs_ackNackST
=;
srs_MaxUpPts
=;*/
pusch_p0_Nominal
= -
108
;
pusch_alpha
=
"AL1"
;
pucch_p0_Nominal
= -
108
;
msg3_delta_Preamble
=
6
;
pucch_deltaF_Format1
=
"deltaF2"
;
pucch_deltaF_Format1b
=
"deltaF3"
;
pucch_deltaF_Format2
=
"deltaF0"
;
pucch_deltaF_Format2a
=
"deltaF0"
;
pucch_deltaF_Format2b
=
"deltaF0"
;
rach_numberOfRA_Preambles
=
64
;
rach_preamblesGroupAConfig
=
"DISABLE"
;
/*
rach_sizeOfRA_PreamblesGroupA
= ;
rach_messageSizeGroupA
= ;
rach_messagePowerOffsetGroupB
= ;
*/
rach_powerRampingStep
=
2
;
rach_preambleInitialReceivedTargetPower
= -
100
;
rach_preambleTransMax
=
10
;
rach_raResponseWindowSize
=
10
;
rach_macContentionResolutionTimer
=
48
;
rach_maxHARQ_Msg3Tx
=
4
;
pcch_default_PagingCycle
=
128
;
pcch_nB
=
"oneT"
;
bcch_modificationPeriodCoeff
=
2
;
ue_TimersAndConstants_t300
=
1000
;
ue_TimersAndConstants_t301
=
1000
;
ue_TimersAndConstants_t310
=
1000
;
ue_TimersAndConstants_t311
=
10000
;
ue_TimersAndConstants_n310
=
20
;
ue_TimersAndConstants_n311
=
1
;
ue_TransmissionMode
=
1
;
}
);
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"0.0.0.0"
;
ipv6
=
"0::0"
;
active
=
"yes"
;
preference
=
"ipv4"
;
}
);
NETWORK_INTERFACES
:
{
ENB_INTERFACE_NAME_FOR_S1_MME
=
"none"
;
ENB_IPV4_ADDRESS_FOR_S1_MME
=
"0.0.0.0/24"
;
ENB_INTERFACE_NAME_FOR_S1U
=
"none"
;
ENB_IPV4_ADDRESS_FOR_S1U
=
"0.0.0.0/24"
;
ENB_PORT_FOR_S1U
=
2153
;
# Spec 2152
};
log_config
:
{
global_log_level
=
"trace"
;
global_log_verbosity
=
"medium"
;
hw_log_level
=
"info"
;
hw_log_verbosity
=
"medium"
;
phy_log_level
=
"trace"
;
phy_log_verbosity
=
"medium"
;
mac_log_level
=
"trace"
;
mac_log_verbosity
=
"medium"
;
rlc_log_level
=
"trace"
;
rlc_log_verbosity
=
"medium"
;
pdcp_log_level
=
"trace"
;
pdcp_log_verbosity
=
"medium"
;
rrc_log_level
=
"trace"
;
rrc_log_verbosity
=
"medium"
;
gtpu_log_level
=
"debug"
;
gtpu_log_verbosity
=
"medium"
;
udp_log_level
=
"debug"
;
udp_log_verbosity
=
"medium"
;
osa_log_level
=
"debug"
;
osa_log_verbosity
=
"low"
;
};
}
);
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
View file @
d06b3c92
...
@@ -135,7 +135,7 @@ eNBs =
...
@@ -135,7 +135,7 @@ eNBs =
};
};
//////////
MME
parameters
:
//////////
MME
parameters
:
mme_ip_address
= ( {
ipv4
=
"192.168.12.
70
"
;
mme_ip_address
= ( {
ipv4
=
"192.168.12.
171
"
;
ipv6
=
"192:168:30::17"
;
ipv6
=
"192:168:30::17"
;
active
=
"yes"
;
active
=
"yes"
;
preference
=
"ipv4"
;
preference
=
"ipv4"
;
...
...
targets/SIMU/USER/init_lte.c
View file @
d06b3c92
...
@@ -228,6 +228,7 @@ void init_lte_vars(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs],
...
@@ -228,6 +228,7 @@ void init_lte_vars(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs],
uint8_t
abstraction_flag
,
uint8_t
abstraction_flag
,
int
nb_antennas_rx
,
int
nb_antennas_rx
,
int
nb_antennas_tx
,
int
nb_antennas_tx
,
int
nb_antennas_rx_ue
,
uint8_t
eMBMS_active_state
)
uint8_t
eMBMS_active_state
)
{
{
...
@@ -291,7 +292,7 @@ void init_lte_vars(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs],
...
@@ -291,7 +292,7 @@ void init_lte_vars(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs],
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
(
frame_parms
[
CC_id
])
->
nb_antennas_tx
=
1
;
(
frame_parms
[
CC_id
])
->
nb_antennas_tx
=
1
;
(
frame_parms
[
CC_id
])
->
nb_antennas_rx
=
nb_antennas_rx
;
(
frame_parms
[
CC_id
])
->
nb_antennas_rx
=
nb_antennas_rx
_ue
;
PHY_vars_UE_g
[
UE_id
][
CC_id
]
=
init_lte_UE
(
frame_parms
[
CC_id
],
UE_id
,
abstraction_flag
);
PHY_vars_UE_g
[
UE_id
][
CC_id
]
=
init_lte_UE
(
frame_parms
[
CC_id
],
UE_id
,
abstraction_flag
);
...
...
targets/SIMU/USER/init_lte.h
View file @
d06b3c92
...
@@ -56,4 +56,5 @@ void init_lte_vars(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs],
...
@@ -56,4 +56,5 @@ void init_lte_vars(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs],
uint8_t
abstraction_flag
,
uint8_t
abstraction_flag
,
int
nb_antennas_rx
,
int
nb_antennas_rx
,
int
nb_antennas_tx
,
int
nb_antennas_tx
,
int
nb_antennas_rx_ue
,
uint8_t
eMBMS_active_state
);
uint8_t
eMBMS_active_state
);
targets/SIMU/USER/oaisim.c
View file @
d06b3c92
...
@@ -243,10 +243,13 @@ help (void)
...
@@ -243,10 +243,13 @@ help (void)
#else
#else
printf
(
"-W [Rohde&Schwarz SMBV100A functions disabled. Recompile with SMBV=1]
\n
"
);
printf
(
"-W [Rohde&Schwarz SMBV100A functions disabled. Recompile with SMBV=1]
\n
"
);
#endif
#endif
printf
(
"-x Set the transmission mode (1,2,5,6 supported for now)
\n
"
);
printf
(
"-x deprecated. Set the transmission mode in config file!
\n
"
);
printf
(
"-y Set the number of receive antennas at the UE (1 or 2)
\n
"
);
printf
(
"-Y Set the global log verbosity (none, low, medium, high, full)
\n
"
);
printf
(
"-Y Set the global log verbosity (none, low, medium, high, full)
\n
"
);
printf
(
"-z Set the cooperation flag (0 for no cooperation, 1 for delay diversity and 2 for distributed alamouti
\n
"
);
printf
(
"-z Set the cooperation flag (0 for no cooperation, 1 for delay diversity and 2 for distributed alamouti
\n
"
);
printf
(
"-Z Reserved
\n
"
);
printf
(
"-Z Reserved
\n
"
);
printf
(
"--xforms Activate the grapical scope
\n
"
);
#if T_TRACER
#if T_TRACER
printf
(
"--T_port [port] use given port
\n
"
);
printf
(
"--T_port [port] use given port
\n
"
);
printf
(
"--T_nowait don't wait for tracer, start immediately
\n
"
);
printf
(
"--T_nowait don't wait for tracer, start immediately
\n
"
);
...
@@ -1142,7 +1145,7 @@ l2l1_task (void *args_p)
...
@@ -1142,7 +1145,7 @@ l2l1_task (void *args_p)
stop_meas
(
&
oaisim_stats_f
);
stop_meas
(
&
oaisim_stats_f
);
}
//end of slot
}
//end of slot
if
((
frame
>=
1
0
)
&&
(
frame
<=
11
)
&&
(
abstraction_flag
==
0
)
if
((
frame
>=
1
2
)
&&
(
frame
<=
12
)
&&
(
abstraction_flag
==
0
)
#ifdef PROC
#ifdef PROC
&&
(
Channel_Flag
==
0
)
&&
(
Channel_Flag
==
0
)
#endif
#endif
...
@@ -1155,22 +1158,42 @@ l2l1_task (void *args_p)
...
@@ -1155,22 +1158,42 @@ l2l1_task (void *args_p)
PHY_vars_UE_g
[
0
][
0
]
->
lte_frame_parms
.
samples_per_tti
PHY_vars_UE_g
[
0
][
0
]
->
lte_frame_parms
.
samples_per_tti
*
10
,
*
10
,
1
,
1
);
1
,
1
);
sprintf
(
fname
,
"eNBtxsig%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
fname
,
"eNBtxsig
0_
%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"txs%d"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"txs
0_
%d"
,
frame
%
MAX_FRAME_NUMBER
);
write_output
(
fname
,
write_output
(
fname
,
vname
,
vname
,
PHY_vars_eNB_g
[
0
][
0
]
->
lte_eNB_common_vars
.
txdata
[
0
][
0
],
PHY_vars_eNB_g
[
0
][
0
]
->
lte_eNB_common_vars
.
txdata
[
0
][
0
],
PHY_vars_UE_g
[
0
][
0
]
->
lte_frame_parms
.
samples_per_tti
PHY_vars_UE_g
[
0
][
0
]
->
lte_frame_parms
.
samples_per_tti
*
10
,
*
10
,
1
,
1
);
1
,
1
);
sprintf
(
fname
,
"eNBtxsigF%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
if
(
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
nb_antennas_tx
>
1
)
{
sprintf
(
vname
,
"txsF%d"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
fname
,
"eNBtxsig1_%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"txs1_%d"
,
frame
%
MAX_FRAME_NUMBER
);
write_output
(
fname
,
vname
,
PHY_vars_eNB_g
[
0
][
0
]
->
lte_eNB_common_vars
.
txdata
[
0
][
0
],
PHY_vars_UE_g
[
0
][
0
]
->
lte_frame_parms
.
samples_per_tti
*
10
,
1
,
1
);
}
sprintf
(
fname
,
"eNBtxsigF0_%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"txsF0_%d"
,
frame
%
MAX_FRAME_NUMBER
);
write_output
(
fname
,
write_output
(
fname
,
vname
,
vname
,
PHY_vars_eNB_g
[
0
][
0
]
->
lte_eNB_common_vars
.
txdataF
[
0
][
0
],
PHY_vars_eNB_g
[
0
][
0
]
->
lte_eNB_common_vars
.
txdataF
[
0
][
0
],
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
symbols_per_tti
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
symbols_per_tti
*
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
ofdm_symbol_size
,
*
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
ofdm_symbol_size
*
10
,
1
,
1
);
1
,
1
);
if
(
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
nb_antennas_tx
>
1
)
{
sprintf
(
fname
,
"eNBtxsigF1_%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"txsF1_%d"
,
frame
%
MAX_FRAME_NUMBER
);
write_output
(
fname
,
vname
,
PHY_vars_eNB_g
[
0
][
0
]
->
lte_eNB_common_vars
.
txdataF
[
0
][
1
],
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
symbols_per_tti
*
PHY_vars_eNB_g
[
0
][
0
]
->
lte_frame_parms
.
ofdm_symbol_size
*
10
,
1
,
1
);
}
sprintf
(
fname
,
"UErxsig%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
fname
,
"UErxsig%d.m"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"rxs%d"
,
frame
%
MAX_FRAME_NUMBER
);
sprintf
(
vname
,
"rxs%d"
,
frame
%
MAX_FRAME_NUMBER
);
write_output
(
fname
,
write_output
(
fname
,
...
...
targets/SIMU/USER/oaisim_functions.c
View file @
d06b3c92
...
@@ -100,7 +100,7 @@ int if_times = 0;
...
@@ -100,7 +100,7 @@ int if_times = 0;
int
for_times
=
0
;
int
for_times
=
0
;
uint16_t
Nid_cell
=
0
;
//needed by init_lte_vars
uint16_t
Nid_cell
=
0
;
//needed by init_lte_vars
int
nb_antennas_rx
=
2
;
// //
int
nb_antennas_rx
_ue
=
1
;
// //
uint8_t
target_dl_mcs
=
16
;
// max mcs used by MAC scheduler
uint8_t
target_dl_mcs
=
16
;
// max mcs used by MAC scheduler
uint8_t
rate_adaptation_flag
=
0
;
uint8_t
rate_adaptation_flag
=
0
;
uint8_t
set_snr
=
0
;
uint8_t
set_snr
=
0
;
...
@@ -751,9 +751,9 @@ void get_simulation_options(int argc, char *argv[])
...
@@ -751,9 +751,9 @@ void get_simulation_options(int argc, char *argv[])
break
;
break
;
case
'y'
:
case
'y'
:
nb_antennas_rx
=
atoi
(
optarg
);
nb_antennas_rx
_ue
=
atoi
(
optarg
);
if
(
nb_antennas_rx
>
4
)
{
if
(
nb_antennas_rx
_ue
>
4
)
{
printf
(
"Cannot have more than 4 antennas
\n
"
);
printf
(
"Cannot have more than 4 antennas
\n
"
);
exit
(
-
1
);
exit
(
-
1
);
}
}
...
@@ -972,8 +972,9 @@ void init_openair1(void)
...
@@ -972,8 +972,9 @@ void init_openair1(void)
cooperation_flag
,
cooperation_flag
,
enb_properties
->
properties
[
0
]
->
nb_antenna_ports
[
CC_id
],
enb_properties
->
properties
[
0
]
->
nb_antenna_ports
[
CC_id
],
abstraction_flag
,
abstraction_flag
,
enb_properties
->
properties
[
0
]
->
nb_antennas_rx
[
CC_id
],
enb_properties
->
properties
[
0
]
->
nb_antennas_tx
[
CC_id
],
enb_properties
->
properties
[
0
]
->
nb_antennas_tx
[
CC_id
],
enb_properties
->
properties
[
0
]
->
nb_antennas_tx
[
CC_id
],
nb_antennas_rx_ue
,
oai_emulation
.
info
.
eMBMS_active_state
);
oai_emulation
.
info
.
eMBMS_active_state
);
}
}
...
...
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