From 92bf2133fcaf41fd9399761bdfca61cec0b5a440 Mon Sep 17 00:00:00 2001 From: Haruki NAOI <naoi.haruki@jp.fujitsu.com> Date: Thu, 30 Aug 2018 18:24:44 +0900 Subject: [PATCH] Fix: basic-sim and ue-ethernet compile error. --- common/utils/LOG/log.c | 2 +- common/utils/LOG/log_extern.h | 1 + targets/RT/USER/lte-softmodem.c | 1 - targets/RT/USER/lte-uesoftmodem.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/utils/LOG/log.c b/common/utils/LOG/log.c index d67cda7afe..b020f19f01 100644 --- a/common/utils/LOG/log.c +++ b/common/utils/LOG/log.c @@ -61,7 +61,7 @@ volatile int log_mem_write_flag=0; volatile int log_mem_write_side=0; char __log_mem_filename[1024]={0}; char * log_mem_filename = &__log_mem_filename[0]; - +char logmem_filename[1024] = {0}; mapping log_level_names[] = { {"error", OAILOG_ERR}, diff --git a/common/utils/LOG/log_extern.h b/common/utils/LOG/log_extern.h index 449333d92f..b11486173a 100644 --- a/common/utils/LOG/log_extern.h +++ b/common/utils/LOG/log_extern.h @@ -30,3 +30,4 @@ extern mapping log_maskmap[]; extern int log_mem_flag; extern char * log_mem_filename; +extern char logmem_filename[1024]; diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index 49639c4937..b9cefd4a57 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -142,7 +142,6 @@ static int8_t threequarter_fs=0; uint32_t downlink_frequency[MAX_NUM_CCs][4]; int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; -char logmem_filename[1024] = {0}; // This is a dummy declaration (dlsch_demodulation.c is no longer compiled for eNodeB) int16_t dlsch_demod_shift = 0; diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c index a2a12f9dd9..53d700d076 100644 --- a/targets/RT/USER/lte-uesoftmodem.c +++ b/targets/RT/USER/lte-uesoftmodem.c @@ -71,6 +71,7 @@ #include "PHY_INTERFACE/phy_interface_vars.h" #include "common/utils/LOG/log.h" +#include "common/utils/LOG/log_extern.h" #include "UTIL/OTG/otg_tx.h" #include "UTIL/OTG/otg_externs.h" #include "UTIL/MATH/oml.h" -- GitLab