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: cec utils: print the cec_log_addrs flags field Author: Hans Verkuil <hans.verk...@cisco.com> Date: Mon Oct 10 09:56:23 2016 +0200 Log the new 'flags' field of struct cec_log_addrs. Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> utils/cec-compliance/cec-compliance.cpp | 18 +++++++++++++++++- utils/cec-ctl/cec-ctl.cpp | 18 +++++++++++++++++- utils/cec-follower/cec-follower.cpp | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=9e74ef7abad54b271ea50d111eb2d7f964091249 diff --git a/utils/cec-compliance/cec-compliance.cpp b/utils/cec-compliance/cec-compliance.cpp index ccfa3ba1610c..ca9b0967c5e1 100644 --- a/utils/cec-compliance/cec-compliance.cpp +++ b/utils/cec-compliance/cec-compliance.cpp @@ -177,6 +177,21 @@ static std::string caps2s(unsigned caps) return s; } +static std::string laflags2s(unsigned flags) +{ + std::string s; + + if (!flags) + return s; + + s = "("; + if (flags & CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK) + s += "Allow Fallback to Unregistered, "; + if (s.length()) + s.erase(s.length() - 2, 2); + return s + ")"; +} + const char *version2s(unsigned version) { switch (version) { @@ -1190,7 +1205,8 @@ int main(int argc, char **argv) printf("\tCEC Version : %s\n", version2s(laddrs.cec_version)); if (laddrs.vendor_id != CEC_VENDOR_ID_NONE) printf("\tVendor ID : 0x%06x\n", laddrs.vendor_id); - printf("\tLogical Addresses : %u\n", laddrs.num_log_addrs); + printf("\tLogical Addresses : %u %s\n", + laddrs.num_log_addrs, laflags2s(laddrs.flags).c_str()); for (unsigned i = 0; i < laddrs.num_log_addrs; i++) { if (laddrs.log_addr[i] == CEC_LOG_ADDR_INVALID) printf("\n\t Logical Address : Not Allocated\n"); diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp index ea452dcb0c42..c8349d0ed171 100644 --- a/utils/cec-ctl/cec-ctl.cpp +++ b/utils/cec-ctl/cec-ctl.cpp @@ -939,6 +939,21 @@ static const char *la2s(unsigned la) } } +static std::string laflags2s(unsigned flags) +{ + std::string s; + + if (!flags) + return s; + + s = "("; + if (flags & CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK) + s += "Allow Fallback to Unregistered, "; + if (s.length()) + s.erase(s.length() - 2, 2); + return s + ")"; +} + static std::string all_dev_types2s(unsigned types) { std::string s; @@ -1735,7 +1750,8 @@ int main(int argc, char **argv) if (laddrs.vendor_id != CEC_VENDOR_ID_NONE) printf("\tVendor ID : 0x%06x\n", laddrs.vendor_id); printf("\tOSD Name : '%s'\n", laddrs.osd_name); - printf("\tLogical Addresses : %u\n", laddrs.num_log_addrs); + printf("\tLogical Addresses : %u %s\n", + laddrs.num_log_addrs, laflags2s(laddrs.flags).c_str()); for (unsigned i = 0; i < laddrs.num_log_addrs; i++) { if (laddrs.log_addr[i] == CEC_LOG_ADDR_INVALID) { printf("\n\t Logical Address : Not Allocated\n"); diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp index 7850ecd0273e..d0c4562f29a0 100644 --- a/utils/cec-follower/cec-follower.cpp +++ b/utils/cec-follower/cec-follower.cpp @@ -310,6 +310,21 @@ std::string all_dev_types2s(unsigned types) return s; } +static std::string laflags2s(unsigned flags) +{ + std::string s; + + if (!flags) + return s; + + s = "("; + if (flags & CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK) + s += "Allow Fallback to Unregistered, "; + if (s.length()) + s.erase(s.length() - 2, 2); + return s + ")"; +} + std::string rc_src_prof2s(unsigned prof) { std::string s; @@ -692,7 +707,8 @@ int main(int argc, char **argv) printf("\tCEC Version : %s\n", version2s(laddrs.cec_version)); if (laddrs.vendor_id != CEC_VENDOR_ID_NONE) printf("\tVendor ID : 0x%06x\n", laddrs.vendor_id); - printf("\tLogical Addresses : %u\n", laddrs.num_log_addrs); + printf("\tLogical Addresses : %u %s\n", + laddrs.num_log_addrs, laflags2s(laddrs.flags).c_str()); for (unsigned i = 0; i < laddrs.num_log_addrs; i++) { if (laddrs.log_addr[i] == CEC_LOG_ADDR_INVALID) printf("\n\t Logical Address : Not Allocated\n"); _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
