diff options
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 44 |
1 files changed, 24 insertions, 20 deletions
@@ -166,7 +166,6 @@ static void media_print_topology_text(struct media_device *media) { MEDIA_LNK_FL_DYNAMIC, "DYNAMIC" }, }; - struct media_entity *entities = media_get_entities(media); unsigned int nents = media_get_entities_count(media); unsigned int i, j, k; unsigned int padding; @@ -174,40 +173,45 @@ static void media_print_topology_text(struct media_device *media) printf("Device topology\n"); for (i = 0; i < nents; ++i) { - struct media_entity *entity = &entities[i]; - - padding = printf("- entity %u: ", entity->info.id); - printf("%s (%u pad%s, %u link%s)\n", entity->info.name, - entity->info.pads, entity->info.pads > 1 ? "s" : "", - entity->num_links, entity->num_links > 1 ? "s" : ""); + struct media_entity *entity = media_get_entity(media, i); + const struct media_entity_desc *info = media_entity_get_info(entity); + const char *devname = media_entity_get_devname(entity); + unsigned int num_links = media_entity_get_links_count(entity); + + padding = printf("- entity %u: ", info->id); + printf("%s (%u pad%s, %u link%s)\n", info->name, + info->pads, info->pads > 1 ? "s" : "", + num_links, num_links > 1 ? "s" : ""); printf("%*ctype %s subtype %s flags %x\n", padding, ' ', - media_entity_type_to_string(entity->info.type), - media_entity_subtype_to_string(entity->info.type), - entity->info.flags); - if (entity->devname[0]) - printf("%*cdevice node name %s\n", padding, ' ', entity->devname); + media_entity_type_to_string(info->type), + media_entity_subtype_to_string(info->type), + info->flags); + if (devname) + printf("%*cdevice node name %s\n", padding, ' ', devname); - for (j = 0; j < entity->info.pads; j++) { - struct media_pad *pad = &entity->pads[j]; + for (j = 0; j < info->pads; j++) { + const struct media_pad *pad = media_entity_get_pad(entity, j); printf("\tpad%u: %s\n", j, media_pad_type_to_string(pad->flags)); if (media_entity_type(entity) == MEDIA_ENT_T_V4L2_SUBDEV) v4l2_subdev_print_format(entity, j, V4L2_SUBDEV_FORMAT_ACTIVE); - for (k = 0; k < entity->num_links; k++) { - struct media_link *link = &entity->links[k]; - struct media_pad *source = link->source; - struct media_pad *sink = link->sink; + for (k = 0; k < num_links; k++) { + const struct media_link *link = media_entity_get_link(entity, k); + const struct media_pad *source = link->source; + const struct media_pad *sink = link->sink; bool first = true; unsigned int i; if (source->entity == entity && source->index == j) printf("\t\t-> \"%s\":%u [", - sink->entity->info.name, sink->index); + media_entity_get_info(sink->entity)->name, + sink->index); else if (sink->entity == entity && sink->index == j) printf("\t\t<- \"%s\":%u [", - source->entity->info.name, source->index); + media_entity_get_info(source->entity)->name, + source->index); else continue; |