aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-10-22 09:14:28 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-10-22 09:14:28 +0200
commit070b352e55fb8d8549afc86088584837ba9532b6 (patch)
tree6704254804a67d48ba499be6383abc8580196c7c
parentfbf328f0b02eabe973a9c837bdbb507d803f9835 (diff)
cec-follower: drop physical address check
If the CEC adapter required manual setting of the physical address, and the physical address was invalid, then cec-follower aborted with this message: FAIL: missing physical address, use cec-ctl to configure this But cec-ctl can poll for the physical address from the EDID using the -e or -E options, so in that case this check is too strict. Just drop the invalid physical address check, it's not needed. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--utils/cec-follower/cec-follower.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp
index 81dac076..91f36bfd 100644
--- a/utils/cec-follower/cec-follower.cpp
+++ b/utils/cec-follower/cec-follower.cpp
@@ -530,19 +530,10 @@ int main(int argc, char **argv)
}
printf("\n");
- bool missing_pa = node.phys_addr == CEC_PHYS_ADDR_INVALID &&
- (node.caps & CEC_CAP_PHYS_ADDR) &&
- !(node.caps & CEC_CAP_CONNECTOR_INFO);
- bool missing_la = laddrs.num_log_addrs == 0 && (node.caps & CEC_CAP_LOG_ADDRS);
-
- if (missing_la || missing_pa)
- printf("\n");
- if (missing_pa)
- fprintf(stderr, "FAIL: missing physical address, use cec-ctl to configure this\n");
- if (missing_la)
- fprintf(stderr, "FAIL: missing logical address(es), use cec-ctl to configure this\n");
- if (missing_la || missing_pa)
+ if (laddrs.num_log_addrs == 0 && (node.caps & CEC_CAP_LOG_ADDRS)) {
+ printf("\nFAIL: missing logical address(es), use cec-ctl to configure this\n");
std::exit(EXIT_FAILURE);
+ }
testProcessing(&node, options[OptWallClock]);
}

Privacy Policy