aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-core/dvbdev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-10 14:25:41 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 09:19:01 -0500
commit4ca72efaeffd0d244c44307abc9d4cb11f8ad475 (patch)
treeae953c05584fabbae89814a148410021160e0ab5 /drivers/media/dvb-core/dvbdev.c
parentd87cdb884486bfa795be99c83a5b3ac4d428ca84 (diff)
[media] uapi/media.h: Rename entities types to functions
Rename the userspace types from MEDIA_ENT_T_ to MEDIA_ENT_F_ and add the backward compatibility bits. The changes at the .c files was generated by the following coccinelle script: @@ @@ -MEDIA_ENT_T_UNKNOWN +MEDIA_ENT_F_UNKNOWN @@ @@ -MEDIA_ENT_T_DVB_BASE +MEDIA_ENT_F_DVB_BASE @@ @@ -MEDIA_ENT_T_V4L2_BASE +MEDIA_ENT_F_V4L2_BASE @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_BASE +MEDIA_ENT_F_V4L2_SUBDEV_BASE @@ @@ -MEDIA_ENT_T_CONNECTOR_BASE +MEDIA_ENT_F_CONNECTOR_BASE @@ @@ -MEDIA_ENT_T_V4L2_VIDEO +MEDIA_ENT_F_IO_V4L @@ @@ -MEDIA_ENT_T_V4L2_VBI +MEDIA_ENT_F_IO_VBI @@ @@ -MEDIA_ENT_T_V4L2_SWRADIO +MEDIA_ENT_F_IO_SWRADIO @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN +MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN @@ @@ -MEDIA_ENT_T_CONN_RF +MEDIA_ENT_F_CONN_RF @@ @@ -MEDIA_ENT_T_CONN_SVIDEO +MEDIA_ENT_F_CONN_SVIDEO @@ @@ -MEDIA_ENT_T_CONN_COMPOSITE +MEDIA_ENT_F_CONN_COMPOSITE @@ @@ -MEDIA_ENT_T_CONN_TEST +MEDIA_ENT_F_CONN_TEST @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_SENSOR +MEDIA_ENT_F_CAM_SENSOR @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_FLASH +MEDIA_ENT_F_FLASH @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_LENS +MEDIA_ENT_F_LENS @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_DECODER +MEDIA_ENT_F_ATV_DECODER @@ @@ -MEDIA_ENT_T_V4L2_SUBDEV_TUNER +MEDIA_ENT_F_TUNER @@ @@ -MEDIA_ENT_T_DVB_DEMOD +MEDIA_ENT_F_DTV_DEMOD @@ @@ -MEDIA_ENT_T_DVB_DEMUX +MEDIA_ENT_F_TS_DEMUX @@ @@ -MEDIA_ENT_T_DVB_TSOUT +MEDIA_ENT_F_IO_DTV @@ @@ -MEDIA_ENT_T_DVB_CA +MEDIA_ENT_F_DTV_CA @@ @@ -MEDIA_ENT_T_DVB_NET_DECAP +MEDIA_ENT_F_DTV_NET_DECAP Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-core/dvbdev.c')
-rw-r--r--drivers/media/dvb-core/dvbdev.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
index f6fc95d1345b..f64e8b3fb687 100644
--- a/drivers/media/dvb-core/dvbdev.c
+++ b/drivers/media/dvb-core/dvbdev.c
@@ -242,7 +242,7 @@ static int dvb_create_tsout_entity(struct dvb_device *dvbdev,
242 if (!entity->name) 242 if (!entity->name)
243 return -ENOMEM; 243 return -ENOMEM;
244 244
245 entity->function = MEDIA_ENT_T_DVB_TSOUT; 245 entity->function = MEDIA_ENT_F_IO_DTV;
246 pads->flags = MEDIA_PAD_FL_SINK; 246 pads->flags = MEDIA_PAD_FL_SINK;
247 247
248 ret = media_entity_init(entity, 1, pads); 248 ret = media_entity_init(entity, 1, pads);
@@ -315,18 +315,18 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,
315 315
316 switch (type) { 316 switch (type) {
317 case DVB_DEVICE_FRONTEND: 317 case DVB_DEVICE_FRONTEND:
318 dvbdev->entity->function = MEDIA_ENT_T_DVB_DEMOD; 318 dvbdev->entity->function = MEDIA_ENT_F_DTV_DEMOD;
319 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; 319 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
320 dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE; 320 dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;
321 break; 321 break;
322 case DVB_DEVICE_DEMUX: 322 case DVB_DEVICE_DEMUX:
323 dvbdev->entity->function = MEDIA_ENT_T_DVB_DEMUX; 323 dvbdev->entity->function = MEDIA_ENT_F_TS_DEMUX;
324 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; 324 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
325 for (i = 1; i < npads; i++) 325 for (i = 1; i < npads; i++)
326 dvbdev->pads[i].flags = MEDIA_PAD_FL_SOURCE; 326 dvbdev->pads[i].flags = MEDIA_PAD_FL_SOURCE;
327 break; 327 break;
328 case DVB_DEVICE_CA: 328 case DVB_DEVICE_CA:
329 dvbdev->entity->function = MEDIA_ENT_T_DVB_CA; 329 dvbdev->entity->function = MEDIA_ENT_F_DTV_CA;
330 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; 330 dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;
331 dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE; 331 dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;
332 break; 332 break;
@@ -556,16 +556,16 @@ int dvb_create_media_graph(struct dvb_adapter *adap)
556 556
557 media_device_for_each_entity(entity, mdev) { 557 media_device_for_each_entity(entity, mdev) {
558 switch (entity->function) { 558 switch (entity->function) {
559 case MEDIA_ENT_T_V4L2_SUBDEV_TUNER: 559 case MEDIA_ENT_F_TUNER:
560 tuner = entity; 560 tuner = entity;
561 break; 561 break;
562 case MEDIA_ENT_T_DVB_DEMOD: 562 case MEDIA_ENT_F_DTV_DEMOD:
563 demod = entity; 563 demod = entity;
564 break; 564 break;
565 case MEDIA_ENT_T_DVB_DEMUX: 565 case MEDIA_ENT_F_TS_DEMUX:
566 demux = entity; 566 demux = entity;
567 break; 567 break;
568 case MEDIA_ENT_T_DVB_CA: 568 case MEDIA_ENT_F_DTV_CA:
569 ca = entity; 569 ca = entity;
570 break; 570 break;
571 } 571 }
@@ -594,7 +594,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap)
594 /* Create demux links for each ringbuffer/pad */ 594 /* Create demux links for each ringbuffer/pad */
595 if (demux) { 595 if (demux) {
596 media_device_for_each_entity(entity, mdev) { 596 media_device_for_each_entity(entity, mdev) {
597 if (entity->function == MEDIA_ENT_T_DVB_TSOUT) { 597 if (entity->function == MEDIA_ENT_F_IO_DTV) {
598 if (!strncmp(entity->name, DVR_TSOUT, 598 if (!strncmp(entity->name, DVR_TSOUT,
599 strlen(DVR_TSOUT))) { 599 strlen(DVR_TSOUT))) {
600 ret = media_create_pad_link(demux, 600 ret = media_create_pad_link(demux,
@@ -639,7 +639,7 @@ int dvb_create_media_graph(struct dvb_adapter *adap)
639 } 639 }
640 640
641 media_device_for_each_entity(entity, mdev) { 641 media_device_for_each_entity(entity, mdev) {
642 if (entity->function == MEDIA_ENT_T_DVB_TSOUT) { 642 if (entity->function == MEDIA_ENT_F_IO_DTV) {
643 if (!strcmp(entity->name, DVR_TSOUT)) { 643 if (!strcmp(entity->name, DVR_TSOUT)) {
644 link = media_create_intf_link(entity, 644 link = media_create_intf_link(entity,
645 intf, 645 intf,