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

Add X400 to devtype_names, make char* array

Browse Source
This commit is contained in:
Robert Schmidt
2022-03-07 18:01:03 +01:00
parent 473328a057
commit 4d9ee5d11c
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/COMMON/common_lib.c
+19 -4
View File
@@ -43,16 +43,31 @@
//#include "targets/RT/USER/lte-softmodem.h" //#include "targets/RT/USER/lte-softmodem.h"
#include "executables/softmodem-common.h" #include "executables/softmodem-common.h"
char *get_devname(int devtype) { const char* devtype_names[MAX_RF_DEV_TYPE] = {
char *devnames[MAX_RF_DEV_TYPE]=DEVTYPE_NAMES; "",
"EXMIMO",
"USRP B200",
"USRP X300",
"USRP N300",
"USRP X400",
"BLADERF",
"LMSSDR",
"IRIS",
"No HW",
"ADRV9371_ZC706",
"UEDv2",
"RFSIMULATOR"
};
const char *get_devname(int devtype) {
if (devtype < MAX_RF_DEV_TYPE && devtype !=MIN_RF_DEV_TYPE ) if (devtype < MAX_RF_DEV_TYPE && devtype !=MIN_RF_DEV_TYPE )
return devnames[devtype]; return devtype_names[devtype];
return "none"; return "none";
} }
int set_device(openair0_device *device) int set_device(openair0_device *device)
{ {
char *devname = get_devname(device->type); const char *devname = get_devname(device->type);
if (strcmp(devname,"none") != 0) { if (strcmp(devname,"none") != 0) {
LOG_I(HW,"[%s] has loaded %s device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"),devname); LOG_I(HW,"[%s] has loaded %s device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"),devname);
} else { } else {
targets/ARCH/COMMON/common_lib.h
+4 -2
View File
@@ -109,7 +109,9 @@ typedef enum {
RFSIMULATOR, RFSIMULATOR,
MAX_RF_DEV_TYPE MAX_RF_DEV_TYPE
} dev_type_t; } dev_type_t;
#define DEVTYPE_NAMES {"","EXMIMO","USRP B200","USRP X300","USRP N300","BLADERF","LMSSDR","IRIS","No HW","ADRV9371_ZC706","UEDv2", "RFSIMULATOR"} /* list of names of devices, needs to match dev_type_t */
extern const char* devtype_names[MAX_RF_DEV_TYPE];
/*!\brief transport protocol types /*!\brief transport protocol types
*/ */
typedef enum { typedef enum {
@@ -537,7 +539,7 @@ extern "C"
/*! \brief get device name from device type */ /*! \brief get device name from device type */
char *get_devname(int devtype); const char *get_devname(int devtype);
/*! \brief Initialize openair RF target. It returns 0 if OK */ /*! \brief Initialize openair RF target. It returns 0 if OK */
int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg); int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg);
/*! \brief Initialize transport protocol . It returns 0 if OK */ /*! \brief Initialize transport protocol . It returns 0 if OK */