From 44a9923154c16ba57fe3f69e7643f7ef200b2a0b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 21 Dec 2010 13:00:02 +0100 Subject: Update to the latest media kernel API The media kernel API has seen many changes during the review process, update the media-ctl application accordingly. Signed-off-by: Laurent Pinchart --- src/media.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/media.c') diff --git a/src/media.c b/src/media.c index e0a96d7..512330a 100644 --- a/src/media.c +++ b/src/media.c @@ -44,7 +44,7 @@ struct media_pad *media_entity_remote_source(struct media_pad *pad) for (i = 0; i < pad->entity->num_links; ++i) { struct media_link *link = &pad->entity->links[i]; - if (!(link->flags & MEDIA_LINK_FLAG_ACTIVE)) + if (!(link->flags & MEDIA_LINK_FLAG_ENABLED)) continue; if (link->sink == pad) @@ -149,7 +149,7 @@ int media_reset_links(struct media_device *media) continue; ret = media_setup_link(media, link->source, link->sink, - link->flags & ~MEDIA_LINK_FLAG_ACTIVE); + link->flags & ~MEDIA_LINK_FLAG_ENABLED); if (ret < 0) return ret; } @@ -287,8 +287,8 @@ static int media_enum_entities(struct media_device *media) media->entities_count++; /* Find the corresponding device name. */ - if (media_entity_type(entity) != MEDIA_ENTITY_TYPE_NODE && - media_entity_type(entity) != MEDIA_ENTITY_TYPE_SUBDEV) + if (media_entity_type(entity) != MEDIA_ENTITY_TYPE_DEVNODE && + media_entity_type(entity) != MEDIA_ENTITY_TYPE_V4L2_SUBDEV) continue; sprintf(sysname, "/sys/dev/char/%u:%u", entity->info.v4l.major, -- cgit v1.2.3