aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2016-10-12 19:29:40 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2016-10-12 19:29:40 +0200
commit9f5f5e4692e316ed7cb2bb0d5e0a7c72f132f4d3 (patch)
tree27955932d960f539e21b74c7219a29ef8b15feaa
parent7c2664b9a9b411d8b183009146e4f8548ca1d81a (diff)
cec-compliance: remove obsolete cec_msg_record_on/off workaround + fix typo
Remove the obsolete workaround for cec_msg_record_on/off where the reply argument was missing: this has now been fixed in cec-funcs.h. Also fix a spelling mistake. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
-rw-r--r--utils/cec-compliance/cec-test.cpp44
1 files changed, 1 insertions, 43 deletions
diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp
index e261453e..7c6ac2e1 100644
--- a/utils/cec-compliance/cec-test.cpp
+++ b/utils/cec-compliance/cec-test.cpp
@@ -31,48 +31,6 @@
#include "cec-compliance.h"
-/*
- * cec-funcs.h doesn't have the reply argument for these CEC messages.
- * A fix is pending but not yet merged. Once it is merged this workaround
- * can be removed.
- */
-static inline void cec_msg_record_on_reply(struct cec_msg *msg,
- bool reply,
- const struct cec_op_record_src *rec_src)
-{
- switch (rec_src->type) {
- case CEC_OP_RECORD_SRC_OWN:
- cec_msg_record_on_own(msg);
- break;
- case CEC_OP_RECORD_SRC_DIGITAL:
- cec_msg_record_on_digital(msg, &rec_src->digital);
- break;
- case CEC_OP_RECORD_SRC_ANALOG:
- cec_msg_record_on_analog(msg,
- rec_src->analog.ana_bcast_type,
- rec_src->analog.ana_freq,
- rec_src->analog.bcast_system);
- break;
- case CEC_OP_RECORD_SRC_EXT_PLUG:
- cec_msg_record_on_plug(msg, rec_src->ext_plug.plug);
- break;
- case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR:
- cec_msg_record_on_phys_addr(msg,
- rec_src->ext_phys_addr.phys_addr);
- break;
- }
- msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
-}
-#define cec_msg_record_on cec_msg_record_on_reply
-
-static inline void cec_msg_record_off_reply(struct cec_msg *msg, bool reply)
-{
- msg->len = 2;
- msg->msg[1] = CEC_MSG_RECORD_OFF;
- msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
-}
-#define cec_msg_record_off cec_msg_record_off_reply
-
#define test_case(name, tags, subtests) {name, tags, subtests, ARRAY_SIZE(subtests)}
#define test_case_ext(name, tags, subtests) {name, tags, subtests, subtests##_size}
@@ -1412,7 +1370,7 @@ static struct remote_test tests[] = {
test_case("One Touch Record feature",
TAG_ONE_TOUCH_RECORD,
one_touch_rec_subtests),
- test_case("Timer Progrmaming feature",
+ test_case("Timer Programming feature",
TAG_TIMER_PROGRAMMING,
timer_prog_subtests),
test_case("Capability Discovery and Control feature",

Privacy Policy