diff --git a/common/config/DOC/config/rtusage.md b/common/config/DOC/config/rtusage.md index 42ef93bffc..3b51e1afd2 100644 --- a/common/config/DOC/config/rtusage.md +++ b/common/config/DOC/config/rtusage.md @@ -68,7 +68,6 @@ To get help on supported parameters you can use specific options: --worker-config: two option for worker 'WORKER_DISABLE' or 'WORKER_ENABLE' --nbiot-disable: disable nb-iot, even if defined in config --noS1: Disable s1 interface - --nokrnmod: (noS1 only): Use tun instead of namesh module -------------------------------------------------------------------- [LIBCONFIG] (root): 4/4 parameters successfully set, (4 to default value) diff --git a/doc/L1SIM.md b/doc/L1SIM.md index 56be7f93b6..a78d3c328a 100644 --- a/doc/L1SIM.md +++ b/doc/L1SIM.md @@ -45,7 +45,7 @@ $ source oaienv $ cd cmake_targets/tools $ sudo -E ./init_nas_nos1 eNB $ cd ../ran_build/build -$ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0 +$ sudo -E ./lte-softmodem -O YYY.conf --noS1 ``` # How to run a UE with the noS1 option @@ -59,7 +59,7 @@ $ source oaienv $ cd cmake_targets/tools $ sudo -E ./init_nas_nos1 UE $ cd ../ran_build/build -$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0 +$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 ``` That should give you equivalent functionality to what you had with oaisim including noise and RF channel emulation (path loss / fading, etc.). You should also be able to run multiple UEs. diff --git a/doc/iqrecordplayer_usage.md b/doc/iqrecordplayer_usage.md index 603a74f4b5..69c675c996 100644 --- a/doc/iqrecordplayer_usage.md +++ b/doc/iqrecordplayer_usage.md @@ -33,7 +33,7 @@ than the value of `--subframes-max` parameter. >Recording session example: ```bash -./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --nokrnmod 1 --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-record 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-max 30000 +./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-record 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-max 30000 ............................................ ............................................ ............................................ @@ -54,7 +54,7 @@ options for replay mode are: >Replay mode session example: ```bash -./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --nokrnmod 1 --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-replay 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-loops 1 +./nr-uesoftmodem -O /home/oaitests/mediatek_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --band 78 -E --ue-fo-compensation --device.recplay.subframes-replay 1 --device.recplay.subframes-file /home/iqs/oai-nrUE-17042023.dat --device.recplay.use-mmap 1 --device.recplay.subframes-loops 1 .................................. .................................. [HW] Replay iqs from USRP B200 device, bandwidth 4.000000e+07 diff --git a/executables/lte-softmodem.c b/executables/lte-softmodem.c index 5e93068b06..59a58f30dc 100644 --- a/executables/lte-softmodem.c +++ b/executables/lte-softmodem.c @@ -410,7 +410,7 @@ static void init_pdcp(void) uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_IP_DRIVER_BIT : LINK_ENB_PDCP_TO_GTPV1U_BIT; if (IS_SOFTMODEM_NOS1) - pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT ; + pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_BIT; pdcp_initmask = pdcp_initmask | ENB_NAS_USE_TUN_W_MBMS_BIT; diff --git a/executables/lte-uesoftmodem.c b/executables/lte-uesoftmodem.c index eae196c2ef..2373670015 100644 --- a/executables/lte-uesoftmodem.c +++ b/executables/lte-uesoftmodem.c @@ -494,8 +494,13 @@ static void init_pdcp(int ue_id) { pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; } - if (IS_SOFTMODEM_NOKRNMOD) - pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; + // previous code was: + // if (IS_SOFTMODEM_NOKRNMOD) + // pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; + // The kernel module (KRNMOD) has been removed from the project, so the 'if' + // was removed but the flag 'pdcp_initmask' was kept, as "no kernel module" + // was always set. further refactoring could take it out + pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; pdcp_module_init(pdcp_initmask, ue_id); } diff --git a/executables/nr-softmodem-common.h b/executables/nr-softmodem-common.h index 589bc537f5..c168a1ac0b 100644 --- a/executables/nr-softmodem-common.h +++ b/executables/nr-softmodem-common.h @@ -103,8 +103,8 @@ #define CONFIG_HLP_TELN "Start embedded telnet server \n" #define CONFIG_HLP_SNR "Set average SNR in dB (for --siml1 option)\n" #define CONFIG_HLP_NOS1 "Disable s1 interface\n" -#define CONFIG_HLP_NOKRNMOD "(noS1 only): Use tun instead of namesh module \n" #define CONFIG_HLP_AGC "Rx Gain control used for UE" + /*--------------------------------------------------------------------------------------------------------------------------------*/ /* command line parameters for LOG utility */ /* optname helpstr paramflags XXXptr defXXXval type numelt */ diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c index 3449af32ae..b196a10970 100644 --- a/executables/nr-softmodem.c +++ b/executables/nr-softmodem.c @@ -543,7 +543,7 @@ static void wait_nfapi_init(char *thread_name) { void init_pdcp(void) { uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ? - LINK_ENB_PDCP_TO_IP_DRIVER_BIT | ENB_NAS_USE_TUN_BIT | SOFTMODEM_NOKRNMOD_BIT: + LINK_ENB_PDCP_TO_IP_DRIVER_BIT | ENB_NAS_USE_TUN_BIT : LINK_ENB_PDCP_TO_GTPV1U_BIT; if (!NODE_IS_DU(get_node_type())) { diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c index fd2ef4b397..d64be3125a 100644 --- a/executables/nr-uesoftmodem.c +++ b/executables/nr-uesoftmodem.c @@ -332,9 +332,14 @@ static void init_pdcp(int ue_id) pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; }*/ - if (IS_SOFTMODEM_NOKRNMOD) { - pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; - } + // previous code was: + // if (IS_SOFTMODEM_NOKRNMOD) + // pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; + // The kernel module (KRNMOD) has been removed from the project, so the 'if' + // was removed but the flag 'pdcp_initmask' was kept, as "no kernel module" + // was always set. further refactoring could take it out + pdcp_initmask = pdcp_initmask | UE_NAS_USE_TUN_BIT; + if (get_softmodem_params()->nsa && rlc_module_init(0) != 0) { LOG_I(RLC, "Problem at RLC initiation \n"); } diff --git a/executables/softmodem-common.c b/executables/softmodem-common.c index 6f5cabdede..be2a79eb64 100644 --- a/executables/softmodem-common.c +++ b/executables/softmodem-common.c @@ -97,7 +97,7 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask) uint32_t glog_level=0 ; uint32_t start_telnetsrv = 0, start_telnetclt = 0; uint32_t start_websrv = 0; - uint32_t noS1 = 0, nokrnmod = 1, nonbiot = 0; + uint32_t noS1 = 0, nonbiot = 0; uint32_t rfsim = 0, do_forms = 0; int nfapi_index = 0; char *logmem_filename = NULL; @@ -146,10 +146,6 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask) set_softmodem_optmask(SOFTMODEM_NOS1_BIT); } - if (nokrnmod) { - set_softmodem_optmask(SOFTMODEM_NOKRNMOD_BIT); - } - if (nonbiot) { set_softmodem_optmask(SOFTMODEM_NONBIOT_BIT); } diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h index a696c064a4..110a5c60a7 100644 --- a/executables/softmodem-common.h +++ b/executables/softmodem-common.h @@ -99,7 +99,6 @@ extern "C" #define CONFIG_HLP_NOS1 "Disable s1 interface\n" #define CONFIG_HLP_RFSIM "Run in rf simulator mode\n" -#define CONFIG_HLP_NOKRNMOD "(noS1 only): Use tun instead of namesh module \n" #define CONFIG_HLP_DISABLNBIOT "disable nb-iot, even if defined in config\n" #define CONFIG_HLP_USRP_THREAD "having extra thead for usrp tx\n" #define CONFIG_HLP_NFAPI "Change the nFAPI mode for NR 'MONOLITHIC', 'PNF', 'VNF', 'AERIAL','UE_STUB_PNF','UE_STUB_OFFNET','STANDALONE_PNF'\n" @@ -173,7 +172,6 @@ extern int usrp_tx_thread; {"worker-config", CONFIG_HLP_WORKER_CMD, 0, .strptr=&worker_config, .defstrval=NULL, TYPE_STRING, 0}, \ {"noS1", CONFIG_HLP_NOS1, PARAMFLAG_BOOL, .uptr=&noS1, .defintval=0, TYPE_UINT, 0}, \ {"rfsim", CONFIG_HLP_RFSIM, PARAMFLAG_BOOL, .uptr=&rfsim, .defintval=0, TYPE_UINT, 0}, \ - {"nokrnmod", CONFIG_HLP_NOKRNMOD, PARAMFLAG_BOOL, .uptr=&nokrnmod, .defintval=1, TYPE_UINT, 0}, \ {"nbiot-disable", CONFIG_HLP_DISABLNBIOT, PARAMFLAG_BOOL, .uptr=&nonbiot, .defuintval=0, TYPE_UINT, 0}, \ {"chest-freq", CONFIG_HLP_CHESTFREQ, 0, .iptr=&CHEST_FREQ, .defintval=0, TYPE_INT, 0}, \ {"chest-time", CONFIG_HLP_CHESTTIME, 0, .iptr=&CHEST_TIME, .defintval=0, TYPE_INT, 0}, \ @@ -224,7 +222,6 @@ extern int usrp_tx_thread; { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ { .s3a = { config_checkstr_assign_integer, \ {"MONOLITHIC", "PNF", "VNF", "AERIAL","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF"}, \ {NFAPI_MONOLITHIC, NFAPI_MODE_PNF, NFAPI_MODE_VNF, NFAPI_MODE_AERIAL,NFAPI_UE_STUB_PNF,NFAPI_UE_STUB_OFFNET,NFAPI_MODE_STANDALONE_PNF}, \ @@ -278,7 +275,6 @@ extern int usrp_tx_thread; /***************************************************************************************************************************************/ #define SOFTMODEM_NOS1_BIT (1<<0) -#define SOFTMODEM_NOKRNMOD_BIT (1<<1) #define SOFTMODEM_NONBIOT_BIT (1<<2) #define SOFTMODEM_RFSIM_BIT (1<<10) #define SOFTMODEM_SIML1_BIT (1<<12) @@ -298,7 +294,6 @@ extern int usrp_tx_thread; #define IS_SOFTMODEM_NOS1 ( get_softmodem_optmask() & SOFTMODEM_NOS1_BIT) -#define IS_SOFTMODEM_NOKRNMOD ( get_softmodem_optmask() & SOFTMODEM_NOKRNMOD_BIT) #define IS_SOFTMODEM_NONBIOT ( get_softmodem_optmask() & SOFTMODEM_NONBIOT_BIT) #define IS_SOFTMODEM_RFSIM ( get_softmodem_optmask() & SOFTMODEM_RFSIM_BIT) #define IS_SOFTMODEM_SIML1 ( get_softmodem_optmask() & SOFTMODEM_SIML1_BIT)