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/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/cec-funcs.h+20−20
@@ -14,7 +14,7 @@ · 13 unmodified lines
14static inline void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)14static inline void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)
15{15{
16 msg->len = 4;16 msg->len = 4;
17 msg->msg[0] |= 0xf; /* broadcast */17 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
18 msg->msg[1] = CEC_MSG_ACTIVE_SOURCE;18 msg->msg[1] = CEC_MSG_ACTIVE_SOURCE;
19 msg->msg[2] = phys_addr >> 8;19 msg->msg[2] = phys_addr >> 8;
20 msg->msg[3] = phys_addr & 0xff;20 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
59 int reply)59 int reply)
60{60{
61 msg->len = 2;61 msg->len = 2;
62 msg->msg[0] |= 0xf; /* broadcast */62 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
63 msg->msg[1] = CEC_MSG_REQUEST_ACTIVE_SOURCE;63 msg->msg[1] = CEC_MSG_REQUEST_ACTIVE_SOURCE;
64 msg->reply = reply ? CEC_MSG_ACTIVE_SOURCE : 0;64 msg->reply = reply ? CEC_MSG_ACTIVE_SOURCE : 0;
65}65}
@@ -68,7 +68,7 @@ static inline void cec_msg_routing_information(struct cec_msg *msg, · 2 unmodified lines
68 __u16 phys_addr)68 __u16 phys_addr)
69{69{
70 msg->len = 4;70 msg->len = 4;
71 msg->msg[0] |= 0xf; /* broadcast */71 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
72 msg->msg[1] = CEC_MSG_ROUTING_INFORMATION;72 msg->msg[1] = CEC_MSG_ROUTING_INFORMATION;
73 msg->msg[2] = phys_addr >> 8;73 msg->msg[2] = phys_addr >> 8;
74 msg->msg[3] = phys_addr & 0xff;74 msg->msg[3] = phys_addr & 0xff;
@@ -86,7 +86,7 @@ static inline void cec_msg_routing_change(struct cec_msg *msg, · 11 unmodified lines
86 __u16 new_phys_addr)86 __u16 new_phys_addr)
87{87{
88 msg->len = 6;88 msg->len = 6;
89 msg->msg[0] |= 0xf; /* broadcast */89 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
90 msg->msg[1] = CEC_MSG_ROUTING_CHANGE;90 msg->msg[1] = CEC_MSG_ROUTING_CHANGE;
91 msg->msg[2] = orig_phys_addr >> 8;91 msg->msg[2] = orig_phys_addr >> 8;
92 msg->msg[3] = orig_phys_addr & 0xff;92 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
106static inline void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)106static inline void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)
107{107{
108 msg->len = 4;108 msg->len = 4;
109 msg->msg[0] |= 0xf; /* broadcast */109 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
110 msg->msg[1] = CEC_MSG_SET_STREAM_PATH;110 msg->msg[1] = CEC_MSG_SET_STREAM_PATH;
111 msg->msg[2] = phys_addr >> 8;111 msg->msg[2] = phys_addr >> 8;
112 msg->msg[3] = phys_addr & 0xff;112 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
791 __u16 phys_addr, __u8 prim_devtype)791 __u16 phys_addr, __u8 prim_devtype)
792{792{
793 msg->len = 5;793 msg->len = 5;
794 msg->msg[0] |= 0xf; /* broadcast */794 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
795 msg->msg[1] = CEC_MSG_REPORT_PHYSICAL_ADDR;795 msg->msg[1] = CEC_MSG_REPORT_PHYSICAL_ADDR;
796 msg->msg[2] = phys_addr >> 8;796 msg->msg[2] = phys_addr >> 8;
797 msg->msg[3] = phys_addr & 0xff;797 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
817 const char *language)817 const char *language)
818{818{
819 msg->len = 5;819 msg->len = 5;
820 msg->msg[0] |= 0xf; /* broadcast */820 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
821 msg->msg[1] = CEC_MSG_SET_MENU_LANGUAGE;821 msg->msg[1] = CEC_MSG_SET_MENU_LANGUAGE;
822 memcpy(msg->msg + 2, language, 3);822 memcpy(msg->msg + 2, language, 3);
823}823}
@@ -850,7 +850,7 @@ static inline void cec_msg_report_features(struct cec_msg *msg, · 26 unmodified lines
850 __u8 rc_profile, __u8 dev_features)850 __u8 rc_profile, __u8 dev_features)
851{851{
852 msg->len = 6;852 msg->len = 6;
853 msg->msg[0] |= 0xf; /* broadcast */853 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
854 msg->msg[1] = CEC_MSG_REPORT_FEATURES;854 msg->msg[1] = CEC_MSG_REPORT_FEATURES;
855 msg->msg[2] = cec_version;855 msg->msg[2] = cec_version;
856 msg->msg[3] = all_device_types;856 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
1092static inline void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id)1092static inline void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id)
1093{1093{
1094 msg->len = 5;1094 msg->len = 5;
1095 msg->msg[0] |= 0xf; /* broadcast */1095 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1096 msg->msg[1] = CEC_MSG_DEVICE_VENDOR_ID;1096 msg->msg[1] = CEC_MSG_DEVICE_VENDOR_ID;
1097 msg->msg[2] = vendor_id >> 16;1097 msg->msg[2] = vendor_id >> 16;
1098 msg->msg[3] = (vendor_id >> 8) & 0xff;1098 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
1655 __u8 audio_out_delay)1655 __u8 audio_out_delay)
1656{1656{
1657 msg->len = 6;1657 msg->len = 6;
1658 msg->msg[0] |= 0xf; /* broadcast */1658 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1659 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;1659 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;
1660 msg->msg[2] = phys_addr >> 8;1660 msg->msg[2] = phys_addr >> 8;
1661 msg->msg[3] = phys_addr & 0xff;1661 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
1687 __u16 phys_addr)1687 __u16 phys_addr)
1688{1688{
1689 msg->len = 4;1689 msg->len = 4;
1690 msg->msg[0] |= 0xf; /* broadcast */1690 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1691 msg->msg[1] = CEC_MSG_REQUEST_CURRENT_LATENCY;1691 msg->msg[1] = CEC_MSG_REQUEST_CURRENT_LATENCY;
1692 msg->msg[2] = phys_addr >> 8;1692 msg->msg[2] = phys_addr >> 8;
1693 msg->msg[3] = phys_addr & 0xff;1693 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
1707 __u16 phys_addr2)1707 __u16 phys_addr2)
1708{1708{
1709 msg->len = 9;1709 msg->len = 9;
1710 msg->msg[0] |= 0xf; /* broadcast */1710 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1711 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1711 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1712 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1712 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1713 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE_STATE;1713 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
1737 __u16 hec_field)1737 __u16 hec_field)
1738{1738{
1739 msg->len = has_field ? 10 : 8;1739 msg->len = has_field ? 10 : 8;
1740 msg->msg[0] |= 0xf; /* broadcast */1740 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1741 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1741 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1742 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1742 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1743 msg->msg[4] = CEC_MSG_CDC_HEC_REPORT_STATE;1743 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
1782 __u16 phys_addr5)1782 __u16 phys_addr5)
1783{1783{
1784 msg->len = 10;1784 msg->len = 10;
1785 msg->msg[0] |= 0xf; /* broadcast */1785 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1786 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1786 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1787 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1787 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1788 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE_STATE;1788 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
1832 __u8 hec_set_state)1832 __u8 hec_set_state)
1833{1833{
1834 msg->len = 8;1834 msg->len = 8;
1835 msg->msg[0] |= 0xf; /* broadcast */1835 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1836 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1836 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1837 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1837 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1838 msg->msg[4] = CEC_MSG_CDC_HEC_SET_STATE_ADJACENT;1838 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
1857 __u16 phys_addr3)1857 __u16 phys_addr3)
1858{1858{
1859 msg->len = 11;1859 msg->len = 11;
1860 msg->msg[0] |= 0xf; /* broadcast */1860 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1861 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1861 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1862 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1862 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1863 msg->msg[4] = CEC_MSG_CDC_HEC_REQUEST_DEACTIVATION;1863 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
1884static inline void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)1884static inline void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)
1885{1885{
1886 msg->len = 5;1886 msg->len = 5;
1887 msg->msg[0] |= 0xf; /* broadcast */1887 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1888 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1888 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1889 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1889 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1890 msg->msg[4] = CEC_MSG_CDC_HEC_NOTIFY_ALIVE;1890 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
1899static inline void cec_msg_cdc_hec_discover(struct cec_msg *msg)1899static inline void cec_msg_cdc_hec_discover(struct cec_msg *msg)
1900{1900{
1901 msg->len = 5;1901 msg->len = 5;
1902 msg->msg[0] |= 0xf; /* broadcast */1902 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1903 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1903 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1904 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1904 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1905 msg->msg[4] = CEC_MSG_CDC_HEC_DISCOVER;1905 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
1916 __u8 hpd_state)1916 __u8 hpd_state)
1917{1917{
1918 msg->len = 6;1918 msg->len = 6;
1919 msg->msg[0] |= 0xf; /* broadcast */1919 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1920 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1920 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1921 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1921 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1922 msg->msg[4] = CEC_MSG_CDC_HPD_SET_STATE;1922 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
1938 __u8 hpd_error)1938 __u8 hpd_error)
1939{1939{
1940 msg->len = 6;1940 msg->len = 6;
1941 msg->msg[0] |= 0xf; /* broadcast */1941 msg->msg[0] |= CEC_LOG_ADDR_BROADCAST;
1942 msg->msg[1] = CEC_MSG_CDC_MESSAGE;1942 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1943 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */1943 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1944 msg->msg[4] = CEC_MSG_CDC_HPD_REPORT_STATE;1944 msg->msg[4] = CEC_MSG_CDC_HPD_REPORT_STATE;