diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 22 | ||||
| -rw-r--r-- | v4l/Make.config | 4 | ||||
| -rw-r--r-- | v4l/Makefile | 25 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
4 files changed, 51 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 0de293375..3b458703e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,25 @@ +2005-12-11 18:06 mchehab + + * linux/drivers/media/video/cs53l32a.c: + * linux/drivers/media/video/cx25840/cx25840-audio.c: + * linux/drivers/media/video/cx25840/cx25840-core.c: + * linux/drivers/media/video/cx88/cx88-mpeg.c: + * linux/drivers/media/video/em28xx/em28xx-video.c: + * linux/drivers/media/video/mt20xx.c: + * linux/drivers/media/video/saa711x.c: (saa711x_detect_client): + * linux/drivers/media/video/tda8290.c: + * linux/drivers/media/video/tea5767.c: + * linux/drivers/media/video/wm8775.c: + * v4l/Make.config: + * v4l/Makefile: + * v4l/compat.h: + - Makes V4L compile with kernel 2.4 + - em28xx doesn't compile with 2.4 kernels. Additional work is + necessary to make it compile. + + Thanks-to: Stefan Leichter <Stefan.Leichter@camLine.com> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-11 17:43 mchehab * linux/drivers/media/video/bttv-input.c: (bttv_input_init): diff --git a/v4l/Make.config b/v4l/Make.config index 32dfa69b1..e537d5e6f 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -1,6 +1,7 @@ MDIR := v4l2 snap := video4linux +CONFIG_VIDEO_DEV := m CONFIG_VIDEO_BTTV := m CONFIG_VIDEO_SAA7134 := m CONFIG_VIDEO_IR := m @@ -10,7 +11,6 @@ CONFIG_VIDEO_CX88 := m CONFIG_TVP5150 := m CONFIG_SAA711X := m -CONFIG_EM28XX := m CONFIG_VIDEO_DECODER := m @@ -56,6 +56,8 @@ CONFIG_VIDEO_SAA7146_VV := n ifneq ($(KERNELRELEASE),) CONFIG_VIDEO_BUF_DVB := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo m) + CONFIG_VIDEO_DEV := $(shell test $(SUBLEVEL) -lt 6 && echo n) + CONFIG_EM28XX := $(shell test $(PATCHLEVEL) -ge 6 && echo m) endif ifeq ($(CONFIG_VIDEO_BUF_DVB),m) diff --git a/v4l/Makefile b/v4l/Makefile index 2461af80e..c55d7b7c6 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -9,7 +9,10 @@ include $(obj)/Make.config # symbol exports export-objs := video-buf.o v4l1-compat.o v4l2-common.o -export-objs += ir-common.o videodev.o +export-objs += ir-common.o +ifeq ($(CONFIG_VIDEO_DEV),m) +export-objs += videodev.o +endif export-objs += bttv-if.o btcx-risc.o export-objs += cx88-cards.o cx88-core.o export-objs += saa7134-core.o saa7134-tvaudio.o @@ -203,18 +206,33 @@ SNAPSHOT_CFLAGS := -DSNAPSHOT='$(shell cat $(snapshot))' EXTRA_CFLAGS += $(SNAPSHOT_CFLAGS) endif +# +# Need to compile with kernel 2.4 +# bttv.o: $(bttv-objs) $(LD) -r -o $@ $(bttv-objs) +cx25840.o: $(cx25840-objs) + $(LD) -g -r -o $@ $(cx25840-objs) + cx8800.o: $(cx8800-objs) $(LD) -g -r -o $@ $(cx8800-objs) +cx8802.o: $(cx8802-objs) + $(LD) -g -r -o $@ $(cx8802-objs) + cx88xx.o: $(cx88xx-objs) $(LD) -g -r -o $@ $(cx88xx-objs) +em28xx.o: $(em28xx-objs) + $(LD) -g -r -o $@ $(em28xx-objs) + saa7134.o: $(saa7134-objs) $(LD) -g -r -o $@ $(saa7134-objs) +tuner.o: $(tuner-objs) + $(LD) -g -r -o $@ $(tuner-objs) + -include $(TOPDIR)/Rules.make else # take version info from last module build if available @@ -243,7 +261,10 @@ endif inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko -inst_video += video-buf.ko video-buf-dvb.ko videodev.ko +inst_video += video-buf.ko video-buf-dvb.ko +ifeq ($(CONFIG_VIDEO_DEV),m) +inst_video += videodev.ko +endif inst_video += ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko diff --git a/v4l/compat.h b/v4l/compat.h index 67fc48824..a35acc464 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.42 2005/12/10 01:43:26 mchehab Exp $ + * $Id: compat.h,v 1.43 2005/12/11 18:11:56 mchehab Exp $ */ #ifndef _COMPAT_H @@ -148,6 +148,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) /* some keys from 2.6.x which are not (yet?) in 2.4.x */ # define KEY_PLAY 207 # define KEY_PRINT 210 +# define KEY_EMAIL 215 # define KEY_SEARCH 217 # define KEY_SELECT 0x161 # define KEY_GOTO 0x162 @@ -183,6 +184,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) # define KEY_CLEAR 0x163 # define KEY_AUX 0x186 # define KEY_SCREEN 0x177 +# define KEY_PC 0x178 # define KEY_MEDIA 226 # define KEY_SLOW 0x199 # define KEY_OK 0x160 |