summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--v4l/ChangeLog11
-rw-r--r--v4l/Make.config1
-rw-r--r--v4l/Makefile14
-rw-r--r--v4l/compat.h7
-rw-r--r--v4l/scripts/merge-trees.sh21
-rw-r--r--v4l/scripts/unmerge-trees.sh21
6 files changed, 53 insertions, 22 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 2d7debc66..b757ef63e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-23 05:25 mkrufky
+
+ * ../v4l/Make.config:
+ * ../v4l/Makefile:
+ * ../v4l/compat.h:
+ * ../v4l/scripts/merge-trees.sh:
+ * ../v4l/scripts/unmerge-trees.sh:
+ - add dvb-core to v4l/dvb merged-trees build environment
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-22 19:30 mkrufky
* ../linux/Documentation/video4linux/CARDLIST.cx88:
diff --git a/v4l/Make.config b/v4l/Make.config
index cef950fbf..551ad1506 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -28,6 +28,7 @@ CONFIG_VIDEO_SAA7134_DVB := n
CONFIG_DVB_BT8XX := n
CONFIG_DVB_BT8XX_DST := n
CONFIG_DVB_FRONTENDS := n
+CONFIG_DVB_CORE := n
ifneq ($(KERNELRELEASE),)
CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m)
diff --git a/v4l/Makefile b/v4l/Makefile
index 2a1014781..d793acc80 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -32,6 +32,9 @@ em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
em28xx-input.o
cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
cx25840-vbi.o
+dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \
+ dvb_ca_en50221.o dvb_frontend.o \
+ dvb_net.o dvb_ringbuffer.o
obj-m := video-buf.o v4l1-compat.o v4l2-common.o
obj-m += compat_ioctl32.o
@@ -64,6 +67,7 @@ obj-$(CONFIG_DVB_BT8XX_DST) += dst.o dst_ca.o
obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \
mt352.o tda1004x.o sp887x.o nxt6000.o \
cx24110.o or51211.o nxt200x.o cx24123.o
+obj-$(CONFIG_DVB_CORE) += dvb-core.o
# 2.6-only stuff
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -181,6 +185,7 @@ endif
inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko
inst_frontends += nxt200x.ko cx24123.ko
+inst_dvb-core := dvb-core.ko
v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
@@ -203,6 +208,8 @@ links::
dvb-links::
@find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
@find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+ @find ../linux/drivers/media/dvb/dvb-core -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+ @find ../linux/include/linux/dvb -name '*.h' -type l -exec ln -sf '{}' . \;
install:: rminstall
@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
@@ -259,6 +266,9 @@ dvb-install:: dvb-rminstall
install -d $(KDIR26)/dvb/bt8xx
install -m 644 -c $(inst_bt8xx) $(KDIR26)/dvb/bt8xx
+ install -d $(KDIR26)/dvb/dvb-core
+ install -m 644 -c $(inst_dvb-core) $(KDIR26)/dvb/dvb-core
+
/sbin/depmod -a
dvb-rminstall::
@@ -267,8 +277,10 @@ dvb-rminstall::
-@rm -r $(DEST) \
$(addprefix $(KDIR26)/dvb/bt8xx/, $(inst_bt8xx)) \
$(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \
+ $(addprefix $(KDIR26)/dvb/dvb-core/, $(inst_dvb-core)) \
$(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \
- $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+ $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \
+ $(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
@echo
rminstall::
diff --git a/v4l/compat.h b/v4l/compat.h
index 3bb5c63bc..e0d4abfe5 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
/*
- * $Id: compat.h,v 1.33 2005/11/20 23:10:47 mkrufky Exp $
+ * $Id: compat.h,v 1.34 2005/11/23 05:26:43 mkrufky Exp $
*/
#ifndef _COMPAT_H
@@ -10,6 +10,7 @@
#include <linux/version.h>
#include <linux/utsname.h>
#include <linux/sched.h>
+#include <linux/device.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
# define minor(x) MINOR(x)
@@ -254,6 +255,10 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr)
#endif
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+# define class_device_create(a, b, c, d, e, f, g, h) class_device_create(a, c, d, e, f, g, h)
+#endif
+
#endif
/*
* Local variables:
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 5e8173cbe..56a24bc28 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -29,19 +29,20 @@ patch -p2 <<'DIFF'
diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
--- v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400
+++ v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400
-@@ -36,5 +36,8 @@ endif
+@@ -37,5 +37,9 @@ endif
ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
CONFIG_VIDEO_CX88_DVB := m
CONFIG_VIDEO_SAA7134_DVB := m
+ CONFIG_DVB_BT8XX := m
-+ CONFIG_DVB_BT8XX_DST := n
++ CONFIG_DVB_BT8XX_DST := m
+ CONFIG_DVB_FRONTENDS := m
++ CONFIG_DVB_CORE := m
endif
diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
--- v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400
+++ v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400
-@@ -81,6 +81,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -85,6 +85,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
endif
# for DVB
@@ -49,7 +50,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -189,7 +187,7 @@ export LC_ALL
+@@ -197,7 +195,7 @@ export LC_ALL
default:: links .version
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
@@ -58,17 +59,17 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
@echo creating symbolic links...
@find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
-@@ -201,7 +202,7 @@ links::
- @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
- @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+@@ -211,7 +212,7 @@ links::
+ @find ../linux/drivers/media/dvb/dvb-core -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+ @find ../linux/include/linux/dvb -name '*.h' -type l -exec ln -sf '{}' . \;
-install:: rminstall
+install:: rminstall dvb-install
@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
@strip --strip-debug $(inst-m)
-@@ -267,7 +268,7 @@ dvb-rminstall::
- $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+@@ -283,7 +284,7 @@ dvb-rminstall::
+ $(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
@echo
-rminstall::
@@ -76,7 +77,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
-@rm -r $(DEST) \
-@@ -290,7 +291,7 @@ rminstall::
+@@ -304,7 +305,7 @@ rminstall::
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index e294c65d7..96f8b395e 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -10,19 +10,20 @@ patch -p2 <<'DIFF'
diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config
--- v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400
+++ v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400
-@@ -36,8 +36,5 @@ endif
+@@ -37,9 +37,5 @@ endif
ifeq ($(CONFIG_VIDEO_BUF_DVB),m)
CONFIG_VIDEO_CX88_DVB := m
CONFIG_VIDEO_SAA7134_DVB := m
- CONFIG_DVB_BT8XX := m
-- CONFIG_DVB_BT8XX_DST := n
+- CONFIG_DVB_BT8XX_DST := m
- CONFIG_DVB_FRONTENDS := m
+- CONFIG_DVB_CORE := m
endif
diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
--- v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400
+++ v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400
-@@ -81,7 +81,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -85,7 +85,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
endif
# for DVB
@@ -30,7 +31,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -190,7 +189,7 @@ export LC_ALL
+@@ -198,7 +197,7 @@ export LC_ALL
default:: links .version
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
@@ -39,17 +40,17 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
@echo creating symbolic links...
@find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
-@@ -202,7 +201,7 @@ links::
- @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
- @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+@@ -212,7 +211,7 @@ links::
+ @find ../linux/drivers/media/dvb/dvb-core -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+ @find ../linux/include/linux/dvb -name '*.h' -type l -exec ln -sf '{}' . \;
-install:: rminstall dvb-install
+install:: rminstall
@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
@strip --strip-debug $(inst-m)
-@@ -268,7 +267,7 @@ dvb-rminstall::
- $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+@@ -284,7 +283,7 @@ dvb-rminstall::
+ $(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) 2>/dev/null
@echo
-rminstall:: dvb-rminstall
@@ -57,7 +58,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
-@rm -r $(DEST) \
-@@ -291,7 +292,7 @@ rminstall:: dvb-rminstall
+@@ -305,7 +306,7 @@ rminstall:: dvb-rminstall
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 11:31:28 +0000