Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a44040 authored by Marco Schluessler's avatar Marco Schluessler Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6497): saa7146/budget*/dvb-ttpci: Remove V4L1 code 



Remove V4L1 code.

Signed-off-by: default avatarMarco Schluessler <marco@lordzodiac.de>
Signed-off-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c5d857d5

drivers/media/dvb/ttpci/Kconfig

+5 −5
Original line number Diff line number Diff line 
config DVB_AV7110

	tristate "AV7110 cards"

	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1

	depends on DVB_CORE && PCI && I2C

	select FW_LOADER if !DVB_AV7110_FIRMWARE

	select VIDEO_SAA7146_VV

	select DVB_VES1820 if !DVB_FE_CUSTOMISE
@@ -59,7 +59,7 @@ config DVB_AV7110_OSD 


config DVB_BUDGET

	tristate "Budget cards"

	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1

	depends on DVB_CORE && PCI && I2C

	select VIDEO_SAA7146

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_VES1X93 if !DVB_FE_CUSTOMISE
@@ -84,7 +84,7 @@ config DVB_BUDGET 


config DVB_BUDGET_CI

	tristate "Budget cards with onboard CI connector"

	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && INPUT

	depends on DVB_CORE && PCI && I2C && INPUT

	select VIDEO_SAA7146

	select DVB_STV0297 if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE
@@ -106,7 +106,7 @@ config DVB_BUDGET_CI 


config DVB_BUDGET_AV

	tristate "Budget cards with analog video inputs"

	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1

	depends on DVB_CORE && PCI && I2C

	select VIDEO_SAA7146_VV

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE
@@ -127,7 +127,7 @@ config DVB_BUDGET_AV 


config DVB_BUDGET_PATCH

	tristate "AV7110 cards with Budget Patch"

	depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1

	depends on DVB_CORE && DVB_BUDGET

	select DVB_AV7110

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_VES1X93 if !DVB_FE_CUSTOMISE

drivers/media/dvb/ttpci/av7110.c

+2 −1
Original line number Diff line number Diff line
@@ -2595,7 +2595,8 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, 
	mutex_init(&av7110->osd_mutex);



	/* TV standard */

	av7110->vidmode = tv_standard == 1 ? VIDEO_MODE_NTSC : VIDEO_MODE_PAL;

	av7110->vidmode = tv_standard == 1 ? AV7110_VIDEO_MODE_NTSC

					   : AV7110_VIDEO_MODE_PAL;



	/* ARM "watchdog" */

	init_waitqueue_head(&av7110->arm_wait);

drivers/media/dvb/ttpci/av7110.h

+6 −1
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ extern int av7110_debug; 


enum {AV_PES_STREAM, PS_STREAM, TS_STREAM, PES_STREAM};



enum av7110_video_mode {

	AV7110_VIDEO_MODE_PAL 	= 0,

	AV7110_VIDEO_MODE_NTSC	= 1

};



struct av7110_p2t {

	u8		  pes[TS_SIZE];

	u8		  counter;
@@ -170,7 +175,7 @@ struct av7110 { 


	ca_slot_info_t		ci_slot[2];



	int			vidmode;

	enum av7110_video_mode	vidmode;

	struct dmxdev		dmxdev;

	struct dvb_demux	demux;

drivers/media/dvb/ttpci/av7110_av.c

+10 −6
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright) 
	return 0;

}



int av7110_set_vidmode(struct av7110 *av7110, int mode)

int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode)

{

	int ret;

	dprintk(2, "av7110:%p, \n", av7110);
@@ -348,11 +348,15 @@ int av7110_set_vidmode(struct av7110 *av7110, int mode) 
}





static int sw2mode[16] = {

	VIDEO_MODE_PAL, VIDEO_MODE_NTSC, VIDEO_MODE_NTSC, VIDEO_MODE_PAL,

	VIDEO_MODE_NTSC, VIDEO_MODE_NTSC, VIDEO_MODE_PAL, VIDEO_MODE_NTSC,

	VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL,

	VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL,

static enum av7110_video_mode sw2mode[16] = {

	AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_NTSC,

	AV7110_VIDEO_MODE_NTSC, AV7110_VIDEO_MODE_PAL,

	AV7110_VIDEO_MODE_NTSC, AV7110_VIDEO_MODE_NTSC,

	AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_NTSC,

	AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_PAL,

	AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_PAL,

	AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_PAL,

	AV7110_VIDEO_MODE_PAL, AV7110_VIDEO_MODE_PAL,

};



static int get_video_format(struct av7110 *av7110, u8 *buf, int count)

drivers/media/dvb/ttpci/av7110_av.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 


struct av7110;



extern int av7110_set_vidmode(struct av7110 *av7110, int mode);

extern int av7110_set_vidmode(struct av7110 *av7110,

			      enum av7110_video_mode mode);



extern int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len);

extern int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen);