aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CommonLibs/LogTest.cpp4
-rw-r--r--CommonLibs/Logger.cpp5
-rw-r--r--Transceiver52M/osmo-trx.cpp3
3 files changed, 0 insertions, 12 deletions
diff --git a/CommonLibs/LogTest.cpp b/CommonLibs/LogTest.cpp
index 882707d..2245386 100644
--- a/CommonLibs/LogTest.cpp
+++ b/CommonLibs/LogTest.cpp
@@ -28,10 +28,6 @@
#include <iterator>
#include "Logger.h"
-#include "Configuration.h"
-
-ConfigurationTable gConfig;
-//ConfigurationTable gConfig("example.config");
void printAlarms()
{
diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp
index 1c462e7..5b8da99 100644
--- a/CommonLibs/Logger.cpp
+++ b/CommonLibs/Logger.cpp
@@ -32,7 +32,6 @@
#include <stdarg.h>
#include <sys/time.h> // For gettimeofday
-#include "Configuration.h"
#include "Logger.h"
#include "Threads.h" // pat added
@@ -41,15 +40,11 @@
using namespace std;
// Switches to enable/disable logging targets
-// MUST BE DEFINED BEFORE gConfig FOR gLogEarly() TO WORK CORRECTLY
bool gLogToConsole = true;
bool gLogToSyslog = false;
FILE *gLogToFile = NULL;
Mutex gLogToLock;
-
-// Reference to a global config table, used all over the system.
-extern ConfigurationTable gConfig;
// Global log level threshold:
int config_log_level;
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 3f72fb7..44da638 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -31,7 +31,6 @@
#include <GSMCommon.h>
#include <Logger.h>
-#include <Configuration.h>
extern "C" {
#include "convolve.h"
@@ -82,8 +81,6 @@ struct trx_config {
int sched_rr;
};
-ConfigurationTable gConfig;
-
volatile bool gshutdown = false;
/* Setup configuration values