diff options
author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2021-04-21 09:04:08 +0200 |
---|---|---|
committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2021-04-21 09:04:08 +0200 |
commit | a15dfa560f168cec14bbda84c94a0198d4139c28 (patch) | |
tree | 12ca24ebb070f31ae60dda403c41221fbc183d20 | |
parent | 1d808f1cdd9719ecea219e113096a8d9b87c0d14 (diff) | |
download | v4l-utils-a15dfa560f168cec14bbda84c94a0198d4139c28.tar.gz |
v4l2-compliance: rename stvec to vec_remote_subtests
I found stvec to be a bit too obscure, so renamed it.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r-- | utils/cec-compliance/cec-compliance.h | 18 | ||||
-rw-r--r-- | utils/cec-compliance/cec-test-audio.cpp | 8 | ||||
-rw-r--r-- | utils/cec-compliance/cec-test-power.cpp | 6 | ||||
-rw-r--r-- | utils/cec-compliance/cec-test.cpp | 30 |
4 files changed, 31 insertions, 31 deletions
diff --git a/utils/cec-compliance/cec-compliance.h b/utils/cec-compliance/cec-compliance.h index d2949a98..26c70c21 100644 --- a/utils/cec-compliance/cec-compliance.h +++ b/utils/cec-compliance/cec-compliance.h @@ -176,7 +176,7 @@ struct remote_subtest { bool for_cec20; }; -using stvec = std::vector<remote_subtest>; +using vec_remote_subtests = std::vector<remote_subtest>; #define OK 0 #define FAIL 1 @@ -460,17 +460,17 @@ void testRemote(struct node *node, unsigned me, unsigned la, unsigned test_tags, bool interactive); // cec-test-audio.cpp -extern const stvec sac_subtests; -extern const stvec dal_subtests; -extern const stvec arc_subtests; -extern const stvec audio_rate_ctl_subtests; +extern const vec_remote_subtests sac_subtests; +extern const vec_remote_subtests dal_subtests; +extern const vec_remote_subtests arc_subtests; +extern const vec_remote_subtests audio_rate_ctl_subtests; // cec-test-power.cpp bool util_interactive_ensure_power_state(struct node *node, unsigned me, unsigned la, bool interactive, __u8 target_pwr); -extern const stvec standby_subtests; -extern const stvec one_touch_play_subtests; -extern const stvec power_status_subtests; -extern const stvec standby_resume_subtests; +extern const vec_remote_subtests standby_subtests; +extern const vec_remote_subtests one_touch_play_subtests; +extern const vec_remote_subtests power_status_subtests; +extern const vec_remote_subtests standby_resume_subtests; #endif diff --git a/utils/cec-compliance/cec-test-audio.cpp b/utils/cec-compliance/cec-test-audio.cpp index 03294241..2a541d55 100644 --- a/utils/cec-compliance/cec-test-audio.cpp +++ b/utils/cec-compliance/cec-test-audio.cpp @@ -82,7 +82,7 @@ static int dal_req_current_latency_invalid(struct node *node, unsigned me, unsig return 0; } -const stvec dal_subtests{ +const vec_remote_subtests dal_subtests{ { "Request Current Latency", CEC_LOG_ADDR_MASK_ALL, dal_request_current_latency }, { "Request Current Latency with invalid PA", CEC_LOG_ADDR_MASK_ALL, dal_req_current_latency_invalid }, }; @@ -271,7 +271,7 @@ static int arc_terminate_rx(struct node *node, unsigned me, unsigned la, bool in return 0; } -const stvec arc_subtests{ +const vec_remote_subtests arc_subtests{ { "Initiate ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_initiate_rx }, { "Terminate ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_terminate_rx }, { "Initiate ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_initiate_tx }, @@ -756,7 +756,7 @@ static int sac_system_audio_mode_req_off(struct node *node, unsigned me, unsigne return 0; } -const stvec sac_subtests{ +const vec_remote_subtests sac_subtests{ { "Request Short Audio Descriptor", CEC_LOG_ADDR_MASK_AUDIOSYSTEM, @@ -875,7 +875,7 @@ static int audio_rate_ctl_set_audio_rate(struct node *node, unsigned me, unsigne return OK_PRESUMED; } -const stvec audio_rate_ctl_subtests{ +const vec_remote_subtests audio_rate_ctl_subtests{ { "Set Audio Rate", CEC_LOG_ADDR_MASK_PLAYBACK | CEC_LOG_ADDR_MASK_RECORD | CEC_LOG_ADDR_MASK_TUNER, diff --git a/utils/cec-compliance/cec-test-power.cpp b/utils/cec-compliance/cec-test-power.cpp index c2694460..bc88eca7 100644 --- a/utils/cec-compliance/cec-test-power.cpp +++ b/utils/cec-compliance/cec-test-power.cpp @@ -96,7 +96,7 @@ static int power_status_report(struct node *node, unsigned me, unsigned la, bool return OK_PRESUMED; } -const stvec power_status_subtests{ +const vec_remote_subtests power_status_subtests{ { "Give Device Power Status", CEC_LOG_ADDR_MASK_ALL, power_status_give }, { "Report Device Power Status", CEC_LOG_ADDR_MASK_ALL, power_status_report }, }; @@ -231,7 +231,7 @@ static int one_touch_play_req_active_source(struct node *node, unsigned me, unsi return 0; } -const stvec one_touch_play_subtests{ +const vec_remote_subtests one_touch_play_subtests{ { "Image View On", CEC_LOG_ADDR_MASK_TV, one_touch_play_image_view_on }, { "Text View On", CEC_LOG_ADDR_MASK_TV, one_touch_play_text_view_on }, { "Wakeup on Image View On", CEC_LOG_ADDR_MASK_TV, one_touch_play_image_view_on_wakeup }, @@ -633,7 +633,7 @@ static int power_state_transitions(struct node *node, unsigned me, unsigned la, return 0; } -const stvec standby_resume_subtests{ +const vec_remote_subtests standby_resume_subtests{ { "Standby", CEC_LOG_ADDR_MASK_ALL, standby_resume_standby }, { "Repeated Standby message does not wake up", CEC_LOG_ADDR_MASK_ALL, standby_resume_standby_toggle }, { "Standby: Feature aborts unknown messages", CEC_LOG_ADDR_MASK_ALL, core_unknown, true }, diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp index 978d04ec..8da29f22 100644 --- a/utils/cec-compliance/cec-test.cpp +++ b/utils/cec-compliance/cec-test.cpp @@ -16,7 +16,7 @@ struct remote_test { const char *name; const unsigned tags; - const stvec &subtests; + const vec_remote_subtests &subtests; }; @@ -174,7 +174,7 @@ int system_info_give_features(struct node *node, unsigned me, unsigned la, bool return 0; } -static const stvec system_info_subtests{ +static const vec_remote_subtests system_info_subtests{ { "Polling Message", CEC_LOG_ADDR_MASK_ALL, system_info_polling }, { "Give Physical Address", CEC_LOG_ADDR_MASK_ALL, system_info_phys_addr }, { "Give CEC Version", CEC_LOG_ADDR_MASK_ALL, system_info_version }, @@ -232,7 +232,7 @@ int core_abort(struct node *node, unsigned me, unsigned la, bool interactive) return 0; } -static const stvec core_subtests{ +static const vec_remote_subtests core_subtests{ { "Feature aborts unknown messages", CEC_LOG_ADDR_MASK_ALL, core_unknown }, { "Feature aborts Abort message", CEC_LOG_ADDR_MASK_ALL, core_abort }, }; @@ -259,7 +259,7 @@ int vendor_specific_commands_id(struct node *node, unsigned me, unsigned la, boo return 0; } -static const stvec vendor_specific_subtests{ +static const vec_remote_subtests vendor_specific_subtests{ { "Give Device Vendor ID", CEC_LOG_ADDR_MASK_ALL, vendor_specific_commands_id }, }; @@ -310,7 +310,7 @@ int device_osd_transfer_give(struct node *node, unsigned me, unsigned la, bool i return 0; } -static const stvec device_osd_transfer_subtests{ +static const vec_remote_subtests device_osd_transfer_subtests{ { "Set OSD Name", CEC_LOG_ADDR_MASK_ALL, device_osd_transfer_set }, { "Give OSD Name", CEC_LOG_ADDR_MASK_ALL, device_osd_transfer_give }, }; @@ -410,7 +410,7 @@ static int osd_string_invalid(struct node *node, unsigned me, unsigned la, bool return 0; } -static const stvec osd_string_subtests{ +static const vec_remote_subtests osd_string_subtests{ { "Set OSD String with default timeout", CEC_LOG_ADDR_MASK_TV, osd_string_set_default }, { "Set OSD String with no timeout", CEC_LOG_ADDR_MASK_TV, osd_string_set_until_clear }, { "Set OSD String with invalid operand", CEC_LOG_ADDR_MASK_TV, osd_string_invalid }, @@ -516,7 +516,7 @@ static int routing_control_set_stream_path(struct node *node, unsigned me, unsig return OK_PRESUMED; } -static const stvec routing_control_subtests{ +static const vec_remote_subtests routing_control_subtests{ { "Active Source", CEC_LOG_ADDR_MASK_TV, routing_control_active_source }, { "Request Active Source", CEC_LOG_ADDR_MASK_ALL, routing_control_req_active_source }, { "Inactive Source", CEC_LOG_ADDR_MASK_TV, routing_control_inactive_source }, @@ -563,7 +563,7 @@ static int rc_passthrough_user_ctrl_released(struct node *node, unsigned me, uns return OK_PRESUMED; } -static const stvec rc_passthrough_subtests{ +static const vec_remote_subtests rc_passthrough_subtests{ { "User Control Pressed", CEC_LOG_ADDR_MASK_ALL, rc_passthrough_user_ctrl_pressed }, { "User Control Released", CEC_LOG_ADDR_MASK_ALL, rc_passthrough_user_ctrl_released }, }; @@ -593,7 +593,7 @@ static int dev_menu_ctl_request(struct node *node, unsigned me, unsigned la, boo return 0; } -static const stvec dev_menu_ctl_subtests{ +static const vec_remote_subtests dev_menu_ctl_subtests{ { "Menu Request", static_cast<__u16>(~CEC_LOG_ADDR_MASK_TV), dev_menu_ctl_request }, { "User Control Pressed", CEC_LOG_ADDR_MASK_ALL, rc_passthrough_user_ctrl_pressed }, { "User Control Released", CEC_LOG_ADDR_MASK_ALL, rc_passthrough_user_ctrl_released }, @@ -692,7 +692,7 @@ static int deck_ctl_play(struct node *node, unsigned me, unsigned la, bool inter return OK_PRESUMED; } -static const stvec deck_ctl_subtests{ +static const vec_remote_subtests deck_ctl_subtests{ { "Give Deck Status", CEC_LOG_ADDR_MASK_PLAYBACK | CEC_LOG_ADDR_MASK_RECORD, deck_ctl_give_status }, { "Deck Status", CEC_LOG_ADDR_MASK_ALL, deck_ctl_deck_status }, { "Deck Control", CEC_LOG_ADDR_MASK_PLAYBACK | CEC_LOG_ADDR_MASK_RECORD, deck_ctl_deck_ctl }, @@ -936,7 +936,7 @@ static int tuner_ctl_test(struct node *node, unsigned me, unsigned la, bool inte return 0; } -static const stvec tuner_ctl_subtests{ +static const vec_remote_subtests tuner_ctl_subtests{ { "Tuner Control", CEC_LOG_ADDR_MASK_TUNER | CEC_LOG_ADDR_MASK_TV, tuner_ctl_test }, }; @@ -1039,7 +1039,7 @@ static int one_touch_rec_status(struct node *node, unsigned me, unsigned la, boo return 0; } -static const stvec one_touch_rec_subtests{ +static const vec_remote_subtests one_touch_rec_subtests{ { "Record TV Screen", CEC_LOG_ADDR_MASK_TV, one_touch_rec_tv_screen }, { "Record On", CEC_LOG_ADDR_MASK_RECORD, one_touch_rec_on }, { "Record Off", CEC_LOG_ADDR_MASK_RECORD, one_touch_rec_off }, @@ -1258,7 +1258,7 @@ static int timer_prog_timer_clear_status(struct node *node, unsigned me, unsigne return OK_PRESUMED; } -static const stvec timer_prog_subtests{ +static const vec_remote_subtests timer_prog_subtests{ { "Set Analogue Timer", CEC_LOG_ADDR_MASK_RECORD, timer_prog_set_analog_timer }, { "Set Digital Timer", CEC_LOG_ADDR_MASK_RECORD, timer_prog_set_digital_timer }, { "Set Timer Program Title", CEC_LOG_ADDR_MASK_RECORD, timer_prog_set_prog_title }, @@ -1361,7 +1361,7 @@ static int cdc_hec_discover(struct node *node, unsigned me, unsigned la, bool pr return OK_NOT_SUPPORTED; } -static const stvec cdc_subtests{ +static const vec_remote_subtests cdc_subtests{ { "CDC_HEC_Discover", CEC_LOG_ADDR_MASK_ALL, cdc_hec_discover }, }; @@ -1385,7 +1385,7 @@ static int post_test_check_recognized(struct node *node, unsigned me, unsigned l return 0; } -static const stvec post_test_subtests{ +static const vec_remote_subtests post_test_subtests{ { "Recognized/unrecognized message consistency", CEC_LOG_ADDR_MASK_ALL, post_test_check_recognized }, }; |