diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-08-03 11:35:10 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-28 16:30:00 +0400 |
| commit | 8be8ec6ea58bd77338f6ffa2f6d2acfc88b835f4 (patch) | |
| tree | 8bf7dcb4b5bead6f0cd726013b5493867d53b376 /drivers | |
| parent | 0550513c7a559b4933c5e1d47fbd15d15f6078d5 (diff) | |
| download | linux-8be8ec6ea58bd77338f6ffa2f6d2acfc88b835f4.tar.xz | |
[media] uvcvideo: Mark first output terminal as default video node
The MEDIA_ENT_FL_DEFAULT identifies entities that are considered as
default for their group and type. For video nodes, it identifies the
node that application should use by default.
UVC devices don't report which output terminal should be considered as
the default, use the first one. Most devices have a single output
terminal anyway.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_driver.c | 2 | ||||
| -rw-r--r-- | drivers/media/usb/uvc/uvc_entity.c | 2 | ||||
| -rw-r--r-- | drivers/media/usb/uvc/uvcvideo.h | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 22f14d286fbb..5dbefa68b1d2 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1564,6 +1564,8 @@ static int uvc_scan_device(struct uvc_device *dev) chain->dev = dev; v4l2_prio_init(&chain->prio); + term->flags |= UVC_ENTITY_FLAG_DEFAULT; + if (uvc_scan_chain(chain, term) < 0) { kfree(chain); continue; diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c index 29e239911d0e..dc56a59ecadc 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c @@ -93,6 +93,8 @@ static int uvc_mc_init_entity(struct uvc_entity *entity) } else if (entity->vdev != NULL) { ret = media_entity_init(&entity->vdev->entity, entity->num_pads, entity->pads, 0); + if (entity->flags & UVC_ENTITY_FLAG_DEFAULT) + entity->vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT; } else ret = 0; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 006ae274d22e..af505fdd9b3f 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -225,10 +225,14 @@ struct uvc_format_desc { * always be accessed with the UVC_ENTITY_* macros and never directly. */ +#define UVC_ENTITY_FLAG_DEFAULT (1 << 0) + struct uvc_entity { struct list_head list; /* Entity as part of a UVC device. */ struct list_head chain; /* Entity as part of a video device * chain. */ + unsigned int flags; + __u8 id; __u16 type; char name[64]; |