Back to the old DVB driver due to tuning failures with dvb-kernel

3 files changed, 6 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index 767b1fd7..ebcd3a61 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3144,11 +3144,6 @@ Video Disk Recorder Revision History
 - Fixed cRemux::ScanVideoPacket() to make sure it doesn't access memory beyond
   the end of the given buffer, which has caused some unjustified "unknown
   picture type errors" (thanks to Marco Schlüßler).
-- The driver is now assumed to be the 'dvb-kernel' version. The only change
-  for this was the additional 'linux' in the INCLUDES definition of the Makefile.
-  If you want to use the old DVB driver just revert this line to what it was in
-  VDR version 1.3.16. The 'runvdr' script by default uses the "build-2.4"
-  driver. If you want to use "build-2.6" just edit that file as necessary.
 - Fixed a possible crash when pausing live video and the recording was unable
   to start, maybe because there was no lock on the device (thanks to Andreas
   Brugger for reporting this one).
diff --git a/Makefile b/Makefile
index 47fcb8a8..13276814 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.71 2004/11/20 14:38:29 kls Exp $
+# $Id: Makefile 1.72 2004/11/21 11:28:55 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -29,7 +29,7 @@ DOXYFILE = Doxyfile
 
 -include Make.config
 
-INCLUDES = -I$(DVBDIR)/linux/include
+INCLUDES = -I$(DVBDIR)/include
 
 SILIB    = $(LSIDIR)/libsi.a
 
diff --git a/runvdr b/runvdr
index 6912adea..76fd5f08 100755
--- a/runvdr
+++ b/runvdr
@@ -18,9 +18,9 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.13 2004/11/19 15:53:03 kls Exp $
+# $Id: runvdr 1.14 2004/11/21 11:30:00 kls Exp $
 
-DVBDIR="../DVB/build-2.4"
+DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
 VDRCMD="$VDRPRG -w 60 $*"
 
@@ -29,7 +29,7 @@ KILL="/usr/bin/killall -q -TERM"
 
 # Load driver if it hasn't been loaded already:
 if [ $LSMOD -eq 0 ] ; then
-   (cd $DVBDIR; ./insmod.sh load)
+   (cd $DVBDIR; make insmod)
    fi
 
 while (true) do
@@ -39,6 +39,6 @@ while (true) do
       echo "restarting VDR"
       $KILL $VDRPRG
       sleep 10
-      (cd $DVBDIR; ./insmod.sh reload)
+      (cd $DVBDIR; make rmmod; make insmod)
       date
       done