diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2012-10-07 11:13:18 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-10-07 11:13:18 +0200 |
commit | 9f832ef482346bdf1917df21e485f35098b9bebc (patch) | |
tree | f85ed07c1546c89d89688d298fdc38b680b0eeaf /dvbdevice.c | |
parent | 86fc7ba77cd70c453075ec7c4d7d40580388e964 (diff) | |
download | vdr-9f832ef482346bdf1917df21e485f35098b9bebc.tar.gz vdr-9f832ef482346bdf1917df21e485f35098b9bebc.tar.bz2 |
Fixed some compiler warnings under gcc version 4.7.1
Diffstat (limited to 'dvbdevice.c')
-rw-r--r-- | dvbdevice.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index 0ea7a2e3..d3ade755 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 2.73 2012/10/04 12:44:13 kls Exp $ + * $Id: dvbdevice.c 2.74 2012/10/07 11:11:30 kls Exp $ */ #include "dvbdevice.h" @@ -410,7 +410,7 @@ cString cDvbTuner::GetBondingParams(const cChannel *Channel) const return diseqc->Commands(); } else { - bool ToneOff = Channel->Frequency() < (unsigned int)Setup.LnbSLOF; + bool ToneOff = Channel->Frequency() < Setup.LnbSLOF; bool VoltOff = dtp.Polarization() == 'V' || dtp.Polarization() == 'R'; return cString::sprintf("%c %c", ToneOff ? 't' : 'T', VoltOff ? 'v' : 'V'); } @@ -576,40 +576,52 @@ int cDvbTuner::GetSignalQuality(void) const return 3; return 4; } +#ifdef DEBUG_SIGNALQUALITY bool HasSnr = true; +#endif uint16_t Snr; while (1) { if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1) break; if (errno == EOPNOTSUPP) { Snr = 0xFFFF; +#ifdef DEBUG_SIGNALQUALITY HasSnr = false; +#endif break; } if (errno != EINTR) return -1; } +#ifdef DEBUG_SIGNALQUALITY bool HasBer = true; +#endif uint32_t Ber; while (1) { if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1) break; if (errno == EOPNOTSUPP) { Ber = 0; +#ifdef DEBUG_SIGNALQUALITY HasBer = false; +#endif break; } if (errno != EINTR) return -1; } +#ifdef DEBUG_SIGNALQUALITY bool HasUnc = true; +#endif uint32_t Unc; while (1) { if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1) break; if (errno == EOPNOTSUPP) { Unc = 0; +#ifdef DEBUG_SIGNALQUALITY HasUnc = false; +#endif break; } if (errno != EINTR) |