aboutsummaryrefslogtreecommitdiffstats
path: root/utils/cec-compliance
diff options
context:
space:
mode:
authorJiunn Chang <c0d1n61at3@gmail.com>2019-09-09 09:26:53 -0500
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-09-09 16:43:20 +0200
commit76686657fe76453cbdeda4acd2a5be018af22c10 (patch)
treea47f99d38e7df92315beb2cdbcc36e10b58eadce /utils/cec-compliance
parent78953a1166aba23e9a7c40e597a741c7d71a847c (diff)
cec-compliance: rename has_arc_rx, has_arc_tx
Renaming has_arc_rx and has_arc_tx to better match the macros defined in cec.h: - CEC_OP_FEAT_DEV_SOURCE_HAS_ARC_RX - CEC_OP_FEAT_DEV_SINK_HAS_ARC_TX For devices on a HDMI ARC link, sources can only receive ARC and sinks can only transmit ARC. Signed-off-by: Jiunn Chang <c0d1n61at3@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> [hverkuil-cisco@xs4all.nl: slight rewording of the commit text]
Diffstat (limited to 'utils/cec-compliance')
-rw-r--r--utils/cec-compliance/cec-compliance.cpp4
-rw-r--r--utils/cec-compliance/cec-compliance.h4
-rw-r--r--utils/cec-compliance/cec-test-audio.cpp10
3 files changed, 9 insertions, 9 deletions
diff --git a/utils/cec-compliance/cec-compliance.cpp b/utils/cec-compliance/cec-compliance.cpp
index 3818ce58..d89962f0 100644
--- a/utils/cec-compliance/cec-compliance.cpp
+++ b/utils/cec-compliance/cec-compliance.cpp
@@ -1038,9 +1038,9 @@ static void topology_probe_device(struct node *node, unsigned i, unsigned la)
node->remote[i].rc_profile = *rc_profile;
node->remote[i].dev_features = *dev_features;
node->remote[i].all_device_types = all_device_types;
- node->remote[i].has_arc_rx =
+ node->remote[i].source_has_arc_rx =
(*dev_features & CEC_OP_FEAT_DEV_SOURCE_HAS_ARC_RX) != 0;
- node->remote[i].has_arc_tx =
+ node->remote[i].sink_has_arc_tx =
(*dev_features & CEC_OP_FEAT_DEV_SINK_HAS_ARC_TX) != 0;
node->remote[i].has_aud_rate =
(*dev_features & CEC_OP_FEAT_DEV_HAS_SET_AUDIO_RATE) != 0;
diff --git a/utils/cec-compliance/cec-compliance.h b/utils/cec-compliance/cec-compliance.h
index d7460b62..023c34d4 100644
--- a/utils/cec-compliance/cec-compliance.h
+++ b/utils/cec-compliance/cec-compliance.h
@@ -137,8 +137,8 @@ struct remote {
bool has_text_view_on;
bool in_standby;
bool has_remote_control_passthrough;
- bool has_arc_rx;
- bool has_arc_tx;
+ bool source_has_arc_rx;
+ bool sink_has_arc_tx;
bool arc_initiated;
bool has_sys_audio_mode_req;
bool has_set_sys_audio_mode;
diff --git a/utils/cec-compliance/cec-test-audio.cpp b/utils/cec-compliance/cec-test-audio.cpp
index 872bb9ad..2bc24daf 100644
--- a/utils/cec-compliance/cec-test-audio.cpp
+++ b/utils/cec-compliance/cec-test-audio.cpp
@@ -165,17 +165,17 @@ static int arc_initiate_tx(struct node *node, unsigned me, unsigned la, bool int
cec_msg_initiate_arc(&msg, true);
fail_on_test(!transmit_timeout(node, &msg));
if (timed_out(&msg)) {
- fail_on_test_v2(node->remote[la].cec_version, node->remote[la].has_arc_tx);
+ fail_on_test_v2(node->remote[la].cec_version, node->remote[la].sink_has_arc_tx);
warn("Timed out waiting for Report ARC Initiated/Terminated.\n");
return PRESUMED_OK;
}
if (unrecognized_op(&msg)) {
- fail_on_test_v2(node->remote[la].cec_version, node->remote[la].has_arc_tx);
+ fail_on_test_v2(node->remote[la].cec_version, node->remote[la].sink_has_arc_tx);
return NOTSUPPORTED;
}
if (cec_msg_opcode(&msg) == CEC_MSG_REPORT_ARC_INITIATED) {
fail_on_test(!pa_are_adjacent(node->phys_addr, node->remote[la].phys_addr));
- fail_on_test_v2(node->remote[la].cec_version, !node->remote[la].has_arc_tx);
+ fail_on_test_v2(node->remote[la].cec_version, !node->remote[la].sink_has_arc_tx);
node->remote[la].arc_initiated = true;
}
else if (cec_msg_opcode(&msg) == CEC_MSG_REPORT_ARC_TERMINATED)
@@ -248,11 +248,11 @@ static int arc_initiate_rx(struct node *node, unsigned me, unsigned la, bool int
}
}
if (unsupported) {
- fail_on_test_v2(node->remote[la].cec_version, node->remote[la].has_arc_rx);
+ fail_on_test_v2(node->remote[la].cec_version, node->remote[la].source_has_arc_rx);
return NOTSUPPORTED;
}
fail_on_test(!pa_are_adjacent(node->phys_addr, node->remote[la].phys_addr));
- fail_on_test_v2(node->remote[la].cec_version, !node->remote[la].has_arc_rx);
+ fail_on_test_v2(node->remote[la].cec_version, !node->remote[la].source_has_arc_rx);
cec_msg_init(&msg, me, la);
cec_msg_report_arc_initiated(&msg);

Privacy Policy