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

Commit 9bff2d61 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing 



Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 82acdc84

drivers/media/video/cx18/cx18-driver.h

+0 −14
Original line number Diff line number Diff line
@@ -246,16 +246,8 @@ struct cx18_enc_idx_entry { 
#define CX18_WARN_DEV(dev, fmt, args...)     v4l2_warn(dev, fmt , ## args)

#define CX18_INFO_DEV(dev, fmt, args...)     v4l2_info(dev, fmt , ## args)



/* Values for CX18_API_DEC_PLAYBACK_SPEED mpeg_frame_type_mask parameter: */

#define MPEG_FRAME_TYPE_IFRAME 1

#define MPEG_FRAME_TYPE_IFRAME_PFRAME 3

#define MPEG_FRAME_TYPE_ALL 7



#define CX18_MAX_PGM_INDEX (400)



extern int cx18_debug;





struct cx18_options {

	int megabytes[CX18_MAX_STREAMS]; /* Size in megabytes of each stream */

	int cardtype;		/* force card type on load */
@@ -599,12 +591,6 @@ struct cx18 { 


	struct vbi_info vbi;



	u32 pgm_info_offset;

	u32 pgm_info_num;

	u32 pgm_info_write_idx;

	u32 pgm_info_read_idx;

	struct v4l2_enc_idx_entry pgm_info[CX18_MAX_PGM_INDEX];



	u64 mpg_data_received;

	u64 vbi_data_inserted;

drivers/media/video/cx18/cx18-fileops.c

+1 −3
Original line number Diff line number Diff line
@@ -207,9 +207,7 @@ static struct cx18_mdl *cx18_get_mdl(struct cx18_stream *s, int non_block, 
	*err = 0;

	while (1) {

		if (s->type == CX18_ENC_STREAM_TYPE_MPG) {

			/* Process pending program info updates and pending

			   VBI data */



			/* Process pending program updates and VBI data */

			if (time_after(jiffies, cx->dualwatch_jiffies + msecs_to_jiffies(1000))) {

				cx->dualwatch_jiffies = jiffies;

				cx18_dualwatch(cx);