maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace a set of #define by a C bit array, remove duplicated extern global variable declaration

Browse Source
This commit is contained in:
Laurent THOMAS
2025-01-09 15:28:25 +01:00
committed by Robert Schmidt
parent f9bff3d6a0
commit e0ca70c36d
48 changed files with 135 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/softmodem-common.c
+20 -43
View File
@@ -41,55 +41,33 @@
#include "softmodem-common.h"
#include "nfapi/oai_integration/vendor_ext.h"
static softmodem_params_t softmodem_params;
char *parallel_config=NULL;
char *worker_config=NULL;
int usrp_tx_thread = 0;
uint8_t nfapi_mode=0;
static mapping softmodem_funcs[] = MAPPING_SOFTMODEM_FUNCTIONS;
static struct timespec start;
uint64_t get_softmodem_optmask(void) {
return softmodem_params.optmask;
}
uint64_t set_softmodem_optmask(uint64_t bitmask) {
softmodem_params.optmask = softmodem_params.optmask | bitmask;
return softmodem_params.optmask;
}
uint64_t clear_softmodem_optmask(uint64_t bitmask)
{
softmodem_params.optmask = softmodem_params.optmask & (~bitmask);
return softmodem_params.optmask;
}
static softmodem_params_t softmodem_params;
softmodem_params_t *get_softmodem_params(void) {
return &softmodem_params;
}
int32_t check_execmask(uint64_t execmask) {
char *softmodemfunc=map_int_to_str(softmodem_funcs, execmask);
if (softmodemfunc != NULL) {
set_softmodem_optmask(execmask);
return 0;
}
return -1;
}
char *get_softmodem_function(uint64_t *sofmodemfunc_mask_ptr) {
uint64_t fmask=(get_softmodem_optmask()&SOFTMODEM_FUNC_BITS);
char *softmodemfunc=map_int_to_str(softmodem_funcs, fmask);
if (sofmodemfunc_mask_ptr != NULL)
*sofmodemfunc_mask_ptr=fmask;
if (softmodemfunc != NULL) {
return softmodemfunc;
}
char *get_softmodem_function(void)
{
optmask_t fmask = *get_softmodem_optmask();
if (fmask.bit.SOFTMODEM_ENB_BIT)
return "enb";
if (fmask.bit.SOFTMODEM_GNB_BIT)
return "gnb";
if (fmask.bit.SOFTMODEM_4GUE_BIT)
return "4Gue";
if (fmask.bit.SOFTMODEM_5GUE_BIT)
return "5Gue";
return "???";
}
void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
void get_common_options(configmodule_interface_t *cfg)
{
int32_t stats_disabled = 0;
uint32_t online_log_messages=0;
@@ -101,7 +79,6 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
uint32_t enable_imscope = 0;
int nfapi_index = 0;
char *logmem_filename = NULL;
check_execmask(execmask);
paramdef_t cmdline_params[] = CMDLINE_PARAMS_DESC;
checkedparam_t cmdline_CheckParams[] = CMDLINE_PARAMS_CHECK_DESC;
@@ -136,7 +113,7 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
}
if (start_telnetclt) {
set_softmodem_optmask(SOFTMODEM_TELNETCLT_BIT);
IS_SOFTMODEM_TELNETCLT = true;
}
if (logmem_filename != NULL && strlen(logmem_filename) > 0) {
@@ -145,23 +122,23 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
}
if (noS1) {
set_softmodem_optmask(SOFTMODEM_NOS1_BIT);
IS_SOFTMODEM_NOS1 = true;
}
if (nonbiot) {
set_softmodem_optmask(SOFTMODEM_NONBIOT_BIT);
IS_SOFTMODEM_NONBIOT = true;
}
if (rfsim) {
set_softmodem_optmask(SOFTMODEM_RFSIM_BIT);
IS_SOFTMODEM_RFSIM = true;
}
if (do_forms) {
set_softmodem_optmask(SOFTMODEM_DOSCOPE_BIT);
IS_SOFTMODEM_DOSCOPE = true;
}
if (enable_imscope) {
set_softmodem_optmask(SOFTMODEM_IMSCOPE_BIT);
IS_SOFTMODEM_IMSCOPE_ENABLED = true;
}
if (start_websrv) {
@@ -173,7 +150,7 @@ void get_common_options(configmodule_interface_t *cfg, uint32_t execmask)
if(worker_config != NULL) set_worker_conf(worker_config);
nfapi_setmode(nfapi_mode);
if (stats_disabled)
set_softmodem_optmask(SOFTMODEM_NOSTATS_BIT);
IS_SOFTMODEM_NOSTATS = true;
}
void softmodem_verify_mode(const softmodem_params_t *p)