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
canghaiwuhen
OpenXG-RAN
Commits
b60e861b
Commit
b60e861b
authored
Oct 25, 2018
by
Y_Tomita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add --musim option for L2 FAPI simulator.
parent
cfab3139
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
0 deletions
+33
-0
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-0
cmake_targets/build_oai
cmake_targets/build_oai
+6
-0
openair2/COMMON/platform_constants.h
openair2/COMMON/platform_constants.h
+11
-0
targets/COMMON/openairinterface5g_limits.h
targets/COMMON/openairinterface5g_limits.h
+15
-0
No files found.
cmake_targets/CMakeLists.txt
100644 → 100755
View file @
b60e861b
...
@@ -616,6 +616,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
...
@@ -616,6 +616,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR_PHY False "trace some PHY exchang
add_boolean_option
(
UE_EXPANSION False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
UE_EXPANSION False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PHY_TX_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PHY_TX_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PRE_SCD_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PRE_SCD_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
UESIM_EXPANSION False
"enable UESIM_EXPANSION with max 256 UE"
)
########################
########################
# Include order
# Include order
...
...
cmake_targets/build_oai
View file @
b60e861b
...
@@ -43,6 +43,7 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
...
@@ -43,6 +43,7 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
MSC_GEN
=
0
MSC_GEN
=
0
XFORMS
=
"True"
XFORMS
=
"True"
UE_EXPANSION
=
"False"
UE_EXPANSION
=
"False"
UESIM_EXPANSION
=
"False"
PRINT_STATS
=
"False"
PRINT_STATS
=
"False"
VCD_TIMING
=
"False"
VCD_TIMING
=
"False"
DEADLINE_SCHEDULER_FLAG_USER
=
"False"
DEADLINE_SCHEDULER_FLAG_USER
=
"False"
...
@@ -218,6 +219,10 @@ function main() {
...
@@ -218,6 +219,10 @@ function main() {
UE_EXPANSION
=
"True"
UE_EXPANSION
=
"True"
echo_info
"Will compile with UE_EXPANSION"
echo_info
"Will compile with UE_EXPANSION"
shift
;;
shift
;;
--musim
)
UESIM_EXPANSION
=
"True"
echo_info
"Will compile with UESIM_EXPANSION"
shift
;;
--UE-conf-nvram
)
--UE-conf-nvram
)
conf_nvram_path
=
$(
readlink
-f
$2
)
conf_nvram_path
=
$(
readlink
-f
$2
)
shift
2
;;
shift
2
;;
...
@@ -539,6 +544,7 @@ function main() {
...
@@ -539,6 +544,7 @@ function main() {
echo
"set ( UE_EXPANSION
$UE_EXPANSION
)"
>>
$cmake_file
echo
"set ( UE_EXPANSION
$UE_EXPANSION
)"
>>
$cmake_file
# echo "set ( PHY_TX_THREAD $UE_EXPANSION )" >> $cmake_file
# echo "set ( PHY_TX_THREAD $UE_EXPANSION )" >> $cmake_file
echo
"set ( PRE_SCD_THREAD
$UE_EXPANSION
)"
>>
$cmake_file
echo
"set ( PRE_SCD_THREAD
$UE_EXPANSION
)"
>>
$cmake_file
echo
"set ( UESIM_EXPANSION
$UESIM_EXPANSION
)"
>>
$cmake_file
echo
"set ( RRC_ASN1_VERSION
\"
${
REL
}
\"
)"
>>
$cmake_file
echo
"set ( RRC_ASN1_VERSION
\"
${
REL
}
\"
)"
>>
$cmake_file
echo
"set ( ENABLE_VCD_FIFO
$VCD_TIMING
)"
>>
$cmake_file
echo
"set ( ENABLE_VCD_FIFO
$VCD_TIMING
)"
>>
$cmake_file
echo
"set ( RF_BOARD
\"
${
HW
}
\"
)"
>>
$cmake_file
echo
"set ( RF_BOARD
\"
${
HW
}
\"
)"
>>
$cmake_file
...
...
openair2/COMMON/platform_constants.h
100644 → 100755
View file @
b60e861b
...
@@ -68,6 +68,16 @@
...
@@ -68,6 +68,16 @@
# define MAX_MODULES NB_MODULES_MAX
# define MAX_MODULES NB_MODULES_MAX
#ifndef UE_EXPANSION
#ifndef UE_EXPANSION
// TODO:L2 FAPI simulator.
// UESIM_EXPANSION is used to be same value of MAX_MOBILES_PER_ENB
// in eNB and UE.
// now , if we use --mu option in UE, compiling error will occur.
// This problem will be fixed in the future.
# ifdef UESIM_EXPANSION
# define MAX_MOBILES_PER_ENB 256
# define MAX_MOBILES_PER_ENB_NB_IoT 256
# define MAX_eNB 2
# else
# ifdef LARGE_SCALE
# ifdef LARGE_SCALE
# define MAX_MOBILES_PER_ENB 128
# define MAX_MOBILES_PER_ENB 128
# define MAX_MOBILES_PER_ENB_NB_IoT 128
# define MAX_MOBILES_PER_ENB_NB_IoT 128
...
@@ -77,6 +87,7 @@
...
@@ -77,6 +87,7 @@
# define MAX_MOBILES_PER_ENB_NB_IoT 16
# define MAX_MOBILES_PER_ENB_NB_IoT 16
# define MAX_eNB 2
# define MAX_eNB 2
# endif
# endif
#endif
#else
#else
# define MAX_MOBILES_PER_ENB 256
# define MAX_MOBILES_PER_ENB 256
# define MAX_MOBILES_PER_ENB_NB_IoT 256
# define MAX_MOBILES_PER_ENB_NB_IoT 256
...
...
targets/COMMON/openairinterface5g_limits.h
View file @
b60e861b
...
@@ -5,8 +5,18 @@
...
@@ -5,8 +5,18 @@
# define NUMBER_OF_eNB_MAX 1
# define NUMBER_OF_eNB_MAX 1
# define NUMBER_OF_RU_MAX 2
# define NUMBER_OF_RU_MAX 2
# ifndef UE_EXPANSION
# ifndef UE_EXPANSION
// TODO:L2 FAPI simulator.
// UESIM_EXPANSION is used to be same value of NUMBER_OF_UE_MAX
// in eNB and UE.
// now , if we use --mu option in UE, compiling error will occur.
// This problem will be fixed in the future.
# ifndef UESIM_EXPANSION
# define NUMBER_OF_UE_MAX 16
# define NUMBER_OF_UE_MAX 16
# define NUMBER_OF_CONNECTED_eNB_MAX 3
# define NUMBER_OF_CONNECTED_eNB_MAX 3
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# endif
# else
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_eNB_MAX 1
...
@@ -20,8 +30,13 @@ eNB process will exit because unexpected access happens.
...
@@ -20,8 +30,13 @@ eNB process will exit because unexpected access happens.
Now some parts are using NUMBER_OF_UE_MAX
Now some parts are using NUMBER_OF_UE_MAX
and the other are using MAX_MOBILES_PER_ENB in for-loop.
and the other are using MAX_MOBILES_PER_ENB in for-loop.
*/
*/
# ifndef UESIM_EXPANSION
# define NUMBER_OF_UE_MAX 16
# define NUMBER_OF_UE_MAX 16
# define NUMBER_OF_CONNECTED_eNB_MAX 3
# define NUMBER_OF_CONNECTED_eNB_MAX 3
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# endif
# else
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_eNB_MAX 1
...
...
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