UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules
  V4L/DVB (4608b): i2c deps fix on DVB
  V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
  V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.
  V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
  V4L/DVB (4494a): Fix compilation when V4L1 support is not present
This commit is contained in:
Linus Torvalds 2006-09-12 17:33:42 -07:00
parent 3ee4b889a0 e7ea8fc285
commit 7366935a49
20 changed files with 79 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/Kconfig
View File

@ -53,7 +53,7 @@ config VIDEO_V4L1_COMPAT
If you are unsure as to whether this is required, answer Y. If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L2 config VIDEO_V4L2
tristate bool
default y default y
source "drivers/media/video/Kconfig" source "drivers/media/video/Kconfig"

2
drivers/media/common/saa7146_video.c
View File

@ -1190,6 +1190,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
} }
return err; return err;
} }
#ifdef CONFIG_VIDEO_V4L1_COMPAT
case VIDIOCGMBUF: case VIDIOCGMBUF:
{ {
struct video_mbuf *mbuf = arg; struct video_mbuf *mbuf = arg;
@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
mutex_unlock(&q->lock); mutex_unlock(&q->lock);
return 0; return 0;
} }
#endif
default: default:
return v4l_compat_translate_ioctl(inode,file,cmd,arg, return v4l_compat_translate_ioctl(inode,file,cmd,arg,
saa7146_video_do_ioctl); saa7146_video_do_ioctl);

1
drivers/media/dvb/b2c2/Kconfig
View File

@ -1,6 +1,7 @@
config DVB_B2C2_FLEXCOP config DVB_B2C2_FLEXCOP
tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
depends on DVB_CORE && I2C depends on DVB_CORE && I2C
select DVB_PLL
select DVB_STV0299 select DVB_STV0299
select DVB_MT352 select DVB_MT352
select DVB_MT312 select DVB_MT312

1
drivers/media/dvb/bt8xx/Kconfig
View File

@ -1,6 +1,7 @@
config DVB_BT8XX config DVB_BT8XX
tristate "BT8xx based PCI cards" tristate "BT8xx based PCI cards"
depends on DVB_CORE && PCI && I2C && VIDEO_BT848 depends on DVB_CORE && PCI && I2C && VIDEO_BT848
select DVB_PLL
select DVB_MT352 select DVB_MT352
select DVB_SP887X select DVB_SP887X
select DVB_NXT6000 select DVB_NXT6000

1
drivers/media/dvb/dvb-usb/Kconfig
View File

@ -2,6 +2,7 @@ config DVB_USB
tristate "Support for various USB DVB devices" tristate "Support for various USB DVB devices"
depends on DVB_CORE && USB && I2C depends on DVB_CORE && USB && I2C
select FW_LOADER select FW_LOADER
select DVB_PLL
help help
By enabling this you will be able to choose the various supported By enabling this you will be able to choose the various supported
USB1.1 and USB2.0 DVB devices. USB1.1 and USB2.0 DVB devices.

60
drivers/media/dvb/frontends/Kconfig
View File

@ -6,43 +6,43 @@ comment "DVB-S (satellite) frontends"
config DVB_STV0299 config DVB_STV0299
tristate "ST STV0299 based" tristate "ST STV0299 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_CX24110 config DVB_CX24110
tristate "Conexant CX24110 based" tristate "Conexant CX24110 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_CX24123 config DVB_CX24123
tristate "Conexant CX24123 based" tristate "Conexant CX24123 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_TDA8083 config DVB_TDA8083
tristate "Philips TDA8083 based" tristate "Philips TDA8083 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_MT312 config DVB_MT312
tristate "Zarlink VP310/MT312 based" tristate "Zarlink VP310/MT312 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_VES1X93 config DVB_VES1X93
tristate "VLSI VES1893 or VES1993 based" tristate "VLSI VES1893 or VES1993 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
config DVB_S5H1420 config DVB_S5H1420
tristate "Samsung S5H1420 based" tristate "Samsung S5H1420 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-S tuner module. Say Y when you want to support this frontend. A DVB-S tuner module. Say Y when you want to support this frontend.
@ -51,7 +51,7 @@ comment "DVB-T (terrestrial) frontends"
config DVB_SP8870 config DVB_SP8870
tristate "Spase sp8870 based" tristate "Spase sp8870 based"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
@ -63,7 +63,7 @@ config DVB_SP8870
config DVB_SP887X config DVB_SP887X
tristate "Spase sp887x based" tristate "Spase sp887x based"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
@ -75,25 +75,25 @@ config DVB_SP887X
config DVB_CX22700 config DVB_CX22700
tristate "Conexant CX22700 based" tristate "Conexant CX22700 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
config DVB_CX22702 config DVB_CX22702
tristate "Conexant cx22702 demodulator (OFDM)" tristate "Conexant cx22702 demodulator (OFDM)"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
config DVB_L64781 config DVB_L64781
tristate "LSI L64781" tristate "LSI L64781"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
config DVB_TDA1004X config DVB_TDA1004X
tristate "Philips TDA10045H/TDA10046H based" tristate "Philips TDA10045H/TDA10046H based"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
@ -106,32 +106,32 @@ config DVB_TDA1004X
config DVB_NXT6000 config DVB_NXT6000
tristate "NxtWave Communications NXT6000 based" tristate "NxtWave Communications NXT6000 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
config DVB_MT352 config DVB_MT352
tristate "Zarlink MT352 based" tristate "Zarlink MT352 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
config DVB_ZL10353 config DVB_ZL10353
tristate "Zarlink ZL10353 based" tristate "Zarlink ZL10353 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Say Y when you want to support this frontend. A DVB-T tuner module. Say Y when you want to support this frontend.
config DVB_DIB3000MB config DVB_DIB3000MB
tristate "DiBcom 3000M-B" tristate "DiBcom 3000M-B"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Designed for mobile usage. Say Y when you want A DVB-T tuner module. Designed for mobile usage. Say Y when you want
to support this frontend. to support this frontend.
config DVB_DIB3000MC config DVB_DIB3000MC
tristate "DiBcom 3000P/M-C" tristate "DiBcom 3000P/M-C"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-T tuner module. Designed for mobile usage. Say Y when you want A DVB-T tuner module. Designed for mobile usage. Say Y when you want
to support this frontend. to support this frontend.
@ -141,19 +141,19 @@ comment "DVB-C (cable) frontends"
config DVB_VES1820 config DVB_VES1820
tristate "VLSI VES1820 based" tristate "VLSI VES1820 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-C tuner module. Say Y when you want to support this frontend. A DVB-C tuner module. Say Y when you want to support this frontend.
config DVB_TDA10021 config DVB_TDA10021
tristate "Philips TDA10021 based" tristate "Philips TDA10021 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-C tuner module. Say Y when you want to support this frontend. A DVB-C tuner module. Say Y when you want to support this frontend.
config DVB_STV0297 config DVB_STV0297
tristate "ST STV0297 based" tristate "ST STV0297 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
A DVB-C tuner module. Say Y when you want to support this frontend. A DVB-C tuner module. Say Y when you want to support this frontend.
@ -162,7 +162,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
config DVB_NXT200X config DVB_NXT200X
tristate "NxtWave Communications NXT2002/NXT2004 based" tristate "NxtWave Communications NXT2002/NXT2004 based"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@ -176,7 +176,7 @@ config DVB_NXT200X
config DVB_OR51211 config DVB_OR51211
tristate "Oren OR51211 based" tristate "Oren OR51211 based"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
An ATSC 8VSB tuner module. Say Y when you want to support this frontend. An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
@ -188,7 +188,7 @@ config DVB_OR51211
config DVB_OR51132 config DVB_OR51132
tristate "Oren OR51132 based" tristate "Oren OR51132 based"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@ -203,7 +203,7 @@ config DVB_OR51132
config DVB_BCM3510 config DVB_BCM3510
tristate "Broadcom BCM3510" tristate "Broadcom BCM3510"
depends on DVB_CORE depends on DVB_CORE && I2C
select FW_LOADER select FW_LOADER
help help
An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
@ -211,7 +211,7 @@ config DVB_BCM3510
config DVB_LGDT330X config DVB_LGDT330X
tristate "LG Electronics LGDT3302/LGDT3303 based" tristate "LG Electronics LGDT3302/LGDT3303 based"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
to support this frontend. to support this frontend.
@ -220,15 +220,19 @@ config DVB_LGDT330X
comment "Miscellaneous devices" comment "Miscellaneous devices"
depends on DVB_CORE depends on DVB_CORE
config DVB_PLL
tristate
depends on DVB_CORE && I2C
config DVB_LNBP21 config DVB_LNBP21
tristate "LNBP21 SEC controller" tristate "LNBP21 SEC controller"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
An SEC control chip. An SEC control chip.
config DVB_ISL6421 config DVB_ISL6421
tristate "ISL6421 SEC controller" tristate "ISL6421 SEC controller"
depends on DVB_CORE depends on DVB_CORE && I2C
help help
An SEC control chip. An SEC control chip.

2
drivers/media/dvb/frontends/Makefile
View File

@ -4,7 +4,7 @@
EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
obj-$(CONFIG_DVB_CORE) += dvb-pll.o obj-$(CONFIG_DVB_PLL) += dvb-pll.o
obj-$(CONFIG_DVB_STV0299) += stv0299.o obj-$(CONFIG_DVB_STV0299) += stv0299.o
obj-$(CONFIG_DVB_SP8870) += sp8870.o obj-$(CONFIG_DVB_SP8870) += sp8870.o
obj-$(CONFIG_DVB_CX22700) += cx22700.o obj-$(CONFIG_DVB_CX22700) += cx22700.o

1
drivers/media/dvb/pluto2/Kconfig
View File

@ -2,6 +2,7 @@ config DVB_PLUTO2
tristate "Pluto2 cards" tristate "Pluto2 cards"
depends on DVB_CORE && PCI && I2C depends on DVB_CORE && PCI && I2C
select I2C_ALGOBIT select I2C_ALGOBIT
select DVB_PLL
select DVB_TDA1004X select DVB_TDA1004X
help help
Support for PCI cards based on the Pluto2 FPGA like the Satelco Support for PCI cards based on the Pluto2 FPGA like the Satelco

5
drivers/media/dvb/ttpci/Kconfig
View File

@ -3,6 +3,7 @@ config DVB_AV7110
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select FW_LOADER select FW_LOADER
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select DVB_PLL
select DVB_VES1820 select DVB_VES1820
select DVB_VES1X93 select DVB_VES1X93
select DVB_STV0299 select DVB_STV0299
@ -61,6 +62,7 @@ config DVB_BUDGET
tristate "Budget cards" tristate "Budget cards"
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select VIDEO_SAA7146 select VIDEO_SAA7146
select DVB_PLL
select DVB_STV0299 select DVB_STV0299
select DVB_VES1X93 select DVB_VES1X93
select DVB_VES1820 select DVB_VES1820
@ -83,6 +85,7 @@ config DVB_BUDGET_CI
tristate "Budget cards with onboard CI connector" tristate "Budget cards with onboard CI connector"
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select VIDEO_SAA7146 select VIDEO_SAA7146
select DVB_PLL
select DVB_STV0297 select DVB_STV0297
select DVB_STV0299 select DVB_STV0299
select DVB_TDA1004X select DVB_TDA1004X
@ -104,6 +107,7 @@ config DVB_BUDGET_AV
tristate "Budget cards with analog video inputs" tristate "Budget cards with analog video inputs"
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select DVB_PLL
select DVB_STV0299 select DVB_STV0299
select DVB_TDA1004X select DVB_TDA1004X
select DVB_TDA10021 select DVB_TDA10021
@ -122,6 +126,7 @@ config DVB_BUDGET_PATCH
tristate "AV7110 cards with Budget Patch" tristate "AV7110 cards with Budget Patch"
depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1 depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
select DVB_AV7110 select DVB_AV7110
select DVB_PLL
select DVB_STV0299 select DVB_STV0299
select DVB_VES1X93 select DVB_VES1X93
select DVB_TDA8083 select DVB_TDA8083

3
drivers/media/dvb/ttusb-budget/Kconfig
View File

@ -1,6 +1,7 @@
config DVB_TTUSB_BUDGET config DVB_TTUSB_BUDGET
tristate "Technotrend/Hauppauge Nova-USB devices" tristate "Technotrend/Hauppauge Nova-USB devices"
depends on DVB_CORE && USB depends on DVB_CORE && USB && I2C
select DVB_PLL
select DVB_CX22700 select DVB_CX22700
select DVB_TDA1004X select DVB_TDA1004X
select DVB_VES1820 select DVB_VES1820

8
drivers/media/video/Kconfig
View File

@ -260,7 +260,7 @@ source "drivers/media/video/saa7134/Kconfig"
config VIDEO_MXB config VIDEO_MXB
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
depends on PCI && VIDEO_V4L1 depends on PCI && VIDEO_V4L1 && I2C
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select VIDEO_TUNER select VIDEO_TUNER
---help--- ---help---
@ -272,7 +272,7 @@ config VIDEO_MXB
config VIDEO_DPC config VIDEO_DPC
tristate "Philips-Semiconductors 'dpc7146 demonstration board'" tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
depends on PCI && VIDEO_V4L1 depends on PCI && VIDEO_V4L1 && I2C
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select VIDEO_V4L2 select VIDEO_V4L2
---help--- ---help---
@ -287,7 +287,7 @@ config VIDEO_DPC
config VIDEO_HEXIUM_ORION config VIDEO_HEXIUM_ORION
tristate "Hexium HV-PCI6 and Orion frame grabber" tristate "Hexium HV-PCI6 and Orion frame grabber"
depends on PCI && VIDEO_V4L1 depends on PCI && VIDEO_V4L1 && I2C
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select VIDEO_V4L2 select VIDEO_V4L2
---help--- ---help---
@ -299,7 +299,7 @@ config VIDEO_HEXIUM_ORION
config VIDEO_HEXIUM_GEMINI config VIDEO_HEXIUM_GEMINI
tristate "Hexium Gemini frame grabber" tristate "Hexium Gemini frame grabber"
depends on PCI && VIDEO_V4L1 depends on PCI && VIDEO_V4L1 && I2C
select VIDEO_SAA7146_VV select VIDEO_SAA7146_VV
select VIDEO_V4L2 select VIDEO_V4L2
---help--- ---help---

1
drivers/media/video/bt8xx/bttv-input.c
View File

@ -303,6 +303,7 @@ int bttv_input_init(struct bttv *btv)
ir->mask_keyup = 0x010000; ir->mask_keyup = 0x010000;
ir->polling = 50; // ms ir->polling = 50; // ms
break; break;
case BTTV_BOARD_PV_M4900:
case BTTV_BOARD_PV_BT878P_9B: case BTTV_BOARD_PV_BT878P_9B:
case BTTV_BOARD_PV_BT878P_PLUS: case BTTV_BOARD_PV_BT878P_PLUS:
ir_codes = ir_codes_pixelview; ir_codes = ir_codes_pixelview;

1
drivers/media/video/cx88/Kconfig
View File

@ -51,6 +51,7 @@ config VIDEO_CX88_DVB
tristate "DVB/ATSC Support for cx2388x based TV cards" tristate "DVB/ATSC Support for cx2388x based TV cards"
depends on VIDEO_CX88 && DVB_CORE depends on VIDEO_CX88 && DVB_CORE
select VIDEO_BUF_DVB select VIDEO_BUF_DVB
select DVB_PLL
---help--- ---help---
This adds support for DVB/ATSC cards based on the This adds support for DVB/ATSC cards based on the
Conexant 2388x chip. Conexant 2388x chip.

1
drivers/media/video/saa7134/Kconfig
View File

@ -40,6 +40,7 @@ config VIDEO_SAA7134_DVB
depends on VIDEO_SAA7134 && DVB_CORE depends on VIDEO_SAA7134 && DVB_CORE
select VIDEO_BUF_DVB select VIDEO_BUF_DVB
select FW_LOADER select FW_LOADER
select DVB_PLL
---help--- ---help---
This adds support for DVB cards based on the This adds support for DVB cards based on the
Philips saa7134 chip. Philips saa7134 chip.

10
drivers/media/video/tuner-types.c
View File

@ -926,11 +926,17 @@ static struct tuner_params tuner_lg_tdvs_h06xf_params[] = {
/* ------------ TUNER_YMEC_TVF66T5_B_DFF - Philips PAL ------------ */ /* ------------ TUNER_YMEC_TVF66T5_B_DFF - Philips PAL ------------ */
static struct tuner_range tuner_ymec_tvf66t5_b_dff_pal_ranges[] = {
{ 16 * 160.25 /*MHz*/, 0x8e, 0x01, },
{ 16 * 464.25 /*MHz*/, 0x8e, 0x02, },
{ 16 * 999.99 , 0x8e, 0x08, },
};
static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = { static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = {
{ {
.type = TUNER_PARAM_TYPE_PAL, .type = TUNER_PARAM_TYPE_PAL,
.ranges = tuner_tena_9533_di_pal_ranges, .ranges = tuner_ymec_tvf66t5_b_dff_pal_ranges,
.count = ARRAY_SIZE(tuner_tena_9533_di_pal_ranges), .count = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_pal_ranges),
}, },
}; };

2
drivers/media/video/zoran.h
View File

@ -267,7 +267,7 @@ struct zoran_v4l_settings {
}; };
/* whoops, this one is undeclared if !v4l2 */ /* whoops, this one is undeclared if !v4l2 */
#ifndef HAVE_V4L2 #ifndef CONFIG_VIDEO_V4L2
struct v4l2_jpegcompression { struct v4l2_jpegcompression {
int quality; int quality;
int APPn; int APPn;

22
drivers/media/video/zoran_driver.c
View File

@ -86,7 +86,7 @@
#include "zoran_device.h" #include "zoran_device.h"
#include "zoran_card.h" #include "zoran_card.h"
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
/* we declare some card type definitions here, they mean /* we declare some card type definitions here, they mean
* the same as the v4l1 ZORAN_VID_TYPE above, except it's v4l2 */ * the same as the v4l1 ZORAN_VID_TYPE above, except it's v4l2 */
#define ZORAN_V4L2_VID_FLAGS ( \ #define ZORAN_V4L2_VID_FLAGS ( \
@ -103,7 +103,7 @@ const struct zoran_format zoran_formats[] = {
{ {
.name = "15-bit RGB", .name = "15-bit RGB",
.palette = VIDEO_PALETTE_RGB555, .palette = VIDEO_PALETTE_RGB555,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
.fourcc = V4L2_PIX_FMT_RGB555, .fourcc = V4L2_PIX_FMT_RGB555,
#else #else
@ -117,7 +117,7 @@ const struct zoran_format zoran_formats[] = {
}, { }, {
.name = "16-bit RGB", .name = "16-bit RGB",
.palette = VIDEO_PALETTE_RGB565, .palette = VIDEO_PALETTE_RGB565,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
.fourcc = V4L2_PIX_FMT_RGB565, .fourcc = V4L2_PIX_FMT_RGB565,
#else #else
@ -131,7 +131,7 @@ const struct zoran_format zoran_formats[] = {
}, { }, {
.name = "24-bit RGB", .name = "24-bit RGB",
.palette = VIDEO_PALETTE_RGB24, .palette = VIDEO_PALETTE_RGB24,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
.fourcc = V4L2_PIX_FMT_BGR24, .fourcc = V4L2_PIX_FMT_BGR24,
#else #else
@ -145,7 +145,7 @@ const struct zoran_format zoran_formats[] = {
}, { }, {
.name = "32-bit RGB", .name = "32-bit RGB",
.palette = VIDEO_PALETTE_RGB32, .palette = VIDEO_PALETTE_RGB32,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
.fourcc = V4L2_PIX_FMT_BGR32, .fourcc = V4L2_PIX_FMT_BGR32,
#else #else
@ -159,7 +159,7 @@ const struct zoran_format zoran_formats[] = {
}, { }, {
.name = "4:2:2, packed, YUYV", .name = "4:2:2, packed, YUYV",
.palette = VIDEO_PALETTE_YUV422, .palette = VIDEO_PALETTE_YUV422,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
.fourcc = V4L2_PIX_FMT_YUYV, .fourcc = V4L2_PIX_FMT_YUYV,
.colorspace = V4L2_COLORSPACE_SMPTE170M, .colorspace = V4L2_COLORSPACE_SMPTE170M,
#endif #endif
@ -169,7 +169,7 @@ const struct zoran_format zoran_formats[] = {
}, { }, {
.name = "Hardware-encoded Motion-JPEG", .name = "Hardware-encoded Motion-JPEG",
.palette = -1, .palette = -1,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
.fourcc = V4L2_PIX_FMT_MJPEG, .fourcc = V4L2_PIX_FMT_MJPEG,
.colorspace = V4L2_COLORSPACE_SMPTE170M, .colorspace = V4L2_COLORSPACE_SMPTE170M,
#endif #endif
@ -210,7 +210,7 @@ static int lock_norm = 0; /* 1=Don't change TV standard (norm) */
module_param(lock_norm, int, 0); module_param(lock_norm, int, 0);
MODULE_PARM_DESC(lock_norm, "Users can't change norm"); MODULE_PARM_DESC(lock_norm, "Users can't change norm");
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
/* small helper function for calculating buffersizes for v4l2 /* small helper function for calculating buffersizes for v4l2
* we calculate the nearest higher power-of-two, which * we calculate the nearest higher power-of-two, which
* will be the recommended buffersize */ * will be the recommended buffersize */
@ -1761,7 +1761,7 @@ setup_overlay (struct file *file,
return wait_grab_pending(zr); return wait_grab_pending(zr);
} }
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
/* get the status of a buffer in the clients buffer queue */ /* get the status of a buffer in the clients buffer queue */
static int static int
zoran_v4l2_buffer_status (struct file *file, zoran_v4l2_buffer_status (struct file *file,
@ -2676,7 +2676,7 @@ zoran_do_ioctl (struct inode *inode,
} }
break; break;
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
/* The new video4linux2 capture interface - much nicer than video4linux1, since /* The new video4linux2 capture interface - much nicer than video4linux1, since
* it allows for integrating the JPEG capturing calls inside standard v4l2 * it allows for integrating the JPEG capturing calls inside standard v4l2
@ -4689,7 +4689,7 @@ static struct file_operations zoran_fops = {
struct video_device zoran_template __devinitdata = { struct video_device zoran_template __devinitdata = {
.name = ZORAN_NAME, .name = ZORAN_NAME,
.type = ZORAN_VID_TYPE, .type = ZORAN_VID_TYPE,
#ifdef HAVE_V4L2 #ifdef CONFIG_VIDEO_V4L2
.type2 = ZORAN_V4L2_VID_FLAGS, .type2 = ZORAN_V4L2_VID_FLAGS,
#endif #endif
.hardware = ZORAN_HARDWARE, .hardware = ZORAN_HARDWARE,

3
include/linux/videodev.h
View File

@ -14,8 +14,7 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#ifdef CONFIG_VIDEO_V4L1_COMPAT #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
#define HAVE_V4L1 1
struct video_capability struct video_capability
{ {

2
include/linux/videodev2.h
View File

@ -22,8 +22,6 @@
#endif #endif
#include <linux/types.h> #include <linux/types.h>
#define HAVE_V4L2 1
/* /*
* Common stuff for both V4L1 and V4L2 * Common stuff for both V4L1 and V4L2
* Moved from videodev.h * Moved from videodev.h

7
include/media/v4l2-dev.h
View File

@ -194,7 +194,7 @@ struct video_device
int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i); int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
#ifdef HAVE_V4L1 #ifdef CONFIG_VIDEO_V4L1_COMPAT
/* buffer type is struct vidio_mbuf * */ /* buffer type is struct vidio_mbuf * */
int (*vidiocgmbuf) (struct file *file, void *fh, struct video_mbuf *p); int (*vidiocgmbuf) (struct file *file, void *fh, struct video_mbuf *p);
#endif #endif
@ -335,7 +335,7 @@ extern int video_usercopy(struct inode *inode, struct file *file,
unsigned int cmd, void *arg)); unsigned int cmd, void *arg));
#ifdef HAVE_V4L1 #ifdef CONFIG_VIDEO_V4L1_COMPAT
#include <linux/mm.h> #include <linux/mm.h>
extern struct video_device* video_devdata(struct file*); extern struct video_device* video_devdata(struct file*);
@ -357,6 +357,8 @@ video_device_remove_file(struct video_device *vfd,
class_device_remove_file(&vfd->class_dev, attr); class_device_remove_file(&vfd->class_dev, attr);
} }
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
#ifdef OBSOLETE_OWNER /* to be removed soon */ #ifdef OBSOLETE_OWNER /* to be removed soon */
/* helper functions to access driver private data. */ /* helper functions to access driver private data. */
static inline void *video_get_drvdata(struct video_device *dev) static inline void *video_get_drvdata(struct video_device *dev)
@ -372,6 +374,5 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_open(struct inode *inode, struct file *file);
extern int video_exclusive_release(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file);
#endif /* HAVE_V4L1 */
#endif /* _V4L2_DEV_H */ #endif /* _V4L2_DEV_H */