From 817c54da168e621448938d738ba398ab1b8045bd Mon Sep 17 00:00:00 2001
From: Roland Jax <roland.jax@liwest.at>
Date: Tue, 16 Dec 2014 14:53:46 +0100
Subject: [PATCH] cass port: getDeviceName() added.

---
 src/ebusd/baseloop.cpp   | 2 +-
 src/ebusd/bushandler.cpp | 3 +--
 src/lib/ebus/port.h      | 6 ++++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index fbac03fb..4e40cc4b 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -62,7 +62,7 @@ BaseLoop::BaseLoop()
 	m_port->open();
 
 	if (m_port->isOpen() == false)
-		L.log(bus, error, "can't open %s", A.getOptVal<const char*>("device"));
+		L.log(bus, error, "can't open %s", m_port->getDeviceName());
 
 	// create BusHandler
 	m_busHandler = new BusHandler(m_port, m_messages,
diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 46745e40..7a62e904 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -34,7 +34,6 @@
 using namespace std;
 
 extern Logger& L;
-extern Appl& A;
 
 /**
  * @brief Return the string corresponding to the @a BusState.
@@ -219,7 +218,7 @@ void BusHandler::run()
 			result_t result = m_port->open();
 
 			if (result != RESULT_OK)
-				L.log(bus, error, "can't open %s", A.getOptVal<const char*>("device"));
+				L.log(bus, error, "can't open %s", m_port->getDeviceName());
 
 		}
 
diff --git a/src/lib/ebus/port.h b/src/lib/ebus/port.h
index 80667658..963ad6e0 100644
--- a/src/lib/ebus/port.h
+++ b/src/lib/ebus/port.h
@@ -288,6 +288,12 @@ public:
 	 */
 	void setDumpRawMaxSize(const long maxSize) { m_dumpRawMaxSize = maxSize; }
 
+	/**
+	 * @brief Return the device name.
+	 * @return the device name.
+	 */
+	const char* getDeviceName() { return m_deviceName.c_str(); }
+
 private:
 	/** the device name */
 	const string m_deviceName;