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

Commit 7717cbed authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6332): cx88: Only include the blackbird fields if blackbird is selected 



Add some ifdefs around fields only used for blackbird support, similar to the
way the dvb fields are only included with dvb support.

Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Reviewed-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ea63d0b1

drivers/media/video/cx88/cx88-mpeg.c

+6 −2
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ static int cx8802_start_dma(struct cx8802_dev *dev, 
{

	struct cx88_core *core = dev->core;



	dprintk(1, "cx8802_start_dma w: %d, h: %d, f: %d\n", dev->width, dev->height, buf->vb.field);

	dprintk(1, "cx8802_start_dma w: %d, h: %d, f: %d\n",

		buf->vb.width, buf->vb.height, buf->vb.field);



	/* setup fifo + format */

	cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
@@ -572,6 +573,8 @@ int cx8802_resume_common(struct pci_dev *pci_dev) 
	return 0;

}



#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \

    defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)

struct cx8802_dev * cx8802_get_device(struct inode *inode)

{

	int minor = iminor(inode);
@@ -586,6 +589,8 @@ struct cx8802_dev * cx8802_get_device(struct inode *inode) 


	return NULL;

}

EXPORT_SYMBOL(cx8802_get_device);

#endif



struct cx8802_driver * cx8802_get_driver(struct cx8802_dev *dev, enum cx88_board_type btype)

{
@@ -901,7 +906,6 @@ EXPORT_SYMBOL(cx8802_fini_common); 


EXPORT_SYMBOL(cx8802_register_driver);

EXPORT_SYMBOL(cx8802_unregister_driver);

EXPORT_SYMBOL(cx8802_get_device);

EXPORT_SYMBOL(cx8802_get_driver);

/* ----------------------------------------------------------- */

/*

drivers/media/video/cx88/cx88.h

+6 −4
Original line number Diff line number Diff line
@@ -453,11 +453,17 @@ struct cx8802_dev { 


	/* for blackbird only */

	struct list_head           devlist;

#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \

    defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)

	struct video_device        *mpeg_dev;

	u32                        mailbox;

	int                        width;

	int                        height;



	/* mpeg params */

	struct cx2341x_mpeg_params params;

#endif



#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)

	/* for dvb only */

	struct videobuf_dvb        dvb;
@@ -467,13 +473,9 @@ struct cx8802_dev { 
	/* for switching modulation types */

	unsigned char              ts_gen_cntrl;



	/* mpeg params */

	struct cx2341x_mpeg_params params;



	/* List of attached drivers */

	struct cx8802_driver       drvlist;

	struct work_struct request_module_wk;



};



/* ----------------------------------------------------------- */