aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-08-11 13:25:37 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2018-08-11 13:25:37 +0200
commit4e7b691198cd2ae3653655e1aaf28894abba8212 (patch)
tree9663c634a81c946672d055eafbd8d4174af923a0 /include
parent08e4d723e05da954f688c79e72091b614e6bc1ed (diff)
v4l-utils: sync-with-kernel
Use cec headers from usr/include/linux instead of include/uapi/linux. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cec-funcs.h300
-rw-r--r--include/linux/cec.h40
2 files changed, 170 insertions, 170 deletions
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
index 8997d506..6daa73d0 100644
--- a/include/linux/cec-funcs.h
+++ b/include/linux/cec-funcs.h
@@ -11,7 +11,7 @@
#include <linux/cec.h>
/* One Touch Play Feature */
-static inline void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)
+static __inline__ void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)
{
msg->len = 4;
msg->msg[0] |= 0xf; /* broadcast */
@@ -20,19 +20,19 @@ static inline void cec_msg_active_source(struct cec_msg *msg, __u16 phys_addr)
msg->msg[3] = phys_addr & 0xff;
}
-static inline void cec_ops_active_source(const struct cec_msg *msg,
+static __inline__ void cec_ops_active_source(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
}
-static inline void cec_msg_image_view_on(struct cec_msg *msg)
+static __inline__ void cec_msg_image_view_on(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_IMAGE_VIEW_ON;
}
-static inline void cec_msg_text_view_on(struct cec_msg *msg)
+static __inline__ void cec_msg_text_view_on(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_TEXT_VIEW_ON;
@@ -40,7 +40,7 @@ static inline void cec_msg_text_view_on(struct cec_msg *msg)
/* Routing Control Feature */
-static inline void cec_msg_inactive_source(struct cec_msg *msg,
+static __inline__ void cec_msg_inactive_source(struct cec_msg *msg,
__u16 phys_addr)
{
msg->len = 4;
@@ -49,13 +49,13 @@ static inline void cec_msg_inactive_source(struct cec_msg *msg,
msg->msg[3] = phys_addr & 0xff;
}
-static inline void cec_ops_inactive_source(const struct cec_msg *msg,
+static __inline__ void cec_ops_inactive_source(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
}
-static inline void cec_msg_request_active_source(struct cec_msg *msg,
+static __inline__ void cec_msg_request_active_source(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -64,7 +64,7 @@ static inline void cec_msg_request_active_source(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_ACTIVE_SOURCE : 0;
}
-static inline void cec_msg_routing_information(struct cec_msg *msg,
+static __inline__ void cec_msg_routing_information(struct cec_msg *msg,
__u16 phys_addr)
{
msg->len = 4;
@@ -74,13 +74,13 @@ static inline void cec_msg_routing_information(struct cec_msg *msg,
msg->msg[3] = phys_addr & 0xff;
}
-static inline void cec_ops_routing_information(const struct cec_msg *msg,
+static __inline__ void cec_ops_routing_information(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
}
-static inline void cec_msg_routing_change(struct cec_msg *msg,
+static __inline__ void cec_msg_routing_change(struct cec_msg *msg,
int reply,
__u16 orig_phys_addr,
__u16 new_phys_addr)
@@ -95,7 +95,7 @@ static inline void cec_msg_routing_change(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_ROUTING_INFORMATION : 0;
}
-static inline void cec_ops_routing_change(const struct cec_msg *msg,
+static __inline__ void cec_ops_routing_change(const struct cec_msg *msg,
__u16 *orig_phys_addr,
__u16 *new_phys_addr)
{
@@ -103,7 +103,7 @@ static inline void cec_ops_routing_change(const struct cec_msg *msg,
*new_phys_addr = (msg->msg[4] << 8) | msg->msg[5];
}
-static inline void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)
+static __inline__ void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)
{
msg->len = 4;
msg->msg[0] |= 0xf; /* broadcast */
@@ -112,7 +112,7 @@ static inline void cec_msg_set_stream_path(struct cec_msg *msg, __u16 phys_addr)
msg->msg[3] = phys_addr & 0xff;
}
-static inline void cec_ops_set_stream_path(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_stream_path(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
@@ -120,7 +120,7 @@ static inline void cec_ops_set_stream_path(const struct cec_msg *msg,
/* Standby Feature */
-static inline void cec_msg_standby(struct cec_msg *msg)
+static __inline__ void cec_msg_standby(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_STANDBY;
@@ -128,7 +128,7 @@ static inline void cec_msg_standby(struct cec_msg *msg)
/* One Touch Record Feature */
-static inline void cec_msg_record_off(struct cec_msg *msg, int reply)
+static __inline__ void cec_msg_record_off(struct cec_msg *msg, int reply)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_RECORD_OFF;
@@ -187,7 +187,7 @@ struct cec_op_record_src {
};
};
-static inline void cec_set_digital_service_id(__u8 *msg,
+static __inline__ void cec_set_digital_service_id(__u8 *msg,
const struct cec_op_digital_service_id *digital)
{
*msg++ = (digital->service_id_method << 7) | digital->dig_bcast_system;
@@ -224,7 +224,7 @@ static inline void cec_set_digital_service_id(__u8 *msg,
}
}
-static inline void cec_get_digital_service_id(const __u8 *msg,
+static __inline__ void cec_get_digital_service_id(const __u8 *msg,
struct cec_op_digital_service_id *digital)
{
digital->service_id_method = msg[0] >> 7;
@@ -240,14 +240,14 @@ static inline void cec_get_digital_service_id(const __u8 *msg,
digital->dvb.orig_network_id = (msg[5] << 8) | msg[6];
}
-static inline void cec_msg_record_on_own(struct cec_msg *msg)
+static __inline__ void cec_msg_record_on_own(struct cec_msg *msg)
{
msg->len = 3;
msg->msg[1] = CEC_MSG_RECORD_ON;
msg->msg[2] = CEC_OP_RECORD_SRC_OWN;
}
-static inline void cec_msg_record_on_digital(struct cec_msg *msg,
+static __inline__ void cec_msg_record_on_digital(struct cec_msg *msg,
const struct cec_op_digital_service_id *digital)
{
msg->len = 10;
@@ -256,7 +256,7 @@ static inline void cec_msg_record_on_digital(struct cec_msg *msg,
cec_set_digital_service_id(msg->msg + 3, digital);
}
-static inline void cec_msg_record_on_analog(struct cec_msg *msg,
+static __inline__ void cec_msg_record_on_analog(struct cec_msg *msg,
__u8 ana_bcast_type,
__u16 ana_freq,
__u8 bcast_system)
@@ -270,7 +270,7 @@ static inline void cec_msg_record_on_analog(struct cec_msg *msg,
msg->msg[6] = bcast_system;
}
-static inline void cec_msg_record_on_plug(struct cec_msg *msg,
+static __inline__ void cec_msg_record_on_plug(struct cec_msg *msg,
__u8 plug)
{
msg->len = 4;
@@ -279,7 +279,7 @@ static inline void cec_msg_record_on_plug(struct cec_msg *msg,
msg->msg[3] = plug;
}
-static inline void cec_msg_record_on_phys_addr(struct cec_msg *msg,
+static __inline__ void cec_msg_record_on_phys_addr(struct cec_msg *msg,
__u16 phys_addr)
{
msg->len = 5;
@@ -289,7 +289,7 @@ static inline void cec_msg_record_on_phys_addr(struct cec_msg *msg,
msg->msg[4] = phys_addr & 0xff;
}
-static inline void cec_msg_record_on(struct cec_msg *msg,
+static __inline__ void cec_msg_record_on(struct cec_msg *msg,
int reply,
const struct cec_op_record_src *rec_src)
{
@@ -317,7 +317,7 @@ static inline void cec_msg_record_on(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
}
-static inline void cec_ops_record_on(const struct cec_msg *msg,
+static __inline__ void cec_ops_record_on(const struct cec_msg *msg,
struct cec_op_record_src *rec_src)
{
rec_src->type = msg->msg[2];
@@ -343,20 +343,20 @@ static inline void cec_ops_record_on(const struct cec_msg *msg,
}
}
-static inline void cec_msg_record_status(struct cec_msg *msg, __u8 rec_status)
+static __inline__ void cec_msg_record_status(struct cec_msg *msg, __u8 rec_status)
{
msg->len = 3;
msg->msg[1] = CEC_MSG_RECORD_STATUS;
msg->msg[2] = rec_status;
}
-static inline void cec_ops_record_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_record_status(const struct cec_msg *msg,
__u8 *rec_status)
{
*rec_status = msg->msg[2];
}
-static inline void cec_msg_record_tv_screen(struct cec_msg *msg,
+static __inline__ void cec_msg_record_tv_screen(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -366,7 +366,7 @@ static inline void cec_msg_record_tv_screen(struct cec_msg *msg,
/* Timer Programming Feature */
-static inline void cec_msg_timer_status(struct cec_msg *msg,
+static __inline__ void cec_msg_timer_status(struct cec_msg *msg,
__u8 timer_overlap_warning,
__u8 media_info,
__u8 prog_info,
@@ -389,7 +389,7 @@ static inline void cec_msg_timer_status(struct cec_msg *msg,
}
}
-static inline void cec_ops_timer_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_timer_status(const struct cec_msg *msg,
__u8 *timer_overlap_warning,
__u8 *media_info,
__u8 *prog_info,
@@ -416,7 +416,7 @@ static inline void cec_ops_timer_status(const struct cec_msg *msg,
}
}
-static inline void cec_msg_timer_cleared_status(struct cec_msg *msg,
+static __inline__ void cec_msg_timer_cleared_status(struct cec_msg *msg,
__u8 timer_cleared_status)
{
msg->len = 3;
@@ -424,13 +424,13 @@ static inline void cec_msg_timer_cleared_status(struct cec_msg *msg,
msg->msg[2] = timer_cleared_status;
}
-static inline void cec_ops_timer_cleared_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_timer_cleared_status(const struct cec_msg *msg,
__u8 *timer_cleared_status)
{
*timer_cleared_status = msg->msg[2];
}
-static inline void cec_msg_clear_analogue_timer(struct cec_msg *msg,
+static __inline__ void cec_msg_clear_analogue_timer(struct cec_msg *msg,
int reply,
__u8 day,
__u8 month,
@@ -460,7 +460,7 @@ static inline void cec_msg_clear_analogue_timer(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
}
-static inline void cec_ops_clear_analogue_timer(const struct cec_msg *msg,
+static __inline__ void cec_ops_clear_analogue_timer(const struct cec_msg *msg,
__u8 *day,
__u8 *month,
__u8 *start_hr,
@@ -485,7 +485,7 @@ static inline void cec_ops_clear_analogue_timer(const struct cec_msg *msg,
*bcast_system = msg->msg[12];
}
-static inline void cec_msg_clear_digital_timer(struct cec_msg *msg,
+static __inline__ void cec_msg_clear_digital_timer(struct cec_msg *msg,
int reply,
__u8 day,
__u8 month,
@@ -510,7 +510,7 @@ static inline void cec_msg_clear_digital_timer(struct cec_msg *msg,
cec_set_digital_service_id(msg->msg + 9, digital);
}
-static inline void cec_ops_clear_digital_timer(const struct cec_msg *msg,
+static __inline__ void cec_ops_clear_digital_timer(const struct cec_msg *msg,
__u8 *day,
__u8 *month,
__u8 *start_hr,
@@ -531,7 +531,7 @@ static inline void cec_ops_clear_digital_timer(const struct cec_msg *msg,
cec_get_digital_service_id(msg->msg + 9, digital);
}
-static inline void cec_msg_clear_ext_timer(struct cec_msg *msg,
+static __inline__ void cec_msg_clear_ext_timer(struct cec_msg *msg,
int reply,
__u8 day,
__u8 month,
@@ -561,7 +561,7 @@ static inline void cec_msg_clear_ext_timer(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
}
-static inline void cec_ops_clear_ext_timer(const struct cec_msg *msg,
+static __inline__ void cec_ops_clear_ext_timer(const struct cec_msg *msg,
__u8 *day,
__u8 *month,
__u8 *start_hr,
@@ -586,7 +586,7 @@ static inline void cec_ops_clear_ext_timer(const struct cec_msg *msg,
*phys_addr = (msg->msg[11] << 8) | msg->msg[12];
}
-static inline void cec_msg_set_analogue_timer(struct cec_msg *msg,
+static __inline__ void cec_msg_set_analogue_timer(struct cec_msg *msg,
int reply,
__u8 day,
__u8 month,
@@ -616,7 +616,7 @@ static inline void cec_msg_set_analogue_timer(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
}
-static inline void cec_ops_set_analogue_timer(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_analogue_timer(const struct cec_msg *msg,
__u8 *day,
__u8 *month,
__u8 *start_hr,
@@ -641,7 +641,7 @@ static inline void cec_ops_set_analogue_timer(const struct cec_msg *msg,
*bcast_system = msg->msg[12];
}
-static inline void cec_msg_set_digital_timer(struct cec_msg *msg,
+static __inline__ void cec_msg_set_digital_timer(struct cec_msg *msg,
int reply,
__u8 day,
__u8 month,
@@ -666,7 +666,7 @@ static inline void cec_msg_set_digital_timer(struct cec_msg *msg,
cec_set_digital_service_id(msg->msg + 9, digital);
}
-static inline void cec_ops_set_digital_timer(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_digital_timer(const struct cec_msg *msg,
__u8 *day,
__u8 *month,
__u8 *start_hr,
@@ -687,7 +687,7 @@ static inline void cec_ops_set_digital_timer(const struct cec_msg *msg,
cec_get_digital_service_id(msg->msg + 9, digital);
}
-static inline void cec_msg_set_ext_timer(struct cec_msg *msg,
+static __inline__ void cec_msg_set_ext_timer(struct cec_msg *msg,
int reply,
__u8 day,
__u8 month,
@@ -717,7 +717,7 @@ static inline void cec_msg_set_ext_timer(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
}
-static inline void cec_ops_set_ext_timer(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_ext_timer(const struct cec_msg *msg,
__u8 *day,
__u8 *month,
__u8 *start_hr,
@@ -742,7 +742,7 @@ static inline void cec_ops_set_ext_timer(const struct cec_msg *msg,
*phys_addr = (msg->msg[11] << 8) | msg->msg[12];
}
-static inline void cec_msg_set_timer_program_title(struct cec_msg *msg,
+static __inline__ void cec_msg_set_timer_program_title(struct cec_msg *msg,
const char *prog_title)
{
unsigned int len = strlen(prog_title);
@@ -754,7 +754,7 @@ static inline void cec_msg_set_timer_program_title(struct cec_msg *msg,
memcpy(msg->msg + 2, prog_title, len);
}
-static inline void cec_ops_set_timer_program_title(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_timer_program_title(const struct cec_msg *msg,
char *prog_title)
{
unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
@@ -766,20 +766,20 @@ static inline void cec_ops_set_timer_program_title(const struct cec_msg *msg,
}
/* System Information Feature */
-static inline void cec_msg_cec_version(struct cec_msg *msg, __u8 cec_version)
+static __inline__ void cec_msg_cec_version(struct cec_msg *msg, __u8 cec_version)
{
msg->len = 3;
msg->msg[1] = CEC_MSG_CEC_VERSION;
msg->msg[2] = cec_version;
}
-static inline void cec_ops_cec_version(const struct cec_msg *msg,
+static __inline__ void cec_ops_cec_version(const struct cec_msg *msg,
__u8 *cec_version)
{
*cec_version = msg->msg[2];
}
-static inline void cec_msg_get_cec_version(struct cec_msg *msg,
+static __inline__ void cec_msg_get_cec_version(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -787,7 +787,7 @@ static inline void cec_msg_get_cec_version(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_CEC_VERSION : 0;
}
-static inline void cec_msg_report_physical_addr(struct cec_msg *msg,
+static __inline__ void cec_msg_report_physical_addr(struct cec_msg *msg,
__u16 phys_addr, __u8 prim_devtype)
{
msg->len = 5;
@@ -798,14 +798,14 @@ static inline void cec_msg_report_physical_addr(struct cec_msg *msg,
msg->msg[4] = prim_devtype;
}
-static inline void cec_ops_report_physical_addr(const struct cec_msg *msg,
+static __inline__ void cec_ops_report_physical_addr(const struct cec_msg *msg,
__u16 *phys_addr, __u8 *prim_devtype)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
*prim_devtype = msg->msg[4];
}
-static inline void cec_msg_give_physical_addr(struct cec_msg *msg,
+static __inline__ void cec_msg_give_physical_addr(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -813,7 +813,7 @@ static inline void cec_msg_give_physical_addr(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_REPORT_PHYSICAL_ADDR : 0;
}
-static inline void cec_msg_set_menu_language(struct cec_msg *msg,
+static __inline__ void cec_msg_set_menu_language(struct cec_msg *msg,
const char *language)
{
msg->len = 5;
@@ -822,14 +822,14 @@ static inline void cec_msg_set_menu_language(struct cec_msg *msg,
memcpy(msg->msg + 2, language, 3);
}
-static inline void cec_ops_set_menu_language(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_menu_language(const struct cec_msg *msg,
char *language)
{
memcpy(language, msg->msg + 2, 3);
language[3] = '\0';
}
-static inline void cec_msg_get_menu_language(struct cec_msg *msg,
+static __inline__ void cec_msg_get_menu_language(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -845,7 +845,7 @@ static inline void cec_msg_get_menu_language(struct cec_msg *msg,
* in the future, then this function needs to be adapted or a new function
* should be added.
*/
-static inline void cec_msg_report_features(struct cec_msg *msg,
+static __inline__ void cec_msg_report_features(struct cec_msg *msg,
__u8 cec_version, __u8 all_device_types,
__u8 rc_profile, __u8 dev_features)
{
@@ -858,7 +858,7 @@ static inline void cec_msg_report_features(struct cec_msg *msg,
msg->msg[5] = dev_features;
}
-static inline void cec_ops_report_features(const struct cec_msg *msg,
+static __inline__ void cec_ops_report_features(const struct cec_msg *msg,
__u8 *cec_version, __u8 *all_device_types,
const __u8 **rc_profile, const __u8 **dev_features)
{
@@ -879,7 +879,7 @@ static inline void cec_ops_report_features(const struct cec_msg *msg,
*rc_profile = *dev_features = NULL;
}
-static inline void cec_msg_give_features(struct cec_msg *msg,
+static __inline__ void cec_msg_give_features(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -888,7 +888,7 @@ static inline void cec_msg_give_features(struct cec_msg *msg,
}
/* Deck Control Feature */
-static inline void cec_msg_deck_control(struct cec_msg *msg,
+static __inline__ void cec_msg_deck_control(struct cec_msg *msg,
__u8 deck_control_mode)
{
msg->len = 3;
@@ -896,13 +896,13 @@ static inline void cec_msg_deck_control(struct cec_msg *msg,
msg->msg[2] = deck_control_mode;
}
-static inline void cec_ops_deck_control(const struct cec_msg *msg,
+static __inline__ void cec_ops_deck_control(const struct cec_msg *msg,
__u8 *deck_control_mode)
{
*deck_control_mode = msg->msg[2];
}
-static inline void cec_msg_deck_status(struct cec_msg *msg,
+static __inline__ void cec_msg_deck_status(struct cec_msg *msg,
__u8 deck_info)
{
msg->len = 3;
@@ -910,13 +910,13 @@ static inline void cec_msg_deck_status(struct cec_msg *msg,
msg->msg[2] = deck_info;
}
-static inline void cec_ops_deck_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_deck_status(const struct cec_msg *msg,
__u8 *deck_info)
{
*deck_info = msg->msg[2];
}
-static inline void cec_msg_give_deck_status(struct cec_msg *msg,
+static __inline__ void cec_msg_give_deck_status(struct cec_msg *msg,
int reply,
__u8 status_req)
{
@@ -926,13 +926,13 @@ static inline void cec_msg_give_deck_status(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_DECK_STATUS : 0;
}
-static inline void cec_ops_give_deck_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_give_deck_status(const struct cec_msg *msg,
__u8 *status_req)
{
*status_req = msg->msg[2];
}
-static inline void cec_msg_play(struct cec_msg *msg,
+static __inline__ void cec_msg_play(struct cec_msg *msg,
__u8 play_mode)
{
msg->len = 3;
@@ -940,7 +940,7 @@ static inline void cec_msg_play(struct cec_msg *msg,
msg->msg[2] = play_mode;
}
-static inline void cec_ops_play(const struct cec_msg *msg,
+static __inline__ void cec_ops_play(const struct cec_msg *msg,
__u8 *play_mode)
{
*play_mode = msg->msg[2];
@@ -962,7 +962,7 @@ struct cec_op_tuner_device_info {
};
};
-static inline void cec_msg_tuner_device_status_analog(struct cec_msg *msg,
+static __inline__ void cec_msg_tuner_device_status_analog(struct cec_msg *msg,
__u8 rec_flag,
__u8 tuner_display_info,
__u8 ana_bcast_type,
@@ -978,7 +978,7 @@ static inline void cec_msg_tuner_device_status_analog(struct cec_msg *msg,
msg->msg[6] = bcast_system;
}
-static inline void cec_msg_tuner_device_status_digital(struct cec_msg *msg,
+static __inline__ void cec_msg_tuner_device_status_digital(struct cec_msg *msg,
__u8 rec_flag, __u8 tuner_display_info,
const struct cec_op_digital_service_id *digital)
{
@@ -988,7 +988,7 @@ static inline void cec_msg_tuner_device_status_digital(struct cec_msg *msg,
cec_set_digital_service_id(msg->msg + 3, digital);
}
-static inline void cec_msg_tuner_device_status(struct cec_msg *msg,
+static __inline__ void cec_msg_tuner_device_status(struct cec_msg *msg,
const struct cec_op_tuner_device_info *tuner_dev_info)
{
if (tuner_dev_info->is_analog)
@@ -1005,7 +1005,7 @@ static inline void cec_msg_tuner_device_status(struct cec_msg *msg,
&tuner_dev_info->digital);
}
-static inline void cec_ops_tuner_device_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_tuner_device_status(const struct cec_msg *msg,
struct cec_op_tuner_device_info *tuner_dev_info)
{
tuner_dev_info->is_analog = msg->len < 10;
@@ -1020,7 +1020,7 @@ static inline void cec_ops_tuner_device_status(const struct cec_msg *msg,
cec_get_digital_service_id(msg->msg + 3, &tuner_dev_info->digital);
}
-static inline void cec_msg_give_tuner_device_status(struct cec_msg *msg,
+static __inline__ void cec_msg_give_tuner_device_status(struct cec_msg *msg,
int reply,
__u8 status_req)
{
@@ -1030,13 +1030,13 @@ static inline void cec_msg_give_tuner_device_status(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_TUNER_DEVICE_STATUS : 0;
}
-static inline void cec_ops_give_tuner_device_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_give_tuner_device_status(const struct cec_msg *msg,
__u8 *status_req)
{
*status_req = msg->msg[2];
}
-static inline void cec_msg_select_analogue_service(struct cec_msg *msg,
+static __inline__ void cec_msg_select_analogue_service(struct cec_msg *msg,
__u8 ana_bcast_type,
__u16 ana_freq,
__u8 bcast_system)
@@ -1049,7 +1049,7 @@ static inline void cec_msg_select_analogue_service(struct cec_msg *msg,
msg->msg[5] = bcast_system;
}
-static inline void cec_ops_select_analogue_service(const struct cec_msg *msg,
+static __inline__ void cec_ops_select_analogue_service(const struct cec_msg *msg,
__u8 *ana_bcast_type,
__u16 *ana_freq,
__u8 *bcast_system)
@@ -1059,7 +1059,7 @@ static inline void cec_ops_select_analogue_service(const struct cec_msg *msg,
*bcast_system = msg->msg[5];
}
-static inline void cec_msg_select_digital_service(struct cec_msg *msg,
+static __inline__ void cec_msg_select_digital_service(struct cec_msg *msg,
const struct cec_op_digital_service_id *digital)
{
msg->len = 9;
@@ -1067,19 +1067,19 @@ static inline void cec_msg_select_digital_service(struct cec_msg *msg,
cec_set_digital_service_id(msg->msg + 2, digital);
}
-static inline void cec_ops_select_digital_service(const struct cec_msg *msg,
+static __inline__ void cec_ops_select_digital_service(const struct cec_msg *msg,
struct cec_op_digital_service_id *digital)
{
cec_get_digital_service_id(msg->msg + 2, digital);
}
-static inline void cec_msg_tuner_step_decrement(struct cec_msg *msg)
+static __inline__ void cec_msg_tuner_step_decrement(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_TUNER_STEP_DECREMENT;
}
-static inline void cec_msg_tuner_step_increment(struct cec_msg *msg)
+static __inline__ void cec_msg_tuner_step_increment(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_TUNER_STEP_INCREMENT;
@@ -1087,7 +1087,7 @@ static inline void cec_msg_tuner_step_increment(struct cec_msg *msg)
/* Vendor Specific Commands Feature */
-static inline void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id)
+static __inline__ void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id)
{
msg->len = 5;
msg->msg[0] |= 0xf; /* broadcast */
@@ -1097,13 +1097,13 @@ static inline void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id
msg->msg[4] = vendor_id & 0xff;
}
-static inline void cec_ops_device_vendor_id(const struct cec_msg *msg,
+static __inline__ void cec_ops_device_vendor_id(const struct cec_msg *msg,
__u32 *vendor_id)
{
*vendor_id = (msg->msg[2] << 16) | (msg->msg[3] << 8) | msg->msg[4];
}
-static inline void cec_msg_give_device_vendor_id(struct cec_msg *msg,
+static __inline__ void cec_msg_give_device_vendor_id(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1111,7 +1111,7 @@ static inline void cec_msg_give_device_vendor_id(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_DEVICE_VENDOR_ID : 0;
}
-static inline void cec_msg_vendor_command(struct cec_msg *msg,
+static __inline__ void cec_msg_vendor_command(struct cec_msg *msg,
__u8 size, const __u8 *vendor_cmd)
{
if (size > 14)
@@ -1121,7 +1121,7 @@ static inline void cec_msg_vendor_command(struct cec_msg *msg,
memcpy(msg->msg + 2, vendor_cmd, size);
}
-static inline void cec_ops_vendor_command(const struct cec_msg *msg,
+static __inline__ void cec_ops_vendor_command(const struct cec_msg *msg,
__u8 *size,
const __u8 **vendor_cmd)
{
@@ -1132,7 +1132,7 @@ static inline void cec_ops_vendor_command(const struct cec_msg *msg,
*vendor_cmd = msg->msg + 2;
}
-static inline void cec_msg_vendor_command_with_id(struct cec_msg *msg,
+static __inline__ void cec_msg_vendor_command_with_id(struct cec_msg *msg,
__u32 vendor_id, __u8 size,
const __u8 *vendor_cmd)
{
@@ -1146,7 +1146,7 @@ static inline void cec_msg_vendor_command_with_id(struct cec_msg *msg,
memcpy(msg->msg + 5, vendor_cmd, size);
}
-static inline void cec_ops_vendor_command_with_id(const struct cec_msg *msg,
+static __inline__ void cec_ops_vendor_command_with_id(const struct cec_msg *msg,
__u32 *vendor_id, __u8 *size,
const __u8 **vendor_cmd)
{
@@ -1158,7 +1158,7 @@ static inline void cec_ops_vendor_command_with_id(const struct cec_msg *msg,
*vendor_cmd = msg->msg + 5;
}
-static inline void cec_msg_vendor_remote_button_down(struct cec_msg *msg,
+static __inline__ void cec_msg_vendor_remote_button_down(struct cec_msg *msg,
__u8 size,
const __u8 *rc_code)
{
@@ -1169,7 +1169,7 @@ static inline void cec_msg_vendor_remote_button_down(struct cec_msg *msg,
memcpy(msg->msg + 2, rc_code, size);
}
-static inline void cec_ops_vendor_remote_button_down(const struct cec_msg *msg,
+static __inline__ void cec_ops_vendor_remote_button_down(const struct cec_msg *msg,
__u8 *size,
const __u8 **rc_code)
{
@@ -1180,7 +1180,7 @@ static inline void cec_ops_vendor_remote_button_down(const struct cec_msg *msg,
*rc_code = msg->msg + 2;
}
-static inline void cec_msg_vendor_remote_button_up(struct cec_msg *msg)
+static __inline__ void cec_msg_vendor_remote_button_up(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_VENDOR_REMOTE_BUTTON_UP;
@@ -1188,7 +1188,7 @@ static inline void cec_msg_vendor_remote_button_up(struct cec_msg *msg)
/* OSD Display Feature */
-static inline void cec_msg_set_osd_string(struct cec_msg *msg,
+static __inline__ void cec_msg_set_osd_string(struct cec_msg *msg,
__u8 disp_ctl,
const char *osd)
{
@@ -1202,7 +1202,7 @@ static inline void cec_msg_set_osd_string(struct cec_msg *msg,
memcpy(msg->msg + 3, osd, len);
}
-static inline void cec_ops_set_osd_string(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_osd_string(const struct cec_msg *msg,
__u8 *disp_ctl,
char *osd)
{
@@ -1217,7 +1217,7 @@ static inline void cec_ops_set_osd_string(const struct cec_msg *msg,
/* Device OSD Transfer Feature */
-static inline void cec_msg_set_osd_name(struct cec_msg *msg, const char *name)
+static __inline__ void cec_msg_set_osd_name(struct cec_msg *msg, const char *name)
{
unsigned int len = strlen(name);
@@ -1228,7 +1228,7 @@ static inline void cec_msg_set_osd_name(struct cec_msg *msg, const char *name)
memcpy(msg->msg + 2, name, len);
}
-static inline void cec_ops_set_osd_name(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_osd_name(const struct cec_msg *msg,
char *name)
{
unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
@@ -1239,7 +1239,7 @@ static inline void cec_ops_set_osd_name(const struct cec_msg *msg,
name[len] = '\0';
}
-static inline void cec_msg_give_osd_name(struct cec_msg *msg,
+static __inline__ void cec_msg_give_osd_name(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1249,7 +1249,7 @@ static inline void cec_msg_give_osd_name(struct cec_msg *msg,
/* Device Menu Control Feature */
-static inline void cec_msg_menu_status(struct cec_msg *msg,
+static __inline__ void cec_msg_menu_status(struct cec_msg *msg,
__u8 menu_state)
{
msg->len = 3;
@@ -1257,13 +1257,13 @@ static inline void cec_msg_menu_status(struct cec_msg *msg,
msg->msg[2] = menu_state;
}
-static inline void cec_ops_menu_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_menu_status(const struct cec_msg *msg,
__u8 *menu_state)
{
*menu_state = msg->msg[2];
}
-static inline void cec_msg_menu_request(struct cec_msg *msg,
+static __inline__ void cec_msg_menu_request(struct cec_msg *msg,
int reply,
__u8 menu_req)
{
@@ -1273,7 +1273,7 @@ static inline void cec_msg_menu_request(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_MENU_STATUS : 0;
}
-static inline void cec_ops_menu_request(const struct cec_msg *msg,
+static __inline__ void cec_ops_menu_request(const struct cec_msg *msg,
__u8 *menu_req)
{
*menu_req = msg->msg[2];
@@ -1293,7 +1293,7 @@ struct cec_op_ui_command {
};
};
-static inline void cec_msg_user_control_pressed(struct cec_msg *msg,
+static __inline__ void cec_msg_user_control_pressed(struct cec_msg *msg,
const struct cec_op_ui_command *ui_cmd)
{
msg->len = 3;
@@ -1323,7 +1323,7 @@ static inline void cec_msg_user_control_pressed(struct cec_msg *msg,
}
}
-static inline void cec_ops_user_control_pressed(const struct cec_msg *msg,
+static __inline__ void cec_ops_user_control_pressed(const struct cec_msg *msg,
struct cec_op_ui_command *ui_cmd)
{
ui_cmd->ui_cmd = msg->msg[2];
@@ -1352,7 +1352,7 @@ static inline void cec_ops_user_control_pressed(const struct cec_msg *msg,
}
}
-static inline void cec_msg_user_control_released(struct cec_msg *msg)
+static __inline__ void cec_msg_user_control_released(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_USER_CONTROL_RELEASED;
@@ -1361,7 +1361,7 @@ static inline void cec_msg_user_control_released(struct cec_msg *msg)
/* Remote Control Passthrough Feature */
/* Power Status Feature */
-static inline void cec_msg_report_power_status(struct cec_msg *msg,
+static __inline__ void cec_msg_report_power_status(struct cec_msg *msg,
__u8 pwr_state)
{
msg->len = 3;
@@ -1369,13 +1369,13 @@ static inline void cec_msg_report_power_status(struct cec_msg *msg,
msg->msg[2] = pwr_state;
}
-static inline void cec_ops_report_power_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_report_power_status(const struct cec_msg *msg,
__u8 *pwr_state)
{
*pwr_state = msg->msg[2];
}
-static inline void cec_msg_give_device_power_status(struct cec_msg *msg,
+static __inline__ void cec_msg_give_device_power_status(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1384,7 +1384,7 @@ static inline void cec_msg_give_device_power_status(struct cec_msg *msg,
}
/* General Protocol Messages */
-static inline void cec_msg_feature_abort(struct cec_msg *msg,
+static __inline__ void cec_msg_feature_abort(struct cec_msg *msg,
__u8 abort_msg, __u8 reason)
{
msg->len = 4;
@@ -1393,7 +1393,7 @@ static inline void cec_msg_feature_abort(struct cec_msg *msg,
msg->msg[3] = reason;
}
-static inline void cec_ops_feature_abort(const struct cec_msg *msg,
+static __inline__ void cec_ops_feature_abort(const struct cec_msg *msg,
__u8 *abort_msg, __u8 *reason)
{
*abort_msg = msg->msg[2];
@@ -1401,7 +1401,7 @@ static inline void cec_ops_feature_abort(const struct cec_msg *msg,
}
/* This changes the current message into a feature abort message */
-static inline void cec_msg_reply_feature_abort(struct cec_msg *msg, __u8 reason)
+static __inline__ void cec_msg_reply_feature_abort(struct cec_msg *msg, __u8 reason)
{
cec_msg_set_reply_to(msg, msg);
msg->len = 4;
@@ -1410,7 +1410,7 @@ static inline void cec_msg_reply_feature_abort(struct cec_msg *msg, __u8 reason)
msg->msg[1] = CEC_MSG_FEATURE_ABORT;
}
-static inline void cec_msg_abort(struct cec_msg *msg)
+static __inline__ void cec_msg_abort(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_ABORT;
@@ -1418,7 +1418,7 @@ static inline void cec_msg_abort(struct cec_msg *msg)
/* System Audio Control Feature */
-static inline void cec_msg_report_audio_status(struct cec_msg *msg,
+static __inline__ void cec_msg_report_audio_status(struct cec_msg *msg,
__u8 aud_mute_status,
__u8 aud_vol_status)
{
@@ -1427,7 +1427,7 @@ static inline void cec_msg_report_audio_status(struct cec_msg *msg,
msg->msg[2] = (aud_mute_status << 7) | (aud_vol_status & 0x7f);
}
-static inline void cec_ops_report_audio_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_report_audio_status(const struct cec_msg *msg,
__u8 *aud_mute_status,
__u8 *aud_vol_status)
{
@@ -1435,7 +1435,7 @@ static inline void cec_ops_report_audio_status(const struct cec_msg *msg,
*aud_vol_status = msg->msg[2] & 0x7f;
}
-static inline void cec_msg_give_audio_status(struct cec_msg *msg,
+static __inline__ void cec_msg_give_audio_status(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1443,7 +1443,7 @@ static inline void cec_msg_give_audio_status(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_REPORT_AUDIO_STATUS : 0;
}
-static inline void cec_msg_set_system_audio_mode(struct cec_msg *msg,
+static __inline__ void cec_msg_set_system_audio_mode(struct cec_msg *msg,
__u8 sys_aud_status)
{
msg->len = 3;
@@ -1451,13 +1451,13 @@ static inline void cec_msg_set_system_audio_mode(struct cec_msg *msg,
msg->msg[2] = sys_aud_status;
}
-static inline void cec_ops_set_system_audio_mode(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_system_audio_mode(const struct cec_msg *msg,
__u8 *sys_aud_status)
{
*sys_aud_status = msg->msg[2];
}
-static inline void cec_msg_system_audio_mode_request(struct cec_msg *msg,
+static __inline__ void cec_msg_system_audio_mode_request(struct cec_msg *msg,
int reply,
__u16 phys_addr)
{
@@ -1469,7 +1469,7 @@ static inline void cec_msg_system_audio_mode_request(struct cec_msg *msg,
}
-static inline void cec_ops_system_audio_mode_request(const struct cec_msg *msg,
+static __inline__ void cec_ops_system_audio_mode_request(const struct cec_msg *msg,
__u16 *phys_addr)
{
if (msg->len < 4)
@@ -1478,7 +1478,7 @@ static inline void cec_ops_system_audio_mode_request(const struct cec_msg *msg,
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
}
-static inline void cec_msg_system_audio_mode_status(struct cec_msg *msg,
+static __inline__ void cec_msg_system_audio_mode_status(struct cec_msg *msg,
__u8 sys_aud_status)
{
msg->len = 3;
@@ -1486,13 +1486,13 @@ static inline void cec_msg_system_audio_mode_status(struct cec_msg *msg,
msg->msg[2] = sys_aud_status;
}
-static inline void cec_ops_system_audio_mode_status(const struct cec_msg *msg,
+static __inline__ void cec_ops_system_audio_mode_status(const struct cec_msg *msg,
__u8 *sys_aud_status)
{
*sys_aud_status = msg->msg[2];
}
-static inline void cec_msg_give_system_audio_mode_status(struct cec_msg *msg,
+static __inline__ void cec_msg_give_system_audio_mode_status(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1500,7 +1500,7 @@ static inline void cec_msg_give_system_audio_mode_status(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_SYSTEM_AUDIO_MODE_STATUS : 0;
}
-static inline void cec_msg_report_short_audio_descriptor(struct cec_msg *msg,
+static __inline__ void cec_msg_report_short_audio_descriptor(struct cec_msg *msg,
__u8 num_descriptors,
const __u32 *descriptors)
{
@@ -1517,7 +1517,7 @@ static inline void cec_msg_report_short_audio_descriptor(struct cec_msg *msg,
}
}
-static inline void cec_ops_report_short_audio_descriptor(const struct cec_msg *msg,
+static __inline__ void cec_ops_report_short_audio_descriptor(const struct cec_msg *msg,
__u8 *num_descriptors,
__u32 *descriptors)
{
@@ -1532,7 +1532,7 @@ static inline void cec_ops_report_short_audio_descriptor(const struct cec_msg *m
msg->msg[4 + i * 3];
}
-static inline void cec_msg_request_short_audio_descriptor(struct cec_msg *msg,
+static __inline__ void cec_msg_request_short_audio_descriptor(struct cec_msg *msg,
int reply,
__u8 num_descriptors,
const __u8 *audio_format_id,
@@ -1550,7 +1550,7 @@ static inline void cec_msg_request_short_audio_descriptor(struct cec_msg *msg,
(audio_format_code[i] & 0x3f);
}
-static inline void cec_ops_request_short_audio_descriptor(const struct cec_msg *msg,
+static __inline__ void cec_ops_request_short_audio_descriptor(const struct cec_msg *msg,
__u8 *num_descriptors,
__u8 *audio_format_id,
__u8 *audio_format_code)
@@ -1568,7 +1568,7 @@ static inline void cec_ops_request_short_audio_descriptor(const struct cec_msg *
/* Audio Rate Control Feature */
-static inline void cec_msg_set_audio_rate(struct cec_msg *msg,
+static __inline__ void cec_msg_set_audio_rate(struct cec_msg *msg,
__u8 audio_rate)
{
msg->len = 3;
@@ -1576,7 +1576,7 @@ static inline void cec_msg_set_audio_rate(struct cec_msg *msg,
msg->msg[2] = audio_rate;
}
-static inline void cec_ops_set_audio_rate(const struct cec_msg *msg,
+static __inline__ void cec_ops_set_audio_rate(const struct cec_msg *msg,
__u8 *audio_rate)
{
*audio_rate = msg->msg[2];
@@ -1584,13 +1584,13 @@ static inline void cec_ops_set_audio_rate(const struct cec_msg *msg,
/* Audio Return Channel Control Feature */
-static inline void cec_msg_report_arc_initiated(struct cec_msg *msg)
+static __inline__ void cec_msg_report_arc_initiated(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_REPORT_ARC_INITIATED;
}
-static inline void cec_msg_initiate_arc(struct cec_msg *msg,
+static __inline__ void cec_msg_initiate_arc(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1598,7 +1598,7 @@ static inline void cec_msg_initiate_arc(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_REPORT_ARC_INITIATED : 0;
}
-static inline void cec_msg_request_arc_initiation(struct cec_msg *msg,
+static __inline__ void cec_msg_request_arc_initiation(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1606,13 +1606,13 @@ static inline void cec_msg_request_arc_initiation(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_INITIATE_ARC : 0;
}
-static inline void cec_msg_report_arc_terminated(struct cec_msg *msg)
+static __inline__ void cec_msg_report_arc_terminated(struct cec_msg *msg)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_REPORT_ARC_TERMINATED;
}
-static inline void cec_msg_terminate_arc(struct cec_msg *msg,
+static __inline__ void cec_msg_terminate_arc(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1620,7 +1620,7 @@ static inline void cec_msg_terminate_arc(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_REPORT_ARC_TERMINATED : 0;
}
-static inline void cec_msg_request_arc_termination(struct cec_msg *msg,
+static __inline__ void cec_msg_request_arc_termination(struct cec_msg *msg,
int reply)
{
msg->len = 2;
@@ -1631,7 +1631,7 @@ static inline void cec_msg_request_arc_termination(struct cec_msg *msg,
/* Dynamic Audio Lipsync Feature */
/* Only for CEC 2.0 and up */
-static inline void cec_msg_report_current_latency(struct cec_msg *msg,
+static __inline__ void cec_msg_report_current_latency(struct cec_msg *msg,
__u16 phys_addr,
__u8 video_latency,
__u8 low_latency_mode,
@@ -1649,7 +1649,7 @@ static inline void cec_msg_report_current_latency(struct cec_msg *msg,
msg->msg[msg->len++] = audio_out_delay;
}
-static inline void cec_ops_report_current_latency(const struct cec_msg *msg,
+static __inline__ void cec_ops_report_current_latency(const struct cec_msg *msg,
__u16 *phys_addr,
__u8 *video_latency,
__u8 *low_latency_mode,
@@ -1666,7 +1666,7 @@ static inline void cec_ops_report_current_latency(const struct cec_msg *msg,
*audio_out_delay = 0;
}
-static inline void cec_msg_request_current_latency(struct cec_msg *msg,
+static __inline__ void cec_msg_request_current_latency(struct cec_msg *msg,
int reply,
__u16 phys_addr)
{
@@ -1678,7 +1678,7 @@ static inline void cec_msg_request_current_latency(struct cec_msg *msg,
msg->reply = reply ? CEC_MSG_REPORT_CURRENT_LATENCY : 0;
}
-static inline void cec_ops_request_current_latency(const struct cec_msg *msg,
+static __inline__ void cec_ops_request_current_latency(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
@@ -1686,7 +1686,7 @@ static inline void cec_ops_request_current_latency(const struct cec_msg *msg,
/* Capability Discovery and Control Feature */
-static inline void cec_msg_cdc_hec_inquire_state(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hec_inquire_state(struct cec_msg *msg,
__u16 phys_addr1,
__u16 phys_addr2)
{
@@ -1701,7 +1701,7 @@ static inline void cec_msg_cdc_hec_inquire_state(struct cec_msg *msg,
msg->msg[8] = phys_addr2 & 0xff;
}
-static inline void cec_ops_cdc_hec_inquire_state(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_inquire_state(const struct cec_msg *msg,
__u16 *phys_addr,
__u16 *phys_addr1,
__u16 *phys_addr2)
@@ -1711,7 +1711,7 @@ static inline void cec_ops_cdc_hec_inquire_state(const struct cec_msg *msg,
*phys_addr2 = (msg->msg[7] << 8) | msg->msg[8];
}
-static inline void cec_msg_cdc_hec_report_state(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hec_report_state(struct cec_msg *msg,
__u16 target_phys_addr,
__u8 hec_func_state,
__u8 host_func_state,
@@ -1737,7 +1737,7 @@ static inline void cec_msg_cdc_hec_report_state(struct cec_msg *msg,
}
}
-static inline void cec_ops_cdc_hec_report_state(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_report_state(const struct cec_msg *msg,
__u16 *phys_addr,
__u16 *target_phys_addr,
__u8 *hec_func_state,
@@ -1757,7 +1757,7 @@ static inline void cec_ops_cdc_hec_report_state(const struct cec_msg *msg,
*hec_field = *has_field ? ((msg->msg[8] << 8) | msg->msg[9]) : 0;
}
-static inline void cec_msg_cdc_hec_set_state(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hec_set_state(struct cec_msg *msg,
__u16 phys_addr1,
__u16 phys_addr2,
__u8 hec_set_state,
@@ -1789,7 +1789,7 @@ static inline void cec_msg_cdc_hec_set_state(struct cec_msg *msg,
}
}
-static inline void cec_ops_cdc_hec_set_state(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_set_state(const struct cec_msg *msg,
__u16 *phys_addr,
__u16 *phys_addr1,
__u16 *phys_addr2,
@@ -1811,7 +1811,7 @@ static inline void cec_ops_cdc_hec_set_state(const struct cec_msg *msg,
*phys_addr5 = (msg->msg[14] << 8) | msg->msg[15];
}
-static inline void cec_msg_cdc_hec_set_state_adjacent(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hec_set_state_adjacent(struct cec_msg *msg,
__u16 phys_addr1,
__u8 hec_set_state)
{
@@ -1825,7 +1825,7 @@ static inline void cec_msg_cdc_hec_set_state_adjacent(struct cec_msg *msg,
msg->msg[7] = hec_set_state;
}
-static inline void cec_ops_cdc_hec_set_state_adjacent(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_set_state_adjacent(const struct cec_msg *msg,
__u16 *phys_addr,
__u16 *phys_addr1,
__u8 *hec_set_state)
@@ -1835,7 +1835,7 @@ static inline void cec_ops_cdc_hec_set_state_adjacent(const struct cec_msg *msg,
*hec_set_state = msg->msg[7];
}
-static inline void cec_msg_cdc_hec_request_deactivation(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hec_request_deactivation(struct cec_msg *msg,
__u16 phys_addr1,
__u16 phys_addr2,
__u16 phys_addr3)
@@ -1853,7 +1853,7 @@ static inline void cec_msg_cdc_hec_request_deactivation(struct cec_msg *msg,
msg->msg[10] = phys_addr3 & 0xff;
}
-static inline void cec_ops_cdc_hec_request_deactivation(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_request_deactivation(const struct cec_msg *msg,
__u16 *phys_addr,
__u16 *phys_addr1,
__u16 *phys_addr2,
@@ -1865,7 +1865,7 @@ static inline void cec_ops_cdc_hec_request_deactivation(const struct cec_msg *ms
*phys_addr3 = (msg->msg[9] << 8) | msg->msg[10];
}
-static inline void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)
+static __inline__ void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)
{
msg->len = 5;
msg->msg[0] |= 0xf; /* broadcast */
@@ -1874,13 +1874,13 @@ static inline void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)
msg->msg[4] = CEC_MSG_CDC_HEC_NOTIFY_ALIVE;
}
-static inline void cec_ops_cdc_hec_notify_alive(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_notify_alive(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
}
-static inline void cec_msg_cdc_hec_discover(struct cec_msg *msg)
+static __inline__ void cec_msg_cdc_hec_discover(struct cec_msg *msg)
{
msg->len = 5;
msg->msg[0] |= 0xf; /* broadcast */
@@ -1889,13 +1889,13 @@ static inline void cec_msg_cdc_hec_discover(struct cec_msg *msg)
msg->msg[4] = CEC_MSG_CDC_HEC_DISCOVER;
}
-static inline void cec_ops_cdc_hec_discover(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hec_discover(const struct cec_msg *msg,
__u16 *phys_addr)
{
*phys_addr = (msg->msg[2] << 8) | msg->msg[3];
}
-static inline void cec_msg_cdc_hpd_set_state(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hpd_set_state(struct cec_msg *msg,
__u8 input_port,
__u8 hpd_state)
{
@@ -1907,7 +1907,7 @@ static inline void cec_msg_cdc_hpd_set_state(struct cec_msg *msg,
msg->msg[5] = (input_port << 4) | hpd_state;
}
-static inline void cec_ops_cdc_hpd_set_state(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hpd_set_state(const struct cec_msg *msg,
__u16 *phys_addr,
__u8 *input_port,
__u8 *hpd_state)
@@ -1917,7 +1917,7 @@ static inline void cec_ops_cdc_hpd_set_state(const struct cec_msg *msg,
*hpd_state = msg->msg[5] & 0xf;
}
-static inline void cec_msg_cdc_hpd_report_state(struct cec_msg *msg,
+static __inline__ void cec_msg_cdc_hpd_report_state(struct cec_msg *msg,
__u8 hpd_state,
__u8 hpd_error)
{
@@ -1929,7 +1929,7 @@ static inline void cec_msg_cdc_hpd_report_state(struct cec_msg *msg,
msg->msg[5] = (hpd_state << 4) | hpd_error;
}
-static inline void cec_ops_cdc_hpd_report_state(const struct cec_msg *msg,
+static __inline__ void cec_ops_cdc_hpd_report_state(const struct cec_msg *msg,
__u16 *phys_addr,
__u8 *hpd_state,
__u8 *hpd_error)
diff --git a/include/linux/cec.h b/include/linux/cec.h
index 097fcd81..460bbc08 100644
--- a/include/linux/cec.h
+++ b/include/linux/cec.h
@@ -75,7 +75,7 @@ struct cec_msg {
* cec_msg_initiator - return the initiator's logical address.
* @msg: the message structure
*/
-static inline __u8 cec_msg_initiator(const struct cec_msg *msg)
+static __inline__ __u8 cec_msg_initiator(const struct cec_msg *msg)
{
return msg->msg[0] >> 4;
}
@@ -84,7 +84,7 @@ static inline __u8 cec_msg_initiator(const struct cec_msg *msg)
* cec_msg_destination - return the destination's logical address.
* @msg: the message structure
*/
-static inline __u8 cec_msg_destination(const struct cec_msg *msg)
+static __inline__ __u8 cec_msg_destination(const struct cec_msg *msg)
{
return msg->msg[0] & 0xf;
}
@@ -93,7 +93,7 @@ static inline __u8 cec_msg_destination(const struct cec_msg *msg)
* cec_msg_opcode - return the opcode of the message, -1 for poll
* @msg: the message structure
*/
-static inline int cec_msg_opcode(const struct cec_msg *msg)
+static __inline__ int cec_msg_opcode(const struct cec_msg *msg)
{
return msg->len > 1 ? msg->msg[1] : -1;
}
@@ -102,7 +102,7 @@ static inline int cec_msg_opcode(const struct cec_msg *msg)
* cec_msg_is_broadcast - return true if this is a broadcast message.
* @msg: the message structure
*/
-static inline int cec_msg_is_broadcast(const struct cec_msg *msg)
+static __inline__ int cec_msg_is_broadcast(const struct cec_msg *msg)
{
return (msg->msg[0] & 0xf) == 0xf;
}
@@ -116,7 +116,7 @@ static inline int cec_msg_is_broadcast(const struct cec_msg *msg)
* The whole structure is zeroed, the len field is set to 1 (i.e. a poll
* message) and the initiator and destination are filled in.
*/
-static inline void cec_msg_init(struct cec_msg *msg,
+static __inline__ void cec_msg_init(struct cec_msg *msg,
__u8 initiator, __u8 destination)
{
memset(msg, 0, sizeof(*msg));
@@ -133,7 +133,7 @@ static inline void cec_msg_init(struct cec_msg *msg,
* orig destination. Note that msg and orig may be the same pointer, in which
* case the change is done in place.
*/
-static inline void cec_msg_set_reply_to(struct cec_msg *msg,
+static __inline__ void cec_msg_set_reply_to(struct cec_msg *msg,
struct cec_msg *orig)
{
/* The destination becomes the initiator and vice versa */
@@ -157,7 +157,7 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg,
#define CEC_RX_STATUS_TIMEOUT (1 << 1)
#define CEC_RX_STATUS_FEATURE_ABORT (1 << 2)
-static inline int cec_msg_status_is_ok(const struct cec_msg *msg)
+static __inline__ int cec_msg_status_is_ok(const struct cec_msg *msg)
{
if (msg->tx_status && !(msg->tx_status & CEC_TX_STATUS_OK))
return 0;
@@ -227,47 +227,47 @@ static inline int cec_msg_status_is_ok(const struct cec_msg *msg)
#define CEC_LOG_ADDR_MASK_SPECIFIC (1 << CEC_LOG_ADDR_SPECIFIC)
#define CEC_LOG_ADDR_MASK_UNREGISTERED (1 << CEC_LOG_ADDR_UNREGISTERED)
-static inline int cec_has_tv(__u16 log_addr_mask)
+static __inline__ int cec_has_tv(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_TV;
}
-static inline int cec_has_record(__u16 log_addr_mask)
+static __inline__ int cec_has_record(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_RECORD;
}
-static inline int cec_has_tuner(__u16 log_addr_mask)
+static __inline__ int cec_has_tuner(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_TUNER;
}
-static inline int cec_has_playback(__u16 log_addr_mask)
+static __inline__ int cec_has_playback(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_PLAYBACK;
}
-static inline int cec_has_audiosystem(__u16 log_addr_mask)
+static __inline__ int cec_has_audiosystem(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_AUDIOSYSTEM;
}
-static inline int cec_has_backup(__u16 log_addr_mask)
+static __inline__ int cec_has_backup(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_BACKUP;
}
-static inline int cec_has_specific(__u16 log_addr_mask)
+static __inline__ int cec_has_specific(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_SPECIFIC;
}
-static inline int cec_is_unregistered(__u16 log_addr_mask)
+static __inline__ int cec_is_unregistered(__u16 log_addr_mask)
{
return log_addr_mask & CEC_LOG_ADDR_MASK_UNREGISTERED;
}
-static inline int cec_is_unconfigured(__u16 log_addr_mask)
+static __inline__ int cec_is_unconfigured(__u16 log_addr_mask)
{
return log_addr_mask == 0;
}
@@ -1001,7 +1001,7 @@ struct cec_event {
/* Helper functions to identify the 'special' CEC devices */
-static inline int cec_is_2nd_tv(const struct cec_log_addrs *las)
+static __inline__ int cec_is_2nd_tv(const struct cec_log_addrs *las)
{
/*
* It is a second TV if the logical address is 14 or 15 and the
@@ -1012,7 +1012,7 @@ static inline int cec_is_2nd_tv(const struct cec_log_addrs *las)
las->primary_device_type[0] == CEC_OP_PRIM_DEVTYPE_TV;
}
-static inline int cec_is_processor(const struct cec_log_addrs *las)
+static __inline__ int cec_is_processor(const struct cec_log_addrs *las)
{
/*
* It is a processor if the logical address is 12-15 and the
@@ -1023,7 +1023,7 @@ static inline int cec_is_processor(const struct cec_log_addrs *las)
las->primary_device_type[0] == CEC_OP_PRIM_DEVTYPE_PROCESSOR;
}
-static inline int cec_is_switch(const struct cec_log_addrs *las)
+static __inline__ int cec_is_switch(const struct cec_log_addrs *las)
{
/*
* It is a switch if the logical address is 15 and the
@@ -1035,7 +1035,7 @@ static inline int cec_is_switch(const struct cec_log_addrs *las)
!(las->flags & CEC_LOG_ADDRS_FL_CDC_ONLY);
}
-static inline int cec_is_cdc_only(const struct cec_log_addrs *las)
+static __inline__ int cec_is_cdc_only(const struct cec_log_addrs *las)
{
/*
* It is a CDC-only device if the logical address is 15 and the

Privacy Policy