Add --musim option for L2 FAPI simulator.
This commit is contained in:
Regular → Executable
+1
@@ -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
|
||||||
|
|||||||
@@ -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() {
|
|||||||
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() {
|
|||||||
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
|
||||||
|
|||||||
Regular → Executable
+11
@@ -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 @@
|
|||||||
# 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
|
||||||
|
|||||||
@@ -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.
|
|||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user