From 4d9ee5d11c8cb5417aa8709ce8ebcc2ab2661138 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 2 Mar 2022 11:56:31 +0100
Subject: [PATCH] Add X400 to devtype_names, make char* array

---
 targets/ARCH/COMMON/common_lib.c | 23 +++++++++++++++++++----
 targets/ARCH/COMMON/common_lib.h |  6 ++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/targets/ARCH/COMMON/common_lib.c b/targets/ARCH/COMMON/common_lib.c
index c4f4e3ead5..08daf58cf7 100644
--- a/targets/ARCH/COMMON/common_lib.c
+++ b/targets/ARCH/COMMON/common_lib.c
@@ -43,16 +43,31 @@
 //#include "targets/RT/USER/lte-softmodem.h"
 #include "executables/softmodem-common.h"
 
-char *get_devname(int devtype) {
-char *devnames[MAX_RF_DEV_TYPE]=DEVTYPE_NAMES;
+const char* devtype_names[MAX_RF_DEV_TYPE] = {
+  "",
+  "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 )
-  	  return devnames[devtype];
+    return devtype_names[devtype];
   return "none";
 }
 
 int set_device(openair0_device *device)
 {
-  char *devname = get_devname(device->type);
+  const char *devname = get_devname(device->type);
     if (strcmp(devname,"none") != 0) {
       LOG_I(HW,"[%s] has loaded %s device.\n",((device->host_type == RAU_HOST) ? "RAU": "RRU"),devname);
     } else {
diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index 7228fe24eb..38a7b0fa67 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -109,7 +109,9 @@ typedef enum {
   RFSIMULATOR,
   MAX_RF_DEV_TYPE
 } 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
  */
 typedef enum {
@@ -537,7 +539,7 @@ extern "C"
 
 
 /*! \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 */
 int openair0_device_load(openair0_device *device, openair0_config_t *openair0_cfg);
 /*! \brief Initialize transport protocol . It returns 0 if OK */