From 60c5248a3688eddaab8d1aaebd28c917016c5ad9 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 6 Jan 2009 16:56:27 +0100
Subject: [PATCH] Removed the '#define FE_CAN_2ND_GEN_MODULATION'

---
 HISTORY     |  5 +++++
 config.h    | 10 +++++-----
 dvbdevice.c |  9 +--------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/HISTORY b/HISTORY
index 1ad179d1..9dd40649 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5911,3 +5911,8 @@ Video Disk Recorder Revision History
 - cDvbDevice now uses the FE_CAN_2G_MODULATION flag to determine whether a device
   can handle DVB-S2. The #define is still there to allow people with older drivers
   who don't need DVB-S2 to use this version without pathcing.
+
+2009-01-06: Version 1.7.4
+
+- Removed the '#define FE_CAN_2ND_GEN_MODULATION', since it was wrong and the
+  flag is now in the driver, anyway.
diff --git a/config.h b/config.h
index 46e9d7f1..0041f83d 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.5 2009/01/05 13:04:10 kls Exp $
+ * $Id: config.h 2.6 2009/01/06 16:56:27 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.3"
-#define VDRVERSNUM   10703  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.7.4"
+#define VDRVERSNUM   10704  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.3"
-#define APIVERSNUM   10703  // Version * 10000 + Major * 100 + Minor
+#define APIVERSION  "1.7.4"
+#define APIVERSNUM   10704  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to
diff --git a/dvbdevice.c b/dvbdevice.c
index 6aa0056f..3d4fddc9 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.10 2009/01/06 14:52:54 kls Exp $
+ * $Id: dvbdevice.c 2.11 2009/01/06 16:54:52 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -27,13 +27,6 @@
 #include "status.h"
 #include "transfer.h"
 
-// FIXME: temporary workaround until the S2API driver supports detecting
-// S2 capability in a clean way. This macro allows compiling VDR with an
-// unpatched driver. However, with an unpatched driver it will not support
-// DVB-S2 hardware. If you have DVB-S2 hardware you need to either patch
-// the driver or modify the line that uses this macro in cDvbDevice::cDvbDevice().
-#define FE_CAN_2ND_GEN_MODULATION 0x10000000
-
 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
 #define DO_MULTIPLE_RECORDINGS 1