diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 4 | ||||
| -rw-r--r-- | v4l/Makefile | 19 | ||||
| -rw-r--r-- | v4l/compat.h | 1 | ||||
| -rwxr-xr-x | v4l/scripts/makelinks.sh | 11 |
4 files changed, 21 insertions, 14 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 476e9019f..d51f77db6 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -93,9 +93,13 @@ ifeq ($(CONFIG_DVB_CORE),m) CONFIG_DVB_BUDGET_PATCH := m CONFIG_DVB_AV7110 := m CONFIG_DVB_AV7110_OSD := y +# Uncomment the next two lines to compile the av7110 firmware into the driver. +# CONFIG_DVB_AV7110_FIRMWARE := y +# CONFIG_DVB_AV7110_FIRMWARE_FILE := /path/to/firmware/dvb-ttpci-01.fw CONFIG_DVB_TTUSB_BUDGET := m CONFIG_DVB_TTUSB_DEC := m CONFIG_VIDEO_SAA7146 := m CONFIG_VIDEO_SAA7146_VV := m + CONFIG_DVB_FIRESAT := n endif diff --git a/v4l/Makefile b/v4l/Makefile index 003140d78..889e1581c 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -30,7 +30,7 @@ cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ cx88-input.o cx8800-objs := cx88-video.o cx88-vbi.o cx8802-objs := cx88-mpeg.o -tuner-objs := tuner-core.o tuner-types.o tuner-simple.o mt20xx.o tda8290.o tea5767.o +tuner-objs := tuner-core.o tuner-types.o tuner-simple.o mt20xx.o tda8290.o tea5767.o xc3028.o msp3400-objs := msp3400-driver.o msp3400-kthreads.o list-multi := bttv.o saa7134.o cx88xx.o cx8800.o cx88-alsa.o cx8802.o em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ @@ -70,6 +70,7 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ pvrusb2-ioread.o pvrusb2-debugifc.o +dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o @@ -96,7 +97,7 @@ endif obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134-oss.o obj-$(CONFIG_VIDEO_IR) += ir-common.o -obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o +obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ cs53l32a.o tda7432.o tda9875.o @@ -140,6 +141,7 @@ obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o +obj-$(CONFIG_DVB_FIRESAT) += dvb-firesat.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -160,6 +162,9 @@ endif EXTRA_CFLAGS += -DDVB_CVS=1 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ +ifeq ($(CONFIG_DVB_FIRESAT),m) + EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/ +endif ifeq ($(CONFIG_VIDEO_CX88_DVB),m) EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1 EXTRA_CFLAGS += -DHAVE_CX22702=1 @@ -191,6 +196,8 @@ $(obj)/fdump: $(obj)/av7110_firm.h: $(obj)/fdump $(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@ + +EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif @@ -308,6 +315,7 @@ inst_ttpci += budget-ci.ko budget-patch.ko dvb-ttpci.ko inst_ttusb-budget := dvb-ttusb-budget.ko inst_ttusb-dec := ttusb_dec.ko ttusbdecfe.ko inst_pvrusb2 := pvrusb2.ko +inst_firesat := dvb-firesat.ko v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) @@ -404,6 +412,9 @@ dvb-install:: dvb-rminstall -install -d $(KDIR26)/dvb/ttusb-dec -install -m 644 -c $(inst_ttusb-dec) $(KDIR26)/dvb/ttusb-dec + -install -d $(KDIR26)/dvb/firesat + -install -m 644 -c $(inst_firesat) $(KDIR26)/dvb/firesat + /sbin/depmod -a ${KERNELRELEASE} old-install:: rminstall @@ -451,6 +462,7 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/ttpci/, $(inst_ttpci)) \ $(addprefix $(KDIR26)/dvb/ttusb-budget/, $(inst_ttusb-budget)) \ $(addprefix $(KDIR26)/dvb/ttusb-dec/, $(inst_ttusb-dec)) \ + $(addprefix $(KDIR26)/dvb/firesat/, $(inst_firesat)) \ $(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \ $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \ $(addprefix $(KDIR26)/dvb/dvb-core/, $(addsuffix .gz,$(inst_dvb-core))) \ @@ -460,7 +472,8 @@ dvb-rminstall:: $(addprefix $(KDIR26)/dvb/pluto2/, $(addsuffix .gz,$(inst_pluto2))) \ $(addprefix $(KDIR26)/dvb/ttpci/, $(addsuffix .gz,$(inst_ttpci))) \ $(addprefix $(KDIR26)/dvb/ttusb-budget/, $(addsuffix .gz,$(inst_ttusb-budget))) \ - $(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null + $(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) \ + $(addprefix $(KDIR26)/dvb/firesat/, $(addsuffix .gz,$(inst_firesat))) 2>/dev/null @echo rmmodules:: diff --git a/v4l/compat.h b/v4l/compat.h index 774afc8da..9efcfebd1 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -276,6 +276,7 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #define mutex_unlock(a) up(a) #define mutex_lock(a) down(a) #define mutex_init(a) init_MUTEX(a) +#define mutex_trylock(a) down_trylock(a) #endif #endif diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 56bc40588..44fa17759 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -58,14 +58,3 @@ diff -u -p videodev.h #include <linux/types.h> #define HAVE_V4L1 1 -diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile ---- v4l/Makefile 2005-10-10 00:57:41.000000000 -0400 -+++ v4l/Makefile 2005-10-10 00:58:26.000000000 -0400 -@@ -407,6 +407,7 @@ clean:: - @find . -name '*.c' -type l -exec rm '{}' \; - @find . -name '*.h' -type l -exec rm '{}' \; - -rm -f *~ *.o *.ko *.mod.c -+ @cd ..; patch -p0 -s -R -N < v4l/scripts/makelinks.sh - - distclean:: clean - -rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd |