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

Commit fde04ab9 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] demux.h: Remove duplicated enum 



"enum dmx_ts_pes" and "typedef enum dmx_pes_type_t" are just the
same enum declared twice, since Kernel (2.6.12). There's no reason
to duplicate it there, and sparse complains about that:
	drivers/media/dvb-core/dmxdev.c:600:55: warning: mixing different enum types
So, remove the internal define, keeping just the external one.
Internally, use only "enum dmx_ts_pes", as it is too late to drop
dmx_pes_type_t from the userspace API.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9ea89e2b

drivers/media/dvb-core/demux.h

+0 −39
Original line number Diff line number Diff line
@@ -83,45 +83,6 @@ enum dmx_success { 
#define TS_DEMUX        8   /* in case TS_PACKET is set, send the TS to

			       the demux device, not to the dvr device */



/* PES type for filters which write to built-in decoder */

/* these should be kept identical to the types in dmx.h */



enum dmx_ts_pes

{  /* also send packets to decoder (if it exists) */

	DMX_TS_PES_AUDIO0,

	DMX_TS_PES_VIDEO0,

	DMX_TS_PES_TELETEXT0,

	DMX_TS_PES_SUBTITLE0,

	DMX_TS_PES_PCR0,



	DMX_TS_PES_AUDIO1,

	DMX_TS_PES_VIDEO1,

	DMX_TS_PES_TELETEXT1,

	DMX_TS_PES_SUBTITLE1,

	DMX_TS_PES_PCR1,



	DMX_TS_PES_AUDIO2,

	DMX_TS_PES_VIDEO2,

	DMX_TS_PES_TELETEXT2,

	DMX_TS_PES_SUBTITLE2,

	DMX_TS_PES_PCR2,



	DMX_TS_PES_AUDIO3,

	DMX_TS_PES_VIDEO3,

	DMX_TS_PES_TELETEXT3,

	DMX_TS_PES_SUBTITLE3,

	DMX_TS_PES_PCR3,



	DMX_TS_PES_OTHER

};



#define DMX_TS_PES_AUDIO    DMX_TS_PES_AUDIO0

#define DMX_TS_PES_VIDEO    DMX_TS_PES_VIDEO0

#define DMX_TS_PES_TELETEXT DMX_TS_PES_TELETEXT0

#define DMX_TS_PES_SUBTITLE DMX_TS_PES_SUBTITLE0

#define DMX_TS_PES_PCR      DMX_TS_PES_PCR0





struct dmx_ts_feed {

	int is_filtering; /* Set to non-zero when filtering in progress */

	struct dmx_demux *parent; /* Back-pointer */

drivers/media/dvb-core/dmxdev.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev, 
	dmx_output_t otype;

	int ret;

	int ts_type;

	dmx_pes_type_t ts_pes;

	enum dmx_ts_pes ts_pes;

	struct dmx_ts_feed *tsfeed;



	feed->ts = NULL;

drivers/media/dvb-core/dvb_demux.c

+3 −3
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static int dmx_ts_feed_set(struct dmx_ts_feed *ts_feed, u16 pid, int ts_type, 
		return -ERESTARTSYS;



	if (ts_type & TS_DECODER) {

		if (pes_type >= DMX_TS_PES_OTHER) {

		if (pes_type >= DMX_PES_OTHER) {

			mutex_unlock(&demux->mutex);

			return -EINVAL;

		}
@@ -846,7 +846,7 @@ static int dvbdmx_release_ts_feed(struct dmx_demux *dmx, 


	feed->pid = 0xffff;



	if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_TS_PES_OTHER)

	if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_PES_OTHER)

		demux->pesfilter[feed->pes_type] = NULL;



	mutex_unlock(&demux->mutex);
@@ -1268,7 +1268,7 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux) 


	INIT_LIST_HEAD(&dvbdemux->frontend_list);



	for (i = 0; i < DMX_TS_PES_OTHER; i++) {

	for (i = 0; i < DMX_PES_OTHER; i++) {

		dvbdemux->pesfilter[i] = NULL;

		dvbdemux->pids[i] = 0xffff;

	}

drivers/media/dvb-core/dvb_demux.h

+2 −2
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ struct dvb_demux { 


	struct list_head frontend_list;



	struct dvb_demux_feed *pesfilter[DMX_TS_PES_OTHER];

	u16 pids[DMX_TS_PES_OTHER];

	struct dvb_demux_feed *pesfilter[DMX_PES_OTHER];

	u16 pids[DMX_PES_OTHER];

	int playing;

	int recording;

drivers/media/dvb-core/dvb_net.c

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ static int dvb_net_feed_start(struct net_device *dev) 
		ret = priv->tsfeed->set(priv->tsfeed,

					priv->pid, /* pid */

					TS_PACKET, /* type */

					DMX_TS_PES_OTHER, /* pes type */

					DMX_PES_OTHER, /* pes type */

					32768,     /* circular buffer size */

					timeout    /* timeout */

					);