History

media: uapi: cec-funcs.h: use CEC_LOG_ADDR_BROADCAST

The cec-funcs.h header sets the destination to 0xf for those messages that can only be broadcast. Instead of writing: msg->msg[0] |= 0xf; /* broadcast */ just write: msg->msg[0] |= CEC_LOG_ADDR_BROADCAST; which is more descriptive and allows us to drop the comment.

Hans Verkuil committed 1 year ago

Commit d12ddda1 parent 6829c5b1 file · +20 −20Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/linux/cec-funcs.h+20−20
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 static inline void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)
1515 {
1616 msg->len = 4;
17− msg->msg[0] |= 0xf; /* broadcast */
17+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1818 msg->msg[1] = CEC_MSG_ACTIVE_SOURCE;
1919 msg->msg[2] = phys_addr >> 8;
2020 msg->msg[3] = phys_addr & 0xff;
@@ -59,7 +59,7 @@ static inline void cec_msg_request_active_source(struct cec_msg *msg, · 38 unmodified lines
5959 int reply)
6060 {
6161 msg->len = 2;
62− msg->msg[0] |= 0xf; /* broadcast */
62+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
6363 msg->msg[1] = CEC_MSG_REQUEST_ACTIVE_SOURCE;
6464 msg->reply = reply ? CEC_MSG_ACTIVE_SOURCE : 0;
6565 }
@@ -68,7 +68,7 @@ static inline void cec_msg_routing_information(struct cec_msg *msg, · 2 unmodified lines
6868 __u16 phys_addr)
6969 {
7070 msg->len = 4;
71− msg->msg[0] |= 0xf; /* broadcast */
71+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
7272 msg->msg[1] = CEC_MSG_ROUTING_INFORMATION;
7373 msg->msg[2] = phys_addr >> 8;
7474 msg->msg[3] = phys_addr & 0xff;
@@ -86,7 +86,7 @@ static inline void cec_msg_routing_change(struct cec_msg *msg, · 11 unmodified lines
8686 __u16 new_phys_addr)
8787 {
8888 msg->len = 6;
89− msg->msg[0] |= 0xf; /* broadcast */
89+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
9090 msg->msg[1] = CEC_MSG_ROUTING_CHANGE;
9191 msg->msg[2] = orig_phys_addr >> 8;
9292 msg->msg[3] = orig_phys_addr & 0xff;
@@ -106,7 +106,7 @@ static inline void cec_ops_routing_change(const struct cec_msg *msg, · 13 unmodified lines
106106 static inline void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)
107107 {
108108 msg->len = 4;
109− msg->msg[0] |= 0xf; /* broadcast */
109+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
110110 msg->msg[1] = CEC_MSG_SET_STREAM_PATH;
111111 msg->msg[2] = phys_addr >> 8;
112112 msg->msg[3] = phys_addr & 0xff;
@@ -791,7 +791,7 @@ static inline void cec_msg_report_physical_addr(struct cec_msg *msg, · 678 unmodified lines
791791 __u16 phys_addr, __u8 prim_devtype)
792792 {
793793 msg->len = 5;
794− msg->msg[0] |= 0xf; /* broadcast */
794+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
795795 msg->msg[1] = CEC_MSG_REPORT_PHYSICAL_ADDR;
796796 msg->msg[2] = phys_addr >> 8;
797797 msg->msg[3] = phys_addr & 0xff;
@@ -817,7 +817,7 @@ static inline void cec_msg_set_menu_language(struct cec_msg *msg, · 19 unmodified lines
817817 const char *language)
818818 {
819819 msg->len = 5;
820− msg->msg[0] |= 0xf; /* broadcast */
820+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
821821 msg->msg[1] = CEC_MSG_SET_MENU_LANGUAGE;
822822 memcpy(msg->msg + 2, language, 3);
823823 }
@@ -850,7 +850,7 @@ static inline void cec_msg_report_features(struct cec_msg *msg, · 26 unmodified lines
850850 __u8 rc_profile, __u8 dev_features)
851851 {
852852 msg->len = 6;
853− msg->msg[0] |= 0xf; /* broadcast */
853+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
854854 msg->msg[1] = CEC_MSG_REPORT_FEATURES;
855855 msg->msg[2] = cec_version;
856856 msg->msg[3] = all_device_types;
@@ -1092,7 +1092,7 @@ static inline void cec_msg_tuner_step_increment(struct cec_msg *msg) · 235 unmodified lines
10921092 static inline void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id)
10931093 {
10941094 msg->len = 5;
1095− msg->msg[0] |= 0xf; /* broadcast */
1095+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
10961096 msg->msg[1] = CEC_MSG_DEVICE_VENDOR_ID;
10971097 msg->msg[2] = vendor_id >> 16;
10981098 msg->msg[3] = (vendor_id >> 8) & 0xff;
@@ -1655,7 +1655,7 @@ static inline void cec_msg_report_current_latency(struct cec_msg *msg, · 556 unmodified lines
16551655 __u8 audio_out_delay)
16561656 {
16571657 msg->len = 6;
1658− msg->msg[0] |= 0xf; /* broadcast */
1658+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
16591659 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;
16601660 msg->msg[2] = phys_addr >> 8;
16611661 msg->msg[3] = phys_addr & 0xff;
@@ -1687,7 +1687,7 @@ static inline void cec_msg_request_current_latency(struct cec_msg *msg, · 25 unmodified lines
16871687 __u16 phys_addr)
16881688 {
16891689 msg->len = 4;
1690− msg->msg[0] |= 0xf; /* broadcast */
1690+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
16911691 msg->msg[1] = CEC_MSG_REQUEST_CURRENT_LATENCY;
16921692 msg->msg[2] = phys_addr >> 8;
16931693 msg->msg[3] = phys_addr & 0xff;
@@ -1707,7 +1707,7 @@ static inline void cec_msg_cdc_hec_inquire_state(struct cec_msg *msg, · 13 unmodified lines
17071707 __u16 phys_addr2)
17081708 {
17091709 msg->len = 9;
1710− msg->msg[0] |= 0xf; /* broadcast */
1710+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
17111711 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
17121712 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
17131713 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE_STATE;
@@ -1737,7 +1737,7 @@ static inline void cec_msg_cdc_hec_report_state(struct cec_msg *msg, · 23 unmodified lines
17371737 __u16 hec_field)
17381738 {
17391739 msg->len = has_field ? 10 : 8;
1740− msg->msg[0] |= 0xf; /* broadcast */
1740+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
17411741 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
17421742 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
17431743 msg->msg[4] = CEC_MSG_CDC_HEC_REPORT_STATE;
@@ -1782,7 +1782,7 @@ static inline void cec_msg_cdc_hec_set_state(struct cec_msg *msg, · 38 unmodified lines
17821782 __u16 phys_addr5)
17831783 {
17841784 msg->len = 10;
1785− msg->msg[0] |= 0xf; /* broadcast */
1785+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
17861786 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
17871787 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
17881788 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE_STATE;
@@ -1832,7 +1832,7 @@ static inline void cec_msg_cdc_hec_set_state_adjacent(struct cec_msg *msg, · 43 unmodified lines
18321832 __u8 hec_set_state)
18331833 {
18341834 msg->len = 8;
1835− msg->msg[0] |= 0xf; /* broadcast */
1835+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
18361836 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
18371837 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
18381838 msg->msg[4] = CEC_MSG_CDC_HEC_SET_STATE_ADJACENT;
@@ -1857,7 +1857,7 @@ static inline void cec_msg_cdc_hec_request_deactivation(struct cec_msg *msg, · 18 unmodified lines
18571857 __u16 phys_addr3)
18581858 {
18591859 msg->len = 11;
1860− msg->msg[0] |= 0xf; /* broadcast */
1860+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
18611861 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
18621862 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
18631863 msg->msg[4] = CEC_MSG_CDC_HEC_REQUEST_DEACTIVATION;
@@ -1884,7 +1884,7 @@ static inline void cec_ops_cdc_hec_request_deactivation(const struct cec_msg *ms · 20 unmodified lines
18841884 static inline void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)
18851885 {
18861886 msg->len = 5;
1887− msg->msg[0] |= 0xf; /* broadcast */
1887+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
18881888 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
18891889 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
18901890 msg->msg[4] = CEC_MSG_CDC_HEC_NOTIFY_ALIVE;
@@ -1899,7 +1899,7 @@ static inline void cec_ops_cdc_hec_notify_alive(const struct cec_msg *msg, · 8 unmodified lines
18991899 static inline void cec_msg_cdc_hec_discover(struct cec_msg *msg)
19001900 {
19011901 msg->len = 5;
1902− msg->msg[0] |= 0xf; /* broadcast */
1902+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
19031903 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
19041904 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
19051905 msg->msg[4] = CEC_MSG_CDC_HEC_DISCOVER;
@@ -1916,7 +1916,7 @@ static inline void cec_msg_cdc_hpd_set_state(struct cec_msg *msg, · 10 unmodified lines
19161916 __u8 hpd_state)
19171917 {
19181918 msg->len = 6;
1919− msg->msg[0] |= 0xf; /* broadcast */
1919+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
19201920 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
19211921 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
19221922 msg->msg[4] = CEC_MSG_CDC_HPD_SET_STATE;
@@ -1938,7 +1938,7 @@ static inline void cec_msg_cdc_hpd_report_state(struct cec_msg *msg, · 15 unmodified lines
19381938 __u8 hpd_error)
19391939 {
19401940 msg->len = 6;
1941− msg->msg[0] |= 0xf; /* broadcast */
1941+ msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
19421942 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
19431943 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
19441944 msg->msg[4] = CEC_MSG_CDC_HPD_REPORT_STATE;