summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-11-19 15:59:14 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-11-19 15:59:14 +0100
commit2eda0c4113a4755ed0239b4ecdddafc16965b9f4 (patch)
tree79e67b3a108323ea256aaec66f14a0f9115fbacb
parent1d8676e85f1f1df9883e273962d753cff5232f1e (diff)
downloadvdr-2eda0c4113a4755ed0239b4ecdddafc16965b9f4.tar.gz
vdr-2eda0c4113a4755ed0239b4ecdddafc16965b9f4.tar.bz2
Switched to 'dvb-kernel' driver (build-2.4)
-rw-r--r--HISTORY7
-rw-r--r--Makefile4
-rwxr-xr-xrunvdr8
3 files changed, 12 insertions, 7 deletions
diff --git a/HISTORY b/HISTORY
index 8ee0a494..42f62cb0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3139,8 +3139,13 @@ Video Disk Recorder Revision History
days ('1' is monday). Thanks to Sascha Klek for reporting a problem with the
'0' key in the "Day" item of the "Timers" menu.
-2004-11-16: Version 1.3.17
+2004-11-19: Version 1.3.17
- 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.
diff --git a/Makefile b/Makefile
index d0a05334..be5fbcae 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.69 2004/10/30 11:51:09 kls Exp $
+# $Id: Makefile 1.70 2004/11/19 15:43:27 kls Exp $
.DELETE_ON_ERROR:
@@ -29,7 +29,7 @@ DOXYFILE = Doxyfile
-include Make.config
-INCLUDES = -I$(DVBDIR)/include
+INCLUDES = -I$(DVBDIR)/linux/include
SILIB = $(LSIDIR)/libsi.a
diff --git a/runvdr b/runvdr
index 883e16b1..6912adea 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.12 2004/01/09 16:19:26 kls Exp $
+# $Id: runvdr 1.13 2004/11/19 15:53:03 kls Exp $
-DVBDIR="../DVB/driver"
+DVBDIR="../DVB/build-2.4"
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; make insmod)
+ (cd $DVBDIR; ./insmod.sh load)
fi
while (true) do
@@ -39,6 +39,6 @@ while (true) do
echo "restarting VDR"
$KILL $VDRPRG
sleep 10
- (cd $DVBDIR; make rmmod; make insmod)
+ (cd $DVBDIR; ./insmod.sh reload)
date
done