This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:

Subject: v4l2-compliance: show data link flags
Author:  Hans Verkuil <hans.verk...@cisco.com>
Date:    Sun Jul 1 14:34:40 2018 +0200

Show the data link flags. Interface link flags are not shown since
they are always the same. Drop the unwanted "Entity Link" messages.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>

 utils/common/media-info.cpp               | 2 +-
 utils/v4l2-compliance/v4l2-test-media.cpp | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=5f4d76cf6708e36114130bf10aa37c417fc7ec43
diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp
index 4981685a04fb..f3aefe10b31f 100644
--- a/utils/common/media-info.cpp
+++ b/utils/common/media-info.cpp
@@ -370,7 +370,7 @@ static const flag_def link_flags_def[] = {
 
 std::string linkflags2s(__u32 flags)
 {
-       std::string s = flags2s(flags, link_flags_def);
+       std::string s = flags2s(flags & ~MEDIA_LNK_FL_LINK_TYPE, 
link_flags_def);
 
        if (!s.empty())
                s = ", " + s;
diff --git a/utils/v4l2-compliance/v4l2-test-media.cpp 
b/utils/v4l2-compliance/v4l2-test-media.cpp
index 1f1f01b9fa3c..4856f6c946c2 100644
--- a/utils/v4l2-compliance/v4l2-test-media.cpp
+++ b/utils/v4l2-compliance/v4l2-test-media.cpp
@@ -239,9 +239,10 @@ int testMediaTopology(struct node *node)
                        fail_on_test(link.source_id == link.sink_id);
                        num_data_links++;
                        if (show_info)
-                               printf("\t\tLink: 0x%08x (%s -> %s)\n", link.id,
+                               printf("\t\tLink: 0x%08x (%s -> %s, %s)\n", 
link.id,
                                       
v2_entity_map[v2_pad_map[link.source_id]->entity_id]->name,
-                                      
v2_entity_map[v2_pad_map[link.sink_id]->entity_id]->name);
+                                      
v2_entity_map[v2_pad_map[link.sink_id]->entity_id]->name,
+                                      linkflags2s(link.flags).c_str());
                }
        }
        node->topology = &topology;
@@ -327,9 +328,6 @@ int testMediaEnum(struct node *node)
             iter != ent_map.end(); ++iter) {
                media_entity_desc &ent = iter->second;
 
-               if (show_info)
-                       printf("\t\tEntity Links: 0x%08x (Name: '%s')\n",
-                              ent.id, ent.name);
                memset(&links, 0, sizeof(links));
                memset(&links.reserved, 0xff, sizeof(links.reserved));
                links.entity = ent.id;

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to