From 8ea561a0218f443bab84b5ec8a822d6fe6a589ee Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Tue, 16 Dec 2014 21:58:46 +0200
Subject: [PATCH] Fixed the default logging mode in a DEBUG build.

---
 config.c | 2 +-
 device.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.c b/config.c
index a78af15..09340ba 100644
--- a/config.c
+++ b/config.c
@@ -14,7 +14,7 @@ cSatipConfig SatipConfig;
 cSatipConfig::cSatipConfig(void)
 : operatingModeM(eOperatingModeLow),
 #ifdef DEBUG
-  loggingModeM(eLoggingModeDebug1 & eLoggingModeDebug2),
+  loggingModeM(eLoggingModeDebug1 | eLoggingModeDebug2 | eLoggingModeDebug5),
 #else
   loggingModeM(eLoggingModeNormal),
 #endif
diff --git a/device.c b/device.c
index 9437b3e..e7730c2 100644
--- a/device.c
+++ b/device.c
@@ -26,7 +26,7 @@ cSatipDevice::cSatipDevice(unsigned int indexP)
 {
   unsigned int bufsize = (unsigned int)SATIP_BUFFER_SIZE;
   bufsize -= (bufsize % TS_SIZE);
-  info("Creating SATIP device CardIndex=%d [device %u]", CardIndex(), deviceIndexM);
+  info("Creating device CardIndex=%d DeviceNumber=%d [device %u]", CardIndex(), DeviceNumber(), deviceIndexM);
   tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
                                    *cString::sprintf("SATIP#%d TS", deviceIndexM));
   if (tsBufferM) {
@@ -320,7 +320,7 @@ bool cSatipDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
      cDvbTransponderParameters dtp(channelP->Parameters());
      cString params = GetTransponderUrlParameters(channelP);
      if (isempty(params)) {
-        error("Unrecognized SATIP channel parameters: %s [device %u]", channelP->Parameters(), deviceIndexM);
+        error("Unrecognized channel parameters: %s [device %u]", channelP->Parameters(), deviceIndexM);
         return false;
         }
      cString address;