1 /* SPDX-License-Identifier: ((GPL-2.0 WITH Lin 1 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
2 /* 2 /*
3 * cec - HDMI Consumer Electronics Control mes 3 * cec - HDMI Consumer Electronics Control message functions
4 * 4 *
5 * Copyright 2016 Cisco Systems, Inc. and/or i 5 * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
6 */ 6 */
7 7
8 #ifndef _CEC_UAPI_FUNCS_H 8 #ifndef _CEC_UAPI_FUNCS_H
9 #define _CEC_UAPI_FUNCS_H 9 #define _CEC_UAPI_FUNCS_H
10 10
11 #include <linux/cec.h> 11 #include <linux/cec.h>
12 12
13 /* One Touch Play Feature */ 13 /* One Touch Play Feature */
14 static inline void cec_msg_active_source(struc 14 static 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] |= 0xf; /* 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;
21 } 21 }
22 22
23 static inline void cec_ops_active_source(const 23 static inline void cec_ops_active_source(const struct cec_msg *msg,
24 __u16 24 __u16 *phys_addr)
25 { 25 {
26 *phys_addr = (msg->msg[2] << 8) | msg- 26 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
27 } 27 }
28 28
29 static inline void cec_msg_image_view_on(struc 29 static inline void cec_msg_image_view_on(struct cec_msg *msg)
30 { 30 {
31 msg->len = 2; 31 msg->len = 2;
32 msg->msg[1] = CEC_MSG_IMAGE_VIEW_ON; 32 msg->msg[1] = CEC_MSG_IMAGE_VIEW_ON;
33 } 33 }
34 34
35 static inline void cec_msg_text_view_on(struct 35 static inline void cec_msg_text_view_on(struct cec_msg *msg)
36 { 36 {
37 msg->len = 2; 37 msg->len = 2;
38 msg->msg[1] = CEC_MSG_TEXT_VIEW_ON; 38 msg->msg[1] = CEC_MSG_TEXT_VIEW_ON;
39 } 39 }
40 40
41 41
42 /* Routing Control Feature */ 42 /* Routing Control Feature */
43 static inline void cec_msg_inactive_source(str 43 static inline void cec_msg_inactive_source(struct cec_msg *msg,
44 __u 44 __u16 phys_addr)
45 { 45 {
46 msg->len = 4; 46 msg->len = 4;
47 msg->msg[1] = CEC_MSG_INACTIVE_SOURCE; 47 msg->msg[1] = CEC_MSG_INACTIVE_SOURCE;
48 msg->msg[2] = phys_addr >> 8; 48 msg->msg[2] = phys_addr >> 8;
49 msg->msg[3] = phys_addr & 0xff; 49 msg->msg[3] = phys_addr & 0xff;
50 } 50 }
51 51
52 static inline void cec_ops_inactive_source(con 52 static inline void cec_ops_inactive_source(const struct cec_msg *msg,
53 __u 53 __u16 *phys_addr)
54 { 54 {
55 *phys_addr = (msg->msg[2] << 8) | msg- 55 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
56 } 56 }
57 57
58 static inline void cec_msg_request_active_sour 58 static inline void cec_msg_request_active_source(struct cec_msg *msg,
59 59 int reply)
60 { 60 {
61 msg->len = 2; 61 msg->len = 2;
62 msg->msg[0] |= 0xf; /* broadcast */ 62 msg->msg[0] |= 0xf; /* broadcast */
63 msg->msg[1] = CEC_MSG_REQUEST_ACTIVE_S 63 msg->msg[1] = CEC_MSG_REQUEST_ACTIVE_SOURCE;
64 msg->reply = reply ? CEC_MSG_ACTIVE_SO 64 msg->reply = reply ? CEC_MSG_ACTIVE_SOURCE : 0;
65 } 65 }
66 66
67 static inline void cec_msg_routing_information 67 static inline void cec_msg_routing_information(struct cec_msg *msg,
68 68 __u16 phys_addr)
69 { 69 {
70 msg->len = 4; 70 msg->len = 4;
71 msg->msg[0] |= 0xf; /* broadcast */ 71 msg->msg[0] |= 0xf; /* broadcast */
72 msg->msg[1] = CEC_MSG_ROUTING_INFORMAT 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;
75 } 75 }
76 76
77 static inline void cec_ops_routing_information 77 static inline void cec_ops_routing_information(const struct cec_msg *msg,
78 78 __u16 *phys_addr)
79 { 79 {
80 *phys_addr = (msg->msg[2] << 8) | msg- 80 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
81 } 81 }
82 82
83 static inline void cec_msg_routing_change(stru 83 static inline void cec_msg_routing_change(struct cec_msg *msg,
84 int 84 int reply,
85 __u1 85 __u16 orig_phys_addr,
86 __u1 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] |= 0xf; /* 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;
93 msg->msg[4] = new_phys_addr >> 8; 93 msg->msg[4] = new_phys_addr >> 8;
94 msg->msg[5] = new_phys_addr & 0xff; 94 msg->msg[5] = new_phys_addr & 0xff;
95 msg->reply = reply ? CEC_MSG_ROUTING_I 95 msg->reply = reply ? CEC_MSG_ROUTING_INFORMATION : 0;
96 } 96 }
97 97
98 static inline void cec_ops_routing_change(cons 98 static inline void cec_ops_routing_change(const struct cec_msg *msg,
99 __u1 99 __u16 *orig_phys_addr,
100 __u1 100 __u16 *new_phys_addr)
101 { 101 {
102 *orig_phys_addr = (msg->msg[2] << 8) | 102 *orig_phys_addr = (msg->msg[2] << 8) | msg->msg[3];
103 *new_phys_addr = (msg->msg[4] << 8) | 103 *new_phys_addr = (msg->msg[4] << 8) | msg->msg[5];
104 } 104 }
105 105
106 static inline void cec_msg_set_stream_path(str 106 static 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] |= 0xf; /* 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;
113 } 113 }
114 114
115 static inline void cec_ops_set_stream_path(con 115 static inline void cec_ops_set_stream_path(const struct cec_msg *msg,
116 __u 116 __u16 *phys_addr)
117 { 117 {
118 *phys_addr = (msg->msg[2] << 8) | msg- 118 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
119 } 119 }
120 120
121 121
122 /* Standby Feature */ 122 /* Standby Feature */
123 static inline void cec_msg_standby(struct cec_ 123 static inline void cec_msg_standby(struct cec_msg *msg)
124 { 124 {
125 msg->len = 2; 125 msg->len = 2;
126 msg->msg[1] = CEC_MSG_STANDBY; 126 msg->msg[1] = CEC_MSG_STANDBY;
127 } 127 }
128 128
129 129
130 /* One Touch Record Feature */ 130 /* One Touch Record Feature */
131 static inline void cec_msg_record_off(struct c 131 static inline void cec_msg_record_off(struct cec_msg *msg, int reply)
132 { 132 {
133 msg->len = 2; 133 msg->len = 2;
134 msg->msg[1] = CEC_MSG_RECORD_OFF; 134 msg->msg[1] = CEC_MSG_RECORD_OFF;
135 msg->reply = reply ? CEC_MSG_RECORD_ST 135 msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
136 } 136 }
137 137
138 struct cec_op_arib_data { 138 struct cec_op_arib_data {
139 __u16 transport_id; 139 __u16 transport_id;
140 __u16 service_id; 140 __u16 service_id;
141 __u16 orig_network_id; 141 __u16 orig_network_id;
142 }; 142 };
143 143
144 struct cec_op_atsc_data { 144 struct cec_op_atsc_data {
145 __u16 transport_id; 145 __u16 transport_id;
146 __u16 program_number; 146 __u16 program_number;
147 }; 147 };
148 148
149 struct cec_op_dvb_data { 149 struct cec_op_dvb_data {
150 __u16 transport_id; 150 __u16 transport_id;
151 __u16 service_id; 151 __u16 service_id;
152 __u16 orig_network_id; 152 __u16 orig_network_id;
153 }; 153 };
154 154
155 struct cec_op_channel_data { 155 struct cec_op_channel_data {
156 __u8 channel_number_fmt; 156 __u8 channel_number_fmt;
157 __u16 major; 157 __u16 major;
158 __u16 minor; 158 __u16 minor;
159 }; 159 };
160 160
161 struct cec_op_digital_service_id { 161 struct cec_op_digital_service_id {
162 __u8 service_id_method; 162 __u8 service_id_method;
163 __u8 dig_bcast_system; 163 __u8 dig_bcast_system;
164 union { 164 union {
165 struct cec_op_arib_data arib; 165 struct cec_op_arib_data arib;
166 struct cec_op_atsc_data atsc; 166 struct cec_op_atsc_data atsc;
167 struct cec_op_dvb_data dvb; 167 struct cec_op_dvb_data dvb;
168 struct cec_op_channel_data cha 168 struct cec_op_channel_data channel;
169 }; 169 };
170 }; 170 };
171 171
172 struct cec_op_record_src { 172 struct cec_op_record_src {
173 __u8 type; 173 __u8 type;
174 union { 174 union {
175 struct cec_op_digital_service_ 175 struct cec_op_digital_service_id digital;
176 struct { 176 struct {
177 __u8 ana_bcast_type; 177 __u8 ana_bcast_type;
178 __u16 ana_freq; 178 __u16 ana_freq;
179 __u8 bcast_system; 179 __u8 bcast_system;
180 } analog; 180 } analog;
181 struct { 181 struct {
182 __u8 plug; 182 __u8 plug;
183 } ext_plug; 183 } ext_plug;
184 struct { 184 struct {
185 __u16 phys_addr; 185 __u16 phys_addr;
186 } ext_phys_addr; 186 } ext_phys_addr;
187 }; 187 };
188 }; 188 };
189 189
190 static inline void cec_set_digital_service_id( 190 static inline void cec_set_digital_service_id(__u8 *msg,
191 const struct cec_op_digital_serv 191 const struct cec_op_digital_service_id *digital)
192 { 192 {
193 *msg++ = (digital->service_id_method < 193 *msg++ = (digital->service_id_method << 7) | digital->dig_bcast_system;
194 if (digital->service_id_method == CEC_ 194 if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) {
195 *msg++ = (digital->channel.cha 195 *msg++ = (digital->channel.channel_number_fmt << 2) |
196 (digital->channel.maj 196 (digital->channel.major >> 8);
197 *msg++ = digital->channel.majo 197 *msg++ = digital->channel.major & 0xff;
198 *msg++ = digital->channel.mino 198 *msg++ = digital->channel.minor >> 8;
199 *msg++ = digital->channel.mino 199 *msg++ = digital->channel.minor & 0xff;
200 *msg++ = 0; 200 *msg++ = 0;
201 *msg++ = 0; 201 *msg++ = 0;
202 return; 202 return;
203 } 203 }
204 switch (digital->dig_bcast_system) { 204 switch (digital->dig_bcast_system) {
205 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_A 205 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_GEN:
206 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_A 206 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_CABLE:
207 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_A 207 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_SAT:
208 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_A 208 case CEC_OP_DIG_SERVICE_BCAST_SYSTEM_ATSC_T:
209 *msg++ = digital->atsc.transpo 209 *msg++ = digital->atsc.transport_id >> 8;
210 *msg++ = digital->atsc.transpo 210 *msg++ = digital->atsc.transport_id & 0xff;
211 *msg++ = digital->atsc.program 211 *msg++ = digital->atsc.program_number >> 8;
212 *msg++ = digital->atsc.program 212 *msg++ = digital->atsc.program_number & 0xff;
213 *msg++ = 0; 213 *msg++ = 0;
214 *msg++ = 0; 214 *msg++ = 0;
215 break; 215 break;
216 default: 216 default:
217 *msg++ = digital->dvb.transpor 217 *msg++ = digital->dvb.transport_id >> 8;
218 *msg++ = digital->dvb.transpor 218 *msg++ = digital->dvb.transport_id & 0xff;
219 *msg++ = digital->dvb.service_ 219 *msg++ = digital->dvb.service_id >> 8;
220 *msg++ = digital->dvb.service_ 220 *msg++ = digital->dvb.service_id & 0xff;
221 *msg++ = digital->dvb.orig_net 221 *msg++ = digital->dvb.orig_network_id >> 8;
222 *msg++ = digital->dvb.orig_net 222 *msg++ = digital->dvb.orig_network_id & 0xff;
223 break; 223 break;
224 } 224 }
225 } 225 }
226 226
227 static inline void cec_get_digital_service_id( 227 static inline void cec_get_digital_service_id(const __u8 *msg,
228 struct cec_op_digital_service_id 228 struct cec_op_digital_service_id *digital)
229 { 229 {
230 digital->service_id_method = msg[0] >> 230 digital->service_id_method = msg[0] >> 7;
231 digital->dig_bcast_system = msg[0] & 0 231 digital->dig_bcast_system = msg[0] & 0x7f;
232 if (digital->service_id_method == CEC_ 232 if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) {
233 digital->channel.channel_numbe 233 digital->channel.channel_number_fmt = msg[1] >> 2;
234 digital->channel.major = ((msg 234 digital->channel.major = ((msg[1] & 3) << 6) | msg[2];
235 digital->channel.minor = (msg[ 235 digital->channel.minor = (msg[3] << 8) | msg[4];
236 return; 236 return;
237 } 237 }
238 digital->dvb.transport_id = (msg[1] << 238 digital->dvb.transport_id = (msg[1] << 8) | msg[2];
239 digital->dvb.service_id = (msg[3] << 8 239 digital->dvb.service_id = (msg[3] << 8) | msg[4];
240 digital->dvb.orig_network_id = (msg[5] 240 digital->dvb.orig_network_id = (msg[5] << 8) | msg[6];
241 } 241 }
242 242
243 static inline void cec_msg_record_on_own(struc 243 static inline void cec_msg_record_on_own(struct cec_msg *msg)
244 { 244 {
245 msg->len = 3; 245 msg->len = 3;
246 msg->msg[1] = CEC_MSG_RECORD_ON; 246 msg->msg[1] = CEC_MSG_RECORD_ON;
247 msg->msg[2] = CEC_OP_RECORD_SRC_OWN; 247 msg->msg[2] = CEC_OP_RECORD_SRC_OWN;
248 } 248 }
249 249
250 static inline void cec_msg_record_on_digital(s 250 static inline void cec_msg_record_on_digital(struct cec_msg *msg,
251 const struct cec_ 251 const struct cec_op_digital_service_id *digital)
252 { 252 {
253 msg->len = 10; 253 msg->len = 10;
254 msg->msg[1] = CEC_MSG_RECORD_ON; 254 msg->msg[1] = CEC_MSG_RECORD_ON;
255 msg->msg[2] = CEC_OP_RECORD_SRC_DIGITA 255 msg->msg[2] = CEC_OP_RECORD_SRC_DIGITAL;
256 cec_set_digital_service_id(msg->msg + 256 cec_set_digital_service_id(msg->msg + 3, digital);
257 } 257 }
258 258
259 static inline void cec_msg_record_on_analog(st 259 static inline void cec_msg_record_on_analog(struct cec_msg *msg,
260 __ 260 __u8 ana_bcast_type,
261 __ 261 __u16 ana_freq,
262 __ 262 __u8 bcast_system)
263 { 263 {
264 msg->len = 7; 264 msg->len = 7;
265 msg->msg[1] = CEC_MSG_RECORD_ON; 265 msg->msg[1] = CEC_MSG_RECORD_ON;
266 msg->msg[2] = CEC_OP_RECORD_SRC_ANALOG 266 msg->msg[2] = CEC_OP_RECORD_SRC_ANALOG;
267 msg->msg[3] = ana_bcast_type; 267 msg->msg[3] = ana_bcast_type;
268 msg->msg[4] = ana_freq >> 8; 268 msg->msg[4] = ana_freq >> 8;
269 msg->msg[5] = ana_freq & 0xff; 269 msg->msg[5] = ana_freq & 0xff;
270 msg->msg[6] = bcast_system; 270 msg->msg[6] = bcast_system;
271 } 271 }
272 272
273 static inline void cec_msg_record_on_plug(stru 273 static inline void cec_msg_record_on_plug(struct cec_msg *msg,
274 __u8 274 __u8 plug)
275 { 275 {
276 msg->len = 4; 276 msg->len = 4;
277 msg->msg[1] = CEC_MSG_RECORD_ON; 277 msg->msg[1] = CEC_MSG_RECORD_ON;
278 msg->msg[2] = CEC_OP_RECORD_SRC_EXT_PL 278 msg->msg[2] = CEC_OP_RECORD_SRC_EXT_PLUG;
279 msg->msg[3] = plug; 279 msg->msg[3] = plug;
280 } 280 }
281 281
282 static inline void cec_msg_record_on_phys_addr 282 static inline void cec_msg_record_on_phys_addr(struct cec_msg *msg,
283 283 __u16 phys_addr)
284 { 284 {
285 msg->len = 5; 285 msg->len = 5;
286 msg->msg[1] = CEC_MSG_RECORD_ON; 286 msg->msg[1] = CEC_MSG_RECORD_ON;
287 msg->msg[2] = CEC_OP_RECORD_SRC_EXT_PH 287 msg->msg[2] = CEC_OP_RECORD_SRC_EXT_PHYS_ADDR;
288 msg->msg[3] = phys_addr >> 8; 288 msg->msg[3] = phys_addr >> 8;
289 msg->msg[4] = phys_addr & 0xff; 289 msg->msg[4] = phys_addr & 0xff;
290 } 290 }
291 291
292 static inline void cec_msg_record_on(struct ce 292 static inline void cec_msg_record_on(struct cec_msg *msg,
293 int reply 293 int reply,
294 const str 294 const struct cec_op_record_src *rec_src)
295 { 295 {
296 switch (rec_src->type) { 296 switch (rec_src->type) {
297 case CEC_OP_RECORD_SRC_OWN: 297 case CEC_OP_RECORD_SRC_OWN:
298 cec_msg_record_on_own(msg); 298 cec_msg_record_on_own(msg);
299 break; 299 break;
300 case CEC_OP_RECORD_SRC_DIGITAL: 300 case CEC_OP_RECORD_SRC_DIGITAL:
301 cec_msg_record_on_digital(msg, 301 cec_msg_record_on_digital(msg, &rec_src->digital);
302 break; 302 break;
303 case CEC_OP_RECORD_SRC_ANALOG: 303 case CEC_OP_RECORD_SRC_ANALOG:
304 cec_msg_record_on_analog(msg, 304 cec_msg_record_on_analog(msg,
305 rec_s 305 rec_src->analog.ana_bcast_type,
306 rec_s 306 rec_src->analog.ana_freq,
307 rec_s 307 rec_src->analog.bcast_system);
308 break; 308 break;
309 case CEC_OP_RECORD_SRC_EXT_PLUG: 309 case CEC_OP_RECORD_SRC_EXT_PLUG:
310 cec_msg_record_on_plug(msg, re 310 cec_msg_record_on_plug(msg, rec_src->ext_plug.plug);
311 break; 311 break;
312 case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR: 312 case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR:
313 cec_msg_record_on_phys_addr(ms 313 cec_msg_record_on_phys_addr(msg,
314 re 314 rec_src->ext_phys_addr.phys_addr);
315 break; 315 break;
316 } 316 }
317 msg->reply = reply ? CEC_MSG_RECORD_ST 317 msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
318 } 318 }
319 319
320 static inline void cec_ops_record_on(const str 320 static inline void cec_ops_record_on(const struct cec_msg *msg,
321 struct ce 321 struct cec_op_record_src *rec_src)
322 { 322 {
323 rec_src->type = msg->msg[2]; 323 rec_src->type = msg->msg[2];
324 switch (rec_src->type) { 324 switch (rec_src->type) {
325 case CEC_OP_RECORD_SRC_OWN: 325 case CEC_OP_RECORD_SRC_OWN:
326 break; 326 break;
327 case CEC_OP_RECORD_SRC_DIGITAL: 327 case CEC_OP_RECORD_SRC_DIGITAL:
328 cec_get_digital_service_id(msg 328 cec_get_digital_service_id(msg->msg + 3, &rec_src->digital);
329 break; 329 break;
330 case CEC_OP_RECORD_SRC_ANALOG: 330 case CEC_OP_RECORD_SRC_ANALOG:
331 rec_src->analog.ana_bcast_type 331 rec_src->analog.ana_bcast_type = msg->msg[3];
332 rec_src->analog.ana_freq = 332 rec_src->analog.ana_freq =
333 (msg->msg[4] << 8) | m 333 (msg->msg[4] << 8) | msg->msg[5];
334 rec_src->analog.bcast_system = 334 rec_src->analog.bcast_system = msg->msg[6];
335 break; 335 break;
336 case CEC_OP_RECORD_SRC_EXT_PLUG: 336 case CEC_OP_RECORD_SRC_EXT_PLUG:
337 rec_src->ext_plug.plug = msg-> 337 rec_src->ext_plug.plug = msg->msg[3];
338 break; 338 break;
339 case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR: 339 case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR:
340 rec_src->ext_phys_addr.phys_ad 340 rec_src->ext_phys_addr.phys_addr =
341 (msg->msg[3] << 8) | m 341 (msg->msg[3] << 8) | msg->msg[4];
342 break; 342 break;
343 } 343 }
344 } 344 }
345 345
346 static inline void cec_msg_record_status(struc 346 static inline void cec_msg_record_status(struct cec_msg *msg, __u8 rec_status)
347 { 347 {
348 msg->len = 3; 348 msg->len = 3;
349 msg->msg[1] = CEC_MSG_RECORD_STATUS; 349 msg->msg[1] = CEC_MSG_RECORD_STATUS;
350 msg->msg[2] = rec_status; 350 msg->msg[2] = rec_status;
351 } 351 }
352 352
353 static inline void cec_ops_record_status(const 353 static inline void cec_ops_record_status(const struct cec_msg *msg,
354 __u8 354 __u8 *rec_status)
355 { 355 {
356 *rec_status = msg->msg[2]; 356 *rec_status = msg->msg[2];
357 } 357 }
358 358
359 static inline void cec_msg_record_tv_screen(st 359 static inline void cec_msg_record_tv_screen(struct cec_msg *msg,
360 in 360 int reply)
361 { 361 {
362 msg->len = 2; 362 msg->len = 2;
363 msg->msg[1] = CEC_MSG_RECORD_TV_SCREEN 363 msg->msg[1] = CEC_MSG_RECORD_TV_SCREEN;
364 msg->reply = reply ? CEC_MSG_RECORD_ON 364 msg->reply = reply ? CEC_MSG_RECORD_ON : 0;
365 } 365 }
366 366
367 367
368 /* Timer Programming Feature */ 368 /* Timer Programming Feature */
369 static inline void cec_msg_timer_status(struct 369 static inline void cec_msg_timer_status(struct cec_msg *msg,
370 __u8 t 370 __u8 timer_overlap_warning,
371 __u8 m 371 __u8 media_info,
372 __u8 p 372 __u8 prog_info,
373 __u8 p 373 __u8 prog_error,
374 __u8 d 374 __u8 duration_hr,
375 __u8 d 375 __u8 duration_min)
376 { 376 {
377 msg->len = 3; 377 msg->len = 3;
378 msg->msg[1] = CEC_MSG_TIMER_STATUS; 378 msg->msg[1] = CEC_MSG_TIMER_STATUS;
379 msg->msg[2] = (timer_overlap_warning < 379 msg->msg[2] = (timer_overlap_warning << 7) |
380 (media_info << 5) | 380 (media_info << 5) |
381 (prog_info ? 0x10 : 0) | 381 (prog_info ? 0x10 : 0) |
382 (prog_info ? prog_info : prog_ 382 (prog_info ? prog_info : prog_error);
383 if (prog_info == CEC_OP_PROG_INFO_NOT_ 383 if (prog_info == CEC_OP_PROG_INFO_NOT_ENOUGH_SPACE ||
384 prog_info == CEC_OP_PROG_INFO_MIGH 384 prog_info == CEC_OP_PROG_INFO_MIGHT_NOT_BE_ENOUGH_SPACE ||
385 prog_error == CEC_OP_PROG_ERROR_DU 385 prog_error == CEC_OP_PROG_ERROR_DUPLICATE) {
386 msg->len += 2; 386 msg->len += 2;
387 msg->msg[3] = ((duration_hr / 387 msg->msg[3] = ((duration_hr / 10) << 4) | (duration_hr % 10);
388 msg->msg[4] = ((duration_min / 388 msg->msg[4] = ((duration_min / 10) << 4) | (duration_min % 10);
389 } 389 }
390 } 390 }
391 391
392 static inline void cec_ops_timer_status(const 392 static inline void cec_ops_timer_status(const struct cec_msg *msg,
393 __u8 * 393 __u8 *timer_overlap_warning,
394 __u8 * 394 __u8 *media_info,
395 __u8 * 395 __u8 *prog_info,
396 __u8 * 396 __u8 *prog_error,
397 __u8 * 397 __u8 *duration_hr,
398 __u8 * 398 __u8 *duration_min)
399 { 399 {
400 *timer_overlap_warning = msg->msg[2] > 400 *timer_overlap_warning = msg->msg[2] >> 7;
401 *media_info = (msg->msg[2] >> 5) & 3; 401 *media_info = (msg->msg[2] >> 5) & 3;
402 if (msg->msg[2] & 0x10) { 402 if (msg->msg[2] & 0x10) {
403 *prog_info = msg->msg[2] & 0xf 403 *prog_info = msg->msg[2] & 0xf;
404 *prog_error = 0; 404 *prog_error = 0;
405 } else { 405 } else {
406 *prog_info = 0; 406 *prog_info = 0;
407 *prog_error = msg->msg[2] & 0x 407 *prog_error = msg->msg[2] & 0xf;
408 } 408 }
409 if (*prog_info == CEC_OP_PROG_INFO_NOT 409 if (*prog_info == CEC_OP_PROG_INFO_NOT_ENOUGH_SPACE ||
410 *prog_info == CEC_OP_PROG_INFO_MIG 410 *prog_info == CEC_OP_PROG_INFO_MIGHT_NOT_BE_ENOUGH_SPACE ||
411 *prog_error == CEC_OP_PROG_ERROR_D 411 *prog_error == CEC_OP_PROG_ERROR_DUPLICATE) {
412 *duration_hr = (msg->msg[3] >> 412 *duration_hr = (msg->msg[3] >> 4) * 10 + (msg->msg[3] & 0xf);
413 *duration_min = (msg->msg[4] > 413 *duration_min = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
414 } else { 414 } else {
415 *duration_hr = *duration_min = 415 *duration_hr = *duration_min = 0;
416 } 416 }
417 } 417 }
418 418
419 static inline void cec_msg_timer_cleared_statu 419 static inline void cec_msg_timer_cleared_status(struct cec_msg *msg,
420 420 __u8 timer_cleared_status)
421 { 421 {
422 msg->len = 3; 422 msg->len = 3;
423 msg->msg[1] = CEC_MSG_TIMER_CLEARED_ST 423 msg->msg[1] = CEC_MSG_TIMER_CLEARED_STATUS;
424 msg->msg[2] = timer_cleared_status; 424 msg->msg[2] = timer_cleared_status;
425 } 425 }
426 426
427 static inline void cec_ops_timer_cleared_statu 427 static inline void cec_ops_timer_cleared_status(const struct cec_msg *msg,
428 428 __u8 *timer_cleared_status)
429 { 429 {
430 *timer_cleared_status = msg->msg[2]; 430 *timer_cleared_status = msg->msg[2];
431 } 431 }
432 432
433 static inline void cec_msg_clear_analogue_time 433 static inline void cec_msg_clear_analogue_timer(struct cec_msg *msg,
434 434 int reply,
435 435 __u8 day,
436 436 __u8 month,
437 437 __u8 start_hr,
438 438 __u8 start_min,
439 439 __u8 duration_hr,
440 440 __u8 duration_min,
441 441 __u8 recording_seq,
442 442 __u8 ana_bcast_type,
443 443 __u16 ana_freq,
444 444 __u8 bcast_system)
445 { 445 {
446 msg->len = 13; 446 msg->len = 13;
447 msg->msg[1] = CEC_MSG_CLEAR_ANALOGUE_T 447 msg->msg[1] = CEC_MSG_CLEAR_ANALOGUE_TIMER;
448 msg->msg[2] = day; 448 msg->msg[2] = day;
449 msg->msg[3] = month; 449 msg->msg[3] = month;
450 /* Hours and minutes are in BCD format 450 /* Hours and minutes are in BCD format */
451 msg->msg[4] = ((start_hr / 10) << 4) | 451 msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
452 msg->msg[5] = ((start_min / 10) << 4) 452 msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
453 msg->msg[6] = ((duration_hr / 10) << 4 453 msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
454 msg->msg[7] = ((duration_min / 10) << 454 msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
455 msg->msg[8] = recording_seq; 455 msg->msg[8] = recording_seq;
456 msg->msg[9] = ana_bcast_type; 456 msg->msg[9] = ana_bcast_type;
457 msg->msg[10] = ana_freq >> 8; 457 msg->msg[10] = ana_freq >> 8;
458 msg->msg[11] = ana_freq & 0xff; 458 msg->msg[11] = ana_freq & 0xff;
459 msg->msg[12] = bcast_system; 459 msg->msg[12] = bcast_system;
460 msg->reply = reply ? CEC_MSG_TIMER_CLE 460 msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
461 } 461 }
462 462
463 static inline void cec_ops_clear_analogue_time 463 static inline void cec_ops_clear_analogue_timer(const struct cec_msg *msg,
464 464 __u8 *day,
465 465 __u8 *month,
466 466 __u8 *start_hr,
467 467 __u8 *start_min,
468 468 __u8 *duration_hr,
469 469 __u8 *duration_min,
470 470 __u8 *recording_seq,
471 471 __u8 *ana_bcast_type,
472 472 __u16 *ana_freq,
473 473 __u8 *bcast_system)
474 { 474 {
475 *day = msg->msg[2]; 475 *day = msg->msg[2];
476 *month = msg->msg[3]; 476 *month = msg->msg[3];
477 /* Hours and minutes are in BCD format 477 /* Hours and minutes are in BCD format */
478 *start_hr = (msg->msg[4] >> 4) * 10 + 478 *start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
479 *start_min = (msg->msg[5] >> 4) * 10 + 479 *start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
480 *duration_hr = (msg->msg[6] >> 4) * 10 480 *duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
481 *duration_min = (msg->msg[7] >> 4) * 1 481 *duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
482 *recording_seq = msg->msg[8]; 482 *recording_seq = msg->msg[8];
483 *ana_bcast_type = msg->msg[9]; 483 *ana_bcast_type = msg->msg[9];
484 *ana_freq = (msg->msg[10] << 8) | msg- 484 *ana_freq = (msg->msg[10] << 8) | msg->msg[11];
485 *bcast_system = msg->msg[12]; 485 *bcast_system = msg->msg[12];
486 } 486 }
487 487
488 static inline void cec_msg_clear_digital_timer 488 static inline void cec_msg_clear_digital_timer(struct cec_msg *msg,
489 int reply, 489 int reply,
490 __u8 day, 490 __u8 day,
491 __u8 month, 491 __u8 month,
492 __u8 start_hr, 492 __u8 start_hr,
493 __u8 start_min 493 __u8 start_min,
494 __u8 duration_ 494 __u8 duration_hr,
495 __u8 duration_ 495 __u8 duration_min,
496 __u8 recording 496 __u8 recording_seq,
497 const struct c 497 const struct cec_op_digital_service_id *digital)
498 { 498 {
499 msg->len = 16; 499 msg->len = 16;
500 msg->reply = reply ? CEC_MSG_TIMER_CLE 500 msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
501 msg->msg[1] = CEC_MSG_CLEAR_DIGITAL_TI 501 msg->msg[1] = CEC_MSG_CLEAR_DIGITAL_TIMER;
502 msg->msg[2] = day; 502 msg->msg[2] = day;
503 msg->msg[3] = month; 503 msg->msg[3] = month;
504 /* Hours and minutes are in BCD format 504 /* Hours and minutes are in BCD format */
505 msg->msg[4] = ((start_hr / 10) << 4) | 505 msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
506 msg->msg[5] = ((start_min / 10) << 4) 506 msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
507 msg->msg[6] = ((duration_hr / 10) << 4 507 msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
508 msg->msg[7] = ((duration_min / 10) << 508 msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
509 msg->msg[8] = recording_seq; 509 msg->msg[8] = recording_seq;
510 cec_set_digital_service_id(msg->msg + 510 cec_set_digital_service_id(msg->msg + 9, digital);
511 } 511 }
512 512
513 static inline void cec_ops_clear_digital_timer 513 static inline void cec_ops_clear_digital_timer(const struct cec_msg *msg,
514 __u8 *day, 514 __u8 *day,
515 __u8 *month, 515 __u8 *month,
516 __u8 *start_hr 516 __u8 *start_hr,
517 __u8 *start_mi 517 __u8 *start_min,
518 __u8 *duration 518 __u8 *duration_hr,
519 __u8 *duration 519 __u8 *duration_min,
520 __u8 *recordin 520 __u8 *recording_seq,
521 struct cec_op_ 521 struct cec_op_digital_service_id *digital)
522 { 522 {
523 *day = msg->msg[2]; 523 *day = msg->msg[2];
524 *month = msg->msg[3]; 524 *month = msg->msg[3];
525 /* Hours and minutes are in BCD format 525 /* Hours and minutes are in BCD format */
526 *start_hr = (msg->msg[4] >> 4) * 10 + 526 *start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
527 *start_min = (msg->msg[5] >> 4) * 10 + 527 *start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
528 *duration_hr = (msg->msg[6] >> 4) * 10 528 *duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
529 *duration_min = (msg->msg[7] >> 4) * 1 529 *duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
530 *recording_seq = msg->msg[8]; 530 *recording_seq = msg->msg[8];
531 cec_get_digital_service_id(msg->msg + 531 cec_get_digital_service_id(msg->msg + 9, digital);
532 } 532 }
533 533
534 static inline void cec_msg_clear_ext_timer(str 534 static inline void cec_msg_clear_ext_timer(struct cec_msg *msg,
535 int 535 int reply,
536 __u 536 __u8 day,
537 __u 537 __u8 month,
538 __u 538 __u8 start_hr,
539 __u 539 __u8 start_min,
540 __u 540 __u8 duration_hr,
541 __u 541 __u8 duration_min,
542 __u 542 __u8 recording_seq,
543 __u 543 __u8 ext_src_spec,
544 __u 544 __u8 plug,
545 __u 545 __u16 phys_addr)
546 { 546 {
547 msg->len = 13; 547 msg->len = 13;
548 msg->msg[1] = CEC_MSG_CLEAR_EXT_TIMER; 548 msg->msg[1] = CEC_MSG_CLEAR_EXT_TIMER;
549 msg->msg[2] = day; 549 msg->msg[2] = day;
550 msg->msg[3] = month; 550 msg->msg[3] = month;
551 /* Hours and minutes are in BCD format 551 /* Hours and minutes are in BCD format */
552 msg->msg[4] = ((start_hr / 10) << 4) | 552 msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
553 msg->msg[5] = ((start_min / 10) << 4) 553 msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
554 msg->msg[6] = ((duration_hr / 10) << 4 554 msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
555 msg->msg[7] = ((duration_min / 10) << 555 msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
556 msg->msg[8] = recording_seq; 556 msg->msg[8] = recording_seq;
557 msg->msg[9] = ext_src_spec; 557 msg->msg[9] = ext_src_spec;
558 msg->msg[10] = plug; 558 msg->msg[10] = plug;
559 msg->msg[11] = phys_addr >> 8; 559 msg->msg[11] = phys_addr >> 8;
560 msg->msg[12] = phys_addr & 0xff; 560 msg->msg[12] = phys_addr & 0xff;
561 msg->reply = reply ? CEC_MSG_TIMER_CLE 561 msg->reply = reply ? CEC_MSG_TIMER_CLEARED_STATUS : 0;
562 } 562 }
563 563
564 static inline void cec_ops_clear_ext_timer(con 564 static inline void cec_ops_clear_ext_timer(const struct cec_msg *msg,
565 __u 565 __u8 *day,
566 __u 566 __u8 *month,
567 __u 567 __u8 *start_hr,
568 __u 568 __u8 *start_min,
569 __u 569 __u8 *duration_hr,
570 __u 570 __u8 *duration_min,
571 __u 571 __u8 *recording_seq,
572 __u 572 __u8 *ext_src_spec,
573 __u 573 __u8 *plug,
574 __u 574 __u16 *phys_addr)
575 { 575 {
576 *day = msg->msg[2]; 576 *day = msg->msg[2];
577 *month = msg->msg[3]; 577 *month = msg->msg[3];
578 /* Hours and minutes are in BCD format 578 /* Hours and minutes are in BCD format */
579 *start_hr = (msg->msg[4] >> 4) * 10 + 579 *start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
580 *start_min = (msg->msg[5] >> 4) * 10 + 580 *start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
581 *duration_hr = (msg->msg[6] >> 4) * 10 581 *duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
582 *duration_min = (msg->msg[7] >> 4) * 1 582 *duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
583 *recording_seq = msg->msg[8]; 583 *recording_seq = msg->msg[8];
584 *ext_src_spec = msg->msg[9]; 584 *ext_src_spec = msg->msg[9];
585 *plug = msg->msg[10]; 585 *plug = msg->msg[10];
586 *phys_addr = (msg->msg[11] << 8) | msg 586 *phys_addr = (msg->msg[11] << 8) | msg->msg[12];
587 } 587 }
588 588
589 static inline void cec_msg_set_analogue_timer( 589 static inline void cec_msg_set_analogue_timer(struct cec_msg *msg,
590 590 int reply,
591 591 __u8 day,
592 592 __u8 month,
593 593 __u8 start_hr,
594 594 __u8 start_min,
595 595 __u8 duration_hr,
596 596 __u8 duration_min,
597 597 __u8 recording_seq,
598 598 __u8 ana_bcast_type,
599 599 __u16 ana_freq,
600 600 __u8 bcast_system)
601 { 601 {
602 msg->len = 13; 602 msg->len = 13;
603 msg->msg[1] = CEC_MSG_SET_ANALOGUE_TIM 603 msg->msg[1] = CEC_MSG_SET_ANALOGUE_TIMER;
604 msg->msg[2] = day; 604 msg->msg[2] = day;
605 msg->msg[3] = month; 605 msg->msg[3] = month;
606 /* Hours and minutes are in BCD format 606 /* Hours and minutes are in BCD format */
607 msg->msg[4] = ((start_hr / 10) << 4) | 607 msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
608 msg->msg[5] = ((start_min / 10) << 4) 608 msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
609 msg->msg[6] = ((duration_hr / 10) << 4 609 msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
610 msg->msg[7] = ((duration_min / 10) << 610 msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
611 msg->msg[8] = recording_seq; 611 msg->msg[8] = recording_seq;
612 msg->msg[9] = ana_bcast_type; 612 msg->msg[9] = ana_bcast_type;
613 msg->msg[10] = ana_freq >> 8; 613 msg->msg[10] = ana_freq >> 8;
614 msg->msg[11] = ana_freq & 0xff; 614 msg->msg[11] = ana_freq & 0xff;
615 msg->msg[12] = bcast_system; 615 msg->msg[12] = bcast_system;
616 msg->reply = reply ? CEC_MSG_TIMER_STA 616 msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
617 } 617 }
618 618
619 static inline void cec_ops_set_analogue_timer( 619 static inline void cec_ops_set_analogue_timer(const struct cec_msg *msg,
620 620 __u8 *day,
621 621 __u8 *month,
622 622 __u8 *start_hr,
623 623 __u8 *start_min,
624 624 __u8 *duration_hr,
625 625 __u8 *duration_min,
626 626 __u8 *recording_seq,
627 627 __u8 *ana_bcast_type,
628 628 __u16 *ana_freq,
629 629 __u8 *bcast_system)
630 { 630 {
631 *day = msg->msg[2]; 631 *day = msg->msg[2];
632 *month = msg->msg[3]; 632 *month = msg->msg[3];
633 /* Hours and minutes are in BCD format 633 /* Hours and minutes are in BCD format */
634 *start_hr = (msg->msg[4] >> 4) * 10 + 634 *start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
635 *start_min = (msg->msg[5] >> 4) * 10 + 635 *start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
636 *duration_hr = (msg->msg[6] >> 4) * 10 636 *duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
637 *duration_min = (msg->msg[7] >> 4) * 1 637 *duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
638 *recording_seq = msg->msg[8]; 638 *recording_seq = msg->msg[8];
639 *ana_bcast_type = msg->msg[9]; 639 *ana_bcast_type = msg->msg[9];
640 *ana_freq = (msg->msg[10] << 8) | msg- 640 *ana_freq = (msg->msg[10] << 8) | msg->msg[11];
641 *bcast_system = msg->msg[12]; 641 *bcast_system = msg->msg[12];
642 } 642 }
643 643
644 static inline void cec_msg_set_digital_timer(s 644 static inline void cec_msg_set_digital_timer(struct cec_msg *msg,
645 int reply, 645 int reply,
646 __u8 day, 646 __u8 day,
647 __u8 month, 647 __u8 month,
648 __u8 start_hr, 648 __u8 start_hr,
649 __u8 start_min, 649 __u8 start_min,
650 __u8 duration_hr, 650 __u8 duration_hr,
651 __u8 duration_min, 651 __u8 duration_min,
652 __u8 recording_seq, 652 __u8 recording_seq,
653 const struct cec_op_di 653 const struct cec_op_digital_service_id *digital)
654 { 654 {
655 msg->len = 16; 655 msg->len = 16;
656 msg->reply = reply ? CEC_MSG_TIMER_STA 656 msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
657 msg->msg[1] = CEC_MSG_SET_DIGITAL_TIME 657 msg->msg[1] = CEC_MSG_SET_DIGITAL_TIMER;
658 msg->msg[2] = day; 658 msg->msg[2] = day;
659 msg->msg[3] = month; 659 msg->msg[3] = month;
660 /* Hours and minutes are in BCD format 660 /* Hours and minutes are in BCD format */
661 msg->msg[4] = ((start_hr / 10) << 4) | 661 msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
662 msg->msg[5] = ((start_min / 10) << 4) 662 msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
663 msg->msg[6] = ((duration_hr / 10) << 4 663 msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
664 msg->msg[7] = ((duration_min / 10) << 664 msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
665 msg->msg[8] = recording_seq; 665 msg->msg[8] = recording_seq;
666 cec_set_digital_service_id(msg->msg + 666 cec_set_digital_service_id(msg->msg + 9, digital);
667 } 667 }
668 668
669 static inline void cec_ops_set_digital_timer(c 669 static inline void cec_ops_set_digital_timer(const struct cec_msg *msg,
670 __u8 *day, 670 __u8 *day,
671 __u8 *month, 671 __u8 *month,
672 __u8 *start_hr, 672 __u8 *start_hr,
673 __u8 *start_min, 673 __u8 *start_min,
674 __u8 *duration_hr, 674 __u8 *duration_hr,
675 __u8 *duration_min, 675 __u8 *duration_min,
676 __u8 *recording_seq, 676 __u8 *recording_seq,
677 struct cec_op_digital_ 677 struct cec_op_digital_service_id *digital)
678 { 678 {
679 *day = msg->msg[2]; 679 *day = msg->msg[2];
680 *month = msg->msg[3]; 680 *month = msg->msg[3];
681 /* Hours and minutes are in BCD format 681 /* Hours and minutes are in BCD format */
682 *start_hr = (msg->msg[4] >> 4) * 10 + 682 *start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
683 *start_min = (msg->msg[5] >> 4) * 10 + 683 *start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
684 *duration_hr = (msg->msg[6] >> 4) * 10 684 *duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
685 *duration_min = (msg->msg[7] >> 4) * 1 685 *duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
686 *recording_seq = msg->msg[8]; 686 *recording_seq = msg->msg[8];
687 cec_get_digital_service_id(msg->msg + 687 cec_get_digital_service_id(msg->msg + 9, digital);
688 } 688 }
689 689
690 static inline void cec_msg_set_ext_timer(struc 690 static inline void cec_msg_set_ext_timer(struct cec_msg *msg,
691 int r 691 int reply,
692 __u8 692 __u8 day,
693 __u8 693 __u8 month,
694 __u8 694 __u8 start_hr,
695 __u8 695 __u8 start_min,
696 __u8 696 __u8 duration_hr,
697 __u8 697 __u8 duration_min,
698 __u8 698 __u8 recording_seq,
699 __u8 699 __u8 ext_src_spec,
700 __u8 700 __u8 plug,
701 __u16 701 __u16 phys_addr)
702 { 702 {
703 msg->len = 13; 703 msg->len = 13;
704 msg->msg[1] = CEC_MSG_SET_EXT_TIMER; 704 msg->msg[1] = CEC_MSG_SET_EXT_TIMER;
705 msg->msg[2] = day; 705 msg->msg[2] = day;
706 msg->msg[3] = month; 706 msg->msg[3] = month;
707 /* Hours and minutes are in BCD format 707 /* Hours and minutes are in BCD format */
708 msg->msg[4] = ((start_hr / 10) << 4) | 708 msg->msg[4] = ((start_hr / 10) << 4) | (start_hr % 10);
709 msg->msg[5] = ((start_min / 10) << 4) 709 msg->msg[5] = ((start_min / 10) << 4) | (start_min % 10);
710 msg->msg[6] = ((duration_hr / 10) << 4 710 msg->msg[6] = ((duration_hr / 10) << 4) | (duration_hr % 10);
711 msg->msg[7] = ((duration_min / 10) << 711 msg->msg[7] = ((duration_min / 10) << 4) | (duration_min % 10);
712 msg->msg[8] = recording_seq; 712 msg->msg[8] = recording_seq;
713 msg->msg[9] = ext_src_spec; 713 msg->msg[9] = ext_src_spec;
714 msg->msg[10] = plug; 714 msg->msg[10] = plug;
715 msg->msg[11] = phys_addr >> 8; 715 msg->msg[11] = phys_addr >> 8;
716 msg->msg[12] = phys_addr & 0xff; 716 msg->msg[12] = phys_addr & 0xff;
717 msg->reply = reply ? CEC_MSG_TIMER_STA 717 msg->reply = reply ? CEC_MSG_TIMER_STATUS : 0;
718 } 718 }
719 719
720 static inline void cec_ops_set_ext_timer(const 720 static inline void cec_ops_set_ext_timer(const struct cec_msg *msg,
721 __u8 721 __u8 *day,
722 __u8 722 __u8 *month,
723 __u8 723 __u8 *start_hr,
724 __u8 724 __u8 *start_min,
725 __u8 725 __u8 *duration_hr,
726 __u8 726 __u8 *duration_min,
727 __u8 727 __u8 *recording_seq,
728 __u8 728 __u8 *ext_src_spec,
729 __u8 729 __u8 *plug,
730 __u16 730 __u16 *phys_addr)
731 { 731 {
732 *day = msg->msg[2]; 732 *day = msg->msg[2];
733 *month = msg->msg[3]; 733 *month = msg->msg[3];
734 /* Hours and minutes are in BCD format 734 /* Hours and minutes are in BCD format */
735 *start_hr = (msg->msg[4] >> 4) * 10 + 735 *start_hr = (msg->msg[4] >> 4) * 10 + (msg->msg[4] & 0xf);
736 *start_min = (msg->msg[5] >> 4) * 10 + 736 *start_min = (msg->msg[5] >> 4) * 10 + (msg->msg[5] & 0xf);
737 *duration_hr = (msg->msg[6] >> 4) * 10 737 *duration_hr = (msg->msg[6] >> 4) * 10 + (msg->msg[6] & 0xf);
738 *duration_min = (msg->msg[7] >> 4) * 1 738 *duration_min = (msg->msg[7] >> 4) * 10 + (msg->msg[7] & 0xf);
739 *recording_seq = msg->msg[8]; 739 *recording_seq = msg->msg[8];
740 *ext_src_spec = msg->msg[9]; 740 *ext_src_spec = msg->msg[9];
741 *plug = msg->msg[10]; 741 *plug = msg->msg[10];
742 *phys_addr = (msg->msg[11] << 8) | msg 742 *phys_addr = (msg->msg[11] << 8) | msg->msg[12];
743 } 743 }
744 744
745 static inline void cec_msg_set_timer_program_t 745 static inline void cec_msg_set_timer_program_title(struct cec_msg *msg,
746 746 const char *prog_title)
747 { 747 {
748 unsigned int len = strlen(prog_title); 748 unsigned int len = strlen(prog_title);
749 749
750 if (len > 14) 750 if (len > 14)
751 len = 14; 751 len = 14;
752 msg->len = 2 + len; 752 msg->len = 2 + len;
753 msg->msg[1] = CEC_MSG_SET_TIMER_PROGRA 753 msg->msg[1] = CEC_MSG_SET_TIMER_PROGRAM_TITLE;
754 memcpy(msg->msg + 2, prog_title, len); 754 memcpy(msg->msg + 2, prog_title, len);
755 } 755 }
756 756
757 static inline void cec_ops_set_timer_program_t 757 static inline void cec_ops_set_timer_program_title(const struct cec_msg *msg,
758 758 char *prog_title)
759 { 759 {
760 unsigned int len = msg->len > 2 ? msg- 760 unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
761 761
762 if (len > 14) 762 if (len > 14)
763 len = 14; 763 len = 14;
764 memcpy(prog_title, msg->msg + 2, len); 764 memcpy(prog_title, msg->msg + 2, len);
765 prog_title[len] = '\0'; 765 prog_title[len] = '\0';
766 } 766 }
767 767
768 /* System Information Feature */ 768 /* System Information Feature */
769 static inline void cec_msg_cec_version(struct 769 static inline void cec_msg_cec_version(struct cec_msg *msg, __u8 cec_version)
770 { 770 {
771 msg->len = 3; 771 msg->len = 3;
772 msg->msg[1] = CEC_MSG_CEC_VERSION; 772 msg->msg[1] = CEC_MSG_CEC_VERSION;
773 msg->msg[2] = cec_version; 773 msg->msg[2] = cec_version;
774 } 774 }
775 775
776 static inline void cec_ops_cec_version(const s 776 static inline void cec_ops_cec_version(const struct cec_msg *msg,
777 __u8 *c 777 __u8 *cec_version)
778 { 778 {
779 *cec_version = msg->msg[2]; 779 *cec_version = msg->msg[2];
780 } 780 }
781 781
782 static inline void cec_msg_get_cec_version(str 782 static inline void cec_msg_get_cec_version(struct cec_msg *msg,
783 int 783 int reply)
784 { 784 {
785 msg->len = 2; 785 msg->len = 2;
786 msg->msg[1] = CEC_MSG_GET_CEC_VERSION; 786 msg->msg[1] = CEC_MSG_GET_CEC_VERSION;
787 msg->reply = reply ? CEC_MSG_CEC_VERSI 787 msg->reply = reply ? CEC_MSG_CEC_VERSION : 0;
788 } 788 }
789 789
790 static inline void cec_msg_report_physical_add 790 static inline void cec_msg_report_physical_addr(struct cec_msg *msg,
791 __u16 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] |= 0xf; /* broadcast */
795 msg->msg[1] = CEC_MSG_REPORT_PHYSICAL_ 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;
798 msg->msg[4] = prim_devtype; 798 msg->msg[4] = prim_devtype;
799 } 799 }
800 800
801 static inline void cec_ops_report_physical_add 801 static inline void cec_ops_report_physical_addr(const struct cec_msg *msg,
802 __u16 802 __u16 *phys_addr, __u8 *prim_devtype)
803 { 803 {
804 *phys_addr = (msg->msg[2] << 8) | msg- 804 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
805 *prim_devtype = msg->msg[4]; 805 *prim_devtype = msg->msg[4];
806 } 806 }
807 807
808 static inline void cec_msg_give_physical_addr( 808 static inline void cec_msg_give_physical_addr(struct cec_msg *msg,
809 809 int reply)
810 { 810 {
811 msg->len = 2; 811 msg->len = 2;
812 msg->msg[1] = CEC_MSG_GIVE_PHYSICAL_AD 812 msg->msg[1] = CEC_MSG_GIVE_PHYSICAL_ADDR;
813 msg->reply = reply ? CEC_MSG_REPORT_PH 813 msg->reply = reply ? CEC_MSG_REPORT_PHYSICAL_ADDR : 0;
814 } 814 }
815 815
816 static inline void cec_msg_set_menu_language(s 816 static inline void cec_msg_set_menu_language(struct cec_msg *msg,
817 c 817 const char *language)
818 { 818 {
819 msg->len = 5; 819 msg->len = 5;
820 msg->msg[0] |= 0xf; /* broadcast */ 820 msg->msg[0] |= 0xf; /* broadcast */
821 msg->msg[1] = CEC_MSG_SET_MENU_LANGUAG 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 }
824 824
825 static inline void cec_ops_set_menu_language(c 825 static inline void cec_ops_set_menu_language(const struct cec_msg *msg,
826 c 826 char *language)
827 { 827 {
828 memcpy(language, msg->msg + 2, 3); 828 memcpy(language, msg->msg + 2, 3);
829 language[3] = '\0'; 829 language[3] = '\0';
830 } 830 }
831 831
832 static inline void cec_msg_get_menu_language(s 832 static inline void cec_msg_get_menu_language(struct cec_msg *msg,
833 i 833 int reply)
834 { 834 {
835 msg->len = 2; 835 msg->len = 2;
836 msg->msg[1] = CEC_MSG_GET_MENU_LANGUAG 836 msg->msg[1] = CEC_MSG_GET_MENU_LANGUAGE;
837 msg->reply = reply ? CEC_MSG_SET_MENU_ 837 msg->reply = reply ? CEC_MSG_SET_MENU_LANGUAGE : 0;
838 } 838 }
839 839
840 /* 840 /*
841 * Assumes a single RC Profile byte and a sing 841 * Assumes a single RC Profile byte and a single Device Features byte,
842 * i.e. no extended features are supported by 842 * i.e. no extended features are supported by this helper function.
843 * 843 *
844 * As of CEC 2.0 no extended features are defi 844 * As of CEC 2.0 no extended features are defined, should those be added
845 * in the future, then this function needs to 845 * in the future, then this function needs to be adapted or a new function
846 * should be added. 846 * should be added.
847 */ 847 */
848 static inline void cec_msg_report_features(str 848 static inline void cec_msg_report_features(struct cec_msg *msg,
849 __u8 cec_versi 849 __u8 cec_version, __u8 all_device_types,
850 __u8 rc_profil 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] |= 0xf; /* 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;
857 msg->msg[4] = rc_profile; 857 msg->msg[4] = rc_profile;
858 msg->msg[5] = dev_features; 858 msg->msg[5] = dev_features;
859 } 859 }
860 860
861 static inline void cec_ops_report_features(con 861 static inline void cec_ops_report_features(const struct cec_msg *msg,
862 __u8 *cec_version, __u 862 __u8 *cec_version, __u8 *all_device_types,
863 const __u8 **rc_profil 863 const __u8 **rc_profile, const __u8 **dev_features)
864 { 864 {
865 const __u8 *p = &msg->msg[4]; 865 const __u8 *p = &msg->msg[4];
866 866
867 *cec_version = msg->msg[2]; 867 *cec_version = msg->msg[2];
868 *all_device_types = msg->msg[3]; 868 *all_device_types = msg->msg[3];
869 *rc_profile = p; 869 *rc_profile = p;
870 *dev_features = NULL; 870 *dev_features = NULL;
871 while (p < &msg->msg[14] && (*p & CEC_ 871 while (p < &msg->msg[14] && (*p & CEC_OP_FEAT_EXT))
872 p++; 872 p++;
873 if (!(*p & CEC_OP_FEAT_EXT)) { 873 if (!(*p & CEC_OP_FEAT_EXT)) {
874 *dev_features = p + 1; 874 *dev_features = p + 1;
875 while (p < &msg->msg[15] && (* 875 while (p < &msg->msg[15] && (*p & CEC_OP_FEAT_EXT))
876 p++; 876 p++;
877 } 877 }
878 if (*p & CEC_OP_FEAT_EXT) 878 if (*p & CEC_OP_FEAT_EXT)
879 *rc_profile = *dev_features = 879 *rc_profile = *dev_features = NULL;
880 } 880 }
881 881
882 static inline void cec_msg_give_features(struc 882 static inline void cec_msg_give_features(struct cec_msg *msg,
883 int r 883 int reply)
884 { 884 {
885 msg->len = 2; 885 msg->len = 2;
886 msg->msg[1] = CEC_MSG_GIVE_FEATURES; 886 msg->msg[1] = CEC_MSG_GIVE_FEATURES;
887 msg->reply = reply ? CEC_MSG_REPORT_FE 887 msg->reply = reply ? CEC_MSG_REPORT_FEATURES : 0;
888 } 888 }
889 889
890 /* Deck Control Feature */ 890 /* Deck Control Feature */
891 static inline void cec_msg_deck_control(struct 891 static inline void cec_msg_deck_control(struct cec_msg *msg,
892 __u8 d 892 __u8 deck_control_mode)
893 { 893 {
894 msg->len = 3; 894 msg->len = 3;
895 msg->msg[1] = CEC_MSG_DECK_CONTROL; 895 msg->msg[1] = CEC_MSG_DECK_CONTROL;
896 msg->msg[2] = deck_control_mode; 896 msg->msg[2] = deck_control_mode;
897 } 897 }
898 898
899 static inline void cec_ops_deck_control(const 899 static inline void cec_ops_deck_control(const struct cec_msg *msg,
900 __u8 * 900 __u8 *deck_control_mode)
901 { 901 {
902 *deck_control_mode = msg->msg[2]; 902 *deck_control_mode = msg->msg[2];
903 } 903 }
904 904
905 static inline void cec_msg_deck_status(struct 905 static inline void cec_msg_deck_status(struct cec_msg *msg,
906 __u8 de 906 __u8 deck_info)
907 { 907 {
908 msg->len = 3; 908 msg->len = 3;
909 msg->msg[1] = CEC_MSG_DECK_STATUS; 909 msg->msg[1] = CEC_MSG_DECK_STATUS;
910 msg->msg[2] = deck_info; 910 msg->msg[2] = deck_info;
911 } 911 }
912 912
913 static inline void cec_ops_deck_status(const s 913 static inline void cec_ops_deck_status(const struct cec_msg *msg,
914 __u8 *d 914 __u8 *deck_info)
915 { 915 {
916 *deck_info = msg->msg[2]; 916 *deck_info = msg->msg[2];
917 } 917 }
918 918
919 static inline void cec_msg_give_deck_status(st 919 static inline void cec_msg_give_deck_status(struct cec_msg *msg,
920 in 920 int reply,
921 __ 921 __u8 status_req)
922 { 922 {
923 msg->len = 3; 923 msg->len = 3;
924 msg->msg[1] = CEC_MSG_GIVE_DECK_STATUS 924 msg->msg[1] = CEC_MSG_GIVE_DECK_STATUS;
925 msg->msg[2] = status_req; 925 msg->msg[2] = status_req;
926 msg->reply = (reply && status_req != C !! 926 msg->reply = reply ? CEC_MSG_DECK_STATUS : 0;
927 CEC_MSG_DECK_S <<
928 } 927 }
929 928
930 static inline void cec_ops_give_deck_status(co 929 static inline void cec_ops_give_deck_status(const struct cec_msg *msg,
931 __ 930 __u8 *status_req)
932 { 931 {
933 *status_req = msg->msg[2]; 932 *status_req = msg->msg[2];
934 } 933 }
935 934
936 static inline void cec_msg_play(struct cec_msg 935 static inline void cec_msg_play(struct cec_msg *msg,
937 __u8 play_mode 936 __u8 play_mode)
938 { 937 {
939 msg->len = 3; 938 msg->len = 3;
940 msg->msg[1] = CEC_MSG_PLAY; 939 msg->msg[1] = CEC_MSG_PLAY;
941 msg->msg[2] = play_mode; 940 msg->msg[2] = play_mode;
942 } 941 }
943 942
944 static inline void cec_ops_play(const struct c 943 static inline void cec_ops_play(const struct cec_msg *msg,
945 __u8 *play_mod 944 __u8 *play_mode)
946 { 945 {
947 *play_mode = msg->msg[2]; 946 *play_mode = msg->msg[2];
948 } 947 }
949 948
950 949
951 /* Tuner Control Feature */ 950 /* Tuner Control Feature */
952 struct cec_op_tuner_device_info { 951 struct cec_op_tuner_device_info {
953 __u8 rec_flag; 952 __u8 rec_flag;
954 __u8 tuner_display_info; 953 __u8 tuner_display_info;
955 __u8 is_analog; 954 __u8 is_analog;
956 union { 955 union {
957 struct cec_op_digital_service_ 956 struct cec_op_digital_service_id digital;
958 struct { 957 struct {
959 __u8 ana_bcast_type; 958 __u8 ana_bcast_type;
960 __u16 ana_freq; 959 __u16 ana_freq;
961 __u8 bcast_system; 960 __u8 bcast_system;
962 } analog; 961 } analog;
963 }; 962 };
964 }; 963 };
965 964
966 static inline void cec_msg_tuner_device_status 965 static inline void cec_msg_tuner_device_status_analog(struct cec_msg *msg,
967 966 __u8 rec_flag,
968 967 __u8 tuner_display_info,
969 968 __u8 ana_bcast_type,
970 969 __u16 ana_freq,
971 970 __u8 bcast_system)
972 { 971 {
973 msg->len = 7; 972 msg->len = 7;
974 msg->msg[1] = CEC_MSG_TUNER_DEVICE_STA 973 msg->msg[1] = CEC_MSG_TUNER_DEVICE_STATUS;
975 msg->msg[2] = (rec_flag << 7) | tuner_ 974 msg->msg[2] = (rec_flag << 7) | tuner_display_info;
976 msg->msg[3] = ana_bcast_type; 975 msg->msg[3] = ana_bcast_type;
977 msg->msg[4] = ana_freq >> 8; 976 msg->msg[4] = ana_freq >> 8;
978 msg->msg[5] = ana_freq & 0xff; 977 msg->msg[5] = ana_freq & 0xff;
979 msg->msg[6] = bcast_system; 978 msg->msg[6] = bcast_system;
980 } 979 }
981 980
982 static inline void cec_msg_tuner_device_status 981 static inline void cec_msg_tuner_device_status_digital(struct cec_msg *msg,
983 __u8 rec_flag, __u8 tuner_d 982 __u8 rec_flag, __u8 tuner_display_info,
984 const struct cec_op_digital 983 const struct cec_op_digital_service_id *digital)
985 { 984 {
986 msg->len = 10; 985 msg->len = 10;
987 msg->msg[1] = CEC_MSG_TUNER_DEVICE_STA 986 msg->msg[1] = CEC_MSG_TUNER_DEVICE_STATUS;
988 msg->msg[2] = (rec_flag << 7) | tuner_ 987 msg->msg[2] = (rec_flag << 7) | tuner_display_info;
989 cec_set_digital_service_id(msg->msg + 988 cec_set_digital_service_id(msg->msg + 3, digital);
990 } 989 }
991 990
992 static inline void cec_msg_tuner_device_status 991 static inline void cec_msg_tuner_device_status(struct cec_msg *msg,
993 const struct cec_op_tu 992 const struct cec_op_tuner_device_info *tuner_dev_info)
994 { 993 {
995 if (tuner_dev_info->is_analog) 994 if (tuner_dev_info->is_analog)
996 cec_msg_tuner_device_status_an 995 cec_msg_tuner_device_status_analog(msg,
997 tuner_dev_info->rec_fl 996 tuner_dev_info->rec_flag,
998 tuner_dev_info->tuner_ 997 tuner_dev_info->tuner_display_info,
999 tuner_dev_info->analog 998 tuner_dev_info->analog.ana_bcast_type,
1000 tuner_dev_info->analo 999 tuner_dev_info->analog.ana_freq,
1001 tuner_dev_info->analo 1000 tuner_dev_info->analog.bcast_system);
1002 else 1001 else
1003 cec_msg_tuner_device_status_d 1002 cec_msg_tuner_device_status_digital(msg,
1004 tuner_dev_info->rec_f 1003 tuner_dev_info->rec_flag,
1005 tuner_dev_info->tuner 1004 tuner_dev_info->tuner_display_info,
1006 &tuner_dev_info->digi 1005 &tuner_dev_info->digital);
1007 } 1006 }
1008 1007
1009 static inline void cec_ops_tuner_device_statu 1008 static inline void cec_ops_tuner_device_status(const struct cec_msg *msg,
1010 struct cec_op 1009 struct cec_op_tuner_device_info *tuner_dev_info)
1011 { 1010 {
1012 tuner_dev_info->is_analog = msg->len 1011 tuner_dev_info->is_analog = msg->len < 10;
1013 tuner_dev_info->rec_flag = msg->msg[2 1012 tuner_dev_info->rec_flag = msg->msg[2] >> 7;
1014 tuner_dev_info->tuner_display_info = 1013 tuner_dev_info->tuner_display_info = msg->msg[2] & 0x7f;
1015 if (tuner_dev_info->is_analog) { 1014 if (tuner_dev_info->is_analog) {
1016 tuner_dev_info->analog.ana_bc 1015 tuner_dev_info->analog.ana_bcast_type = msg->msg[3];
1017 tuner_dev_info->analog.ana_fr 1016 tuner_dev_info->analog.ana_freq = (msg->msg[4] << 8) | msg->msg[5];
1018 tuner_dev_info->analog.bcast_ 1017 tuner_dev_info->analog.bcast_system = msg->msg[6];
1019 return; 1018 return;
1020 } 1019 }
1021 cec_get_digital_service_id(msg->msg + 1020 cec_get_digital_service_id(msg->msg + 3, &tuner_dev_info->digital);
1022 } 1021 }
1023 1022
1024 static inline void cec_msg_give_tuner_device_ 1023 static inline void cec_msg_give_tuner_device_status(struct cec_msg *msg,
1025 1024 int reply,
1026 1025 __u8 status_req)
1027 { 1026 {
1028 msg->len = 3; 1027 msg->len = 3;
1029 msg->msg[1] = CEC_MSG_GIVE_TUNER_DEVI 1028 msg->msg[1] = CEC_MSG_GIVE_TUNER_DEVICE_STATUS;
1030 msg->msg[2] = status_req; 1029 msg->msg[2] = status_req;
1031 msg->reply = (reply && status_req != !! 1030 msg->reply = reply ? CEC_MSG_TUNER_DEVICE_STATUS : 0;
1032 CEC_MSG_TUNER <<
1033 } 1031 }
1034 1032
1035 static inline void cec_ops_give_tuner_device_ 1033 static inline void cec_ops_give_tuner_device_status(const struct cec_msg *msg,
1036 1034 __u8 *status_req)
1037 { 1035 {
1038 *status_req = msg->msg[2]; 1036 *status_req = msg->msg[2];
1039 } 1037 }
1040 1038
1041 static inline void cec_msg_select_analogue_se 1039 static inline void cec_msg_select_analogue_service(struct cec_msg *msg,
1042 1040 __u8 ana_bcast_type,
1043 1041 __u16 ana_freq,
1044 1042 __u8 bcast_system)
1045 { 1043 {
1046 msg->len = 6; 1044 msg->len = 6;
1047 msg->msg[1] = CEC_MSG_SELECT_ANALOGUE 1045 msg->msg[1] = CEC_MSG_SELECT_ANALOGUE_SERVICE;
1048 msg->msg[2] = ana_bcast_type; 1046 msg->msg[2] = ana_bcast_type;
1049 msg->msg[3] = ana_freq >> 8; 1047 msg->msg[3] = ana_freq >> 8;
1050 msg->msg[4] = ana_freq & 0xff; 1048 msg->msg[4] = ana_freq & 0xff;
1051 msg->msg[5] = bcast_system; 1049 msg->msg[5] = bcast_system;
1052 } 1050 }
1053 1051
1054 static inline void cec_ops_select_analogue_se 1052 static inline void cec_ops_select_analogue_service(const struct cec_msg *msg,
1055 1053 __u8 *ana_bcast_type,
1056 1054 __u16 *ana_freq,
1057 1055 __u8 *bcast_system)
1058 { 1056 {
1059 *ana_bcast_type = msg->msg[2]; 1057 *ana_bcast_type = msg->msg[2];
1060 *ana_freq = (msg->msg[3] << 8) | msg- 1058 *ana_freq = (msg->msg[3] << 8) | msg->msg[4];
1061 *bcast_system = msg->msg[5]; 1059 *bcast_system = msg->msg[5];
1062 } 1060 }
1063 1061
1064 static inline void cec_msg_select_digital_ser 1062 static inline void cec_msg_select_digital_service(struct cec_msg *msg,
1065 const struct 1063 const struct cec_op_digital_service_id *digital)
1066 { 1064 {
1067 msg->len = 9; 1065 msg->len = 9;
1068 msg->msg[1] = CEC_MSG_SELECT_DIGITAL_ 1066 msg->msg[1] = CEC_MSG_SELECT_DIGITAL_SERVICE;
1069 cec_set_digital_service_id(msg->msg + 1067 cec_set_digital_service_id(msg->msg + 2, digital);
1070 } 1068 }
1071 1069
1072 static inline void cec_ops_select_digital_ser 1070 static inline void cec_ops_select_digital_service(const struct cec_msg *msg,
1073 struct cec_op 1071 struct cec_op_digital_service_id *digital)
1074 { 1072 {
1075 cec_get_digital_service_id(msg->msg + 1073 cec_get_digital_service_id(msg->msg + 2, digital);
1076 } 1074 }
1077 1075
1078 static inline void cec_msg_tuner_step_decreme 1076 static inline void cec_msg_tuner_step_decrement(struct cec_msg *msg)
1079 { 1077 {
1080 msg->len = 2; 1078 msg->len = 2;
1081 msg->msg[1] = CEC_MSG_TUNER_STEP_DECR 1079 msg->msg[1] = CEC_MSG_TUNER_STEP_DECREMENT;
1082 } 1080 }
1083 1081
1084 static inline void cec_msg_tuner_step_increme 1082 static inline void cec_msg_tuner_step_increment(struct cec_msg *msg)
1085 { 1083 {
1086 msg->len = 2; 1084 msg->len = 2;
1087 msg->msg[1] = CEC_MSG_TUNER_STEP_INCR 1085 msg->msg[1] = CEC_MSG_TUNER_STEP_INCREMENT;
1088 } 1086 }
1089 1087
1090 1088
1091 /* Vendor Specific Commands Feature */ 1089 /* Vendor Specific Commands Feature */
1092 static inline void cec_msg_device_vendor_id(s 1090 static inline void cec_msg_device_vendor_id(struct cec_msg *msg, __u32 vendor_id)
1093 { 1091 {
1094 msg->len = 5; 1092 msg->len = 5;
1095 msg->msg[0] |= 0xf; /* broadcast */ 1093 msg->msg[0] |= 0xf; /* broadcast */
1096 msg->msg[1] = CEC_MSG_DEVICE_VENDOR_I 1094 msg->msg[1] = CEC_MSG_DEVICE_VENDOR_ID;
1097 msg->msg[2] = vendor_id >> 16; 1095 msg->msg[2] = vendor_id >> 16;
1098 msg->msg[3] = (vendor_id >> 8) & 0xff 1096 msg->msg[3] = (vendor_id >> 8) & 0xff;
1099 msg->msg[4] = vendor_id & 0xff; 1097 msg->msg[4] = vendor_id & 0xff;
1100 } 1098 }
1101 1099
1102 static inline void cec_ops_device_vendor_id(c 1100 static inline void cec_ops_device_vendor_id(const struct cec_msg *msg,
1103 _ 1101 __u32 *vendor_id)
1104 { 1102 {
1105 *vendor_id = (msg->msg[2] << 16) | (m 1103 *vendor_id = (msg->msg[2] << 16) | (msg->msg[3] << 8) | msg->msg[4];
1106 } 1104 }
1107 1105
1108 static inline void cec_msg_give_device_vendor 1106 static inline void cec_msg_give_device_vendor_id(struct cec_msg *msg,
1109 1107 int reply)
1110 { 1108 {
1111 msg->len = 2; 1109 msg->len = 2;
1112 msg->msg[1] = CEC_MSG_GIVE_DEVICE_VEN 1110 msg->msg[1] = CEC_MSG_GIVE_DEVICE_VENDOR_ID;
1113 msg->reply = reply ? CEC_MSG_DEVICE_V 1111 msg->reply = reply ? CEC_MSG_DEVICE_VENDOR_ID : 0;
1114 } 1112 }
1115 1113
1116 static inline void cec_msg_vendor_command(str 1114 static inline void cec_msg_vendor_command(struct cec_msg *msg,
1117 __u 1115 __u8 size, const __u8 *vendor_cmd)
1118 { 1116 {
1119 if (size > 14) 1117 if (size > 14)
1120 size = 14; 1118 size = 14;
1121 msg->len = 2 + size; 1119 msg->len = 2 + size;
1122 msg->msg[1] = CEC_MSG_VENDOR_COMMAND; 1120 msg->msg[1] = CEC_MSG_VENDOR_COMMAND;
1123 memcpy(msg->msg + 2, vendor_cmd, size 1121 memcpy(msg->msg + 2, vendor_cmd, size);
1124 } 1122 }
1125 1123
1126 static inline void cec_ops_vendor_command(con 1124 static inline void cec_ops_vendor_command(const struct cec_msg *msg,
1127 __u 1125 __u8 *size,
1128 con 1126 const __u8 **vendor_cmd)
1129 { 1127 {
1130 *size = msg->len - 2; 1128 *size = msg->len - 2;
1131 1129
1132 if (*size > 14) 1130 if (*size > 14)
1133 *size = 14; 1131 *size = 14;
1134 *vendor_cmd = msg->msg + 2; 1132 *vendor_cmd = msg->msg + 2;
1135 } 1133 }
1136 1134
1137 static inline void cec_msg_vendor_command_wit 1135 static inline void cec_msg_vendor_command_with_id(struct cec_msg *msg,
1138 1136 __u32 vendor_id, __u8 size,
1139 1137 const __u8 *vendor_cmd)
1140 { 1138 {
1141 if (size > 11) 1139 if (size > 11)
1142 size = 11; 1140 size = 11;
1143 msg->len = 5 + size; 1141 msg->len = 5 + size;
1144 msg->msg[1] = CEC_MSG_VENDOR_COMMAND_ 1142 msg->msg[1] = CEC_MSG_VENDOR_COMMAND_WITH_ID;
1145 msg->msg[2] = vendor_id >> 16; 1143 msg->msg[2] = vendor_id >> 16;
1146 msg->msg[3] = (vendor_id >> 8) & 0xff 1144 msg->msg[3] = (vendor_id >> 8) & 0xff;
1147 msg->msg[4] = vendor_id & 0xff; 1145 msg->msg[4] = vendor_id & 0xff;
1148 memcpy(msg->msg + 5, vendor_cmd, size 1146 memcpy(msg->msg + 5, vendor_cmd, size);
1149 } 1147 }
1150 1148
1151 static inline void cec_ops_vendor_command_wit 1149 static inline void cec_ops_vendor_command_with_id(const struct cec_msg *msg,
1152 1150 __u32 *vendor_id, __u8 *size,
1153 1151 const __u8 **vendor_cmd)
1154 { 1152 {
1155 *size = msg->len - 5; 1153 *size = msg->len - 5;
1156 1154
1157 if (*size > 11) 1155 if (*size > 11)
1158 *size = 11; 1156 *size = 11;
1159 *vendor_id = (msg->msg[2] << 16) | (m 1157 *vendor_id = (msg->msg[2] << 16) | (msg->msg[3] << 8) | msg->msg[4];
1160 *vendor_cmd = msg->msg + 5; 1158 *vendor_cmd = msg->msg + 5;
1161 } 1159 }
1162 1160
1163 static inline void cec_msg_vendor_remote_butt 1161 static inline void cec_msg_vendor_remote_button_down(struct cec_msg *msg,
1164 1162 __u8 size,
1165 1163 const __u8 *rc_code)
1166 { 1164 {
1167 if (size > 14) 1165 if (size > 14)
1168 size = 14; 1166 size = 14;
1169 msg->len = 2 + size; 1167 msg->len = 2 + size;
1170 msg->msg[1] = CEC_MSG_VENDOR_REMOTE_B 1168 msg->msg[1] = CEC_MSG_VENDOR_REMOTE_BUTTON_DOWN;
1171 memcpy(msg->msg + 2, rc_code, size); 1169 memcpy(msg->msg + 2, rc_code, size);
1172 } 1170 }
1173 1171
1174 static inline void cec_ops_vendor_remote_butt 1172 static inline void cec_ops_vendor_remote_button_down(const struct cec_msg *msg,
1175 1173 __u8 *size,
1176 1174 const __u8 **rc_code)
1177 { 1175 {
1178 *size = msg->len - 2; 1176 *size = msg->len - 2;
1179 1177
1180 if (*size > 14) 1178 if (*size > 14)
1181 *size = 14; 1179 *size = 14;
1182 *rc_code = msg->msg + 2; 1180 *rc_code = msg->msg + 2;
1183 } 1181 }
1184 1182
1185 static inline void cec_msg_vendor_remote_butt 1183 static inline void cec_msg_vendor_remote_button_up(struct cec_msg *msg)
1186 { 1184 {
1187 msg->len = 2; 1185 msg->len = 2;
1188 msg->msg[1] = CEC_MSG_VENDOR_REMOTE_B 1186 msg->msg[1] = CEC_MSG_VENDOR_REMOTE_BUTTON_UP;
1189 } 1187 }
1190 1188
1191 1189
1192 /* OSD Display Feature */ 1190 /* OSD Display Feature */
1193 static inline void cec_msg_set_osd_string(str 1191 static inline void cec_msg_set_osd_string(struct cec_msg *msg,
1194 __u 1192 __u8 disp_ctl,
1195 con 1193 const char *osd)
1196 { 1194 {
1197 unsigned int len = strlen(osd); 1195 unsigned int len = strlen(osd);
1198 1196
1199 if (len > 13) 1197 if (len > 13)
1200 len = 13; 1198 len = 13;
1201 msg->len = 3 + len; 1199 msg->len = 3 + len;
1202 msg->msg[1] = CEC_MSG_SET_OSD_STRING; 1200 msg->msg[1] = CEC_MSG_SET_OSD_STRING;
1203 msg->msg[2] = disp_ctl; 1201 msg->msg[2] = disp_ctl;
1204 memcpy(msg->msg + 3, osd, len); 1202 memcpy(msg->msg + 3, osd, len);
1205 } 1203 }
1206 1204
1207 static inline void cec_ops_set_osd_string(con 1205 static inline void cec_ops_set_osd_string(const struct cec_msg *msg,
1208 __u 1206 __u8 *disp_ctl,
1209 cha 1207 char *osd)
1210 { 1208 {
1211 unsigned int len = msg->len > 3 ? msg 1209 unsigned int len = msg->len > 3 ? msg->len - 3 : 0;
1212 1210
1213 *disp_ctl = msg->msg[2]; 1211 *disp_ctl = msg->msg[2];
1214 if (len > 13) 1212 if (len > 13)
1215 len = 13; 1213 len = 13;
1216 memcpy(osd, msg->msg + 3, len); 1214 memcpy(osd, msg->msg + 3, len);
1217 osd[len] = '\0'; 1215 osd[len] = '\0';
1218 } 1216 }
1219 1217
1220 1218
1221 /* Device OSD Transfer Feature */ 1219 /* Device OSD Transfer Feature */
1222 static inline void cec_msg_set_osd_name(struc 1220 static inline void cec_msg_set_osd_name(struct cec_msg *msg, const char *name)
1223 { 1221 {
1224 unsigned int len = strlen(name); 1222 unsigned int len = strlen(name);
1225 1223
1226 if (len > 14) 1224 if (len > 14)
1227 len = 14; 1225 len = 14;
1228 msg->len = 2 + len; 1226 msg->len = 2 + len;
1229 msg->msg[1] = CEC_MSG_SET_OSD_NAME; 1227 msg->msg[1] = CEC_MSG_SET_OSD_NAME;
1230 memcpy(msg->msg + 2, name, len); 1228 memcpy(msg->msg + 2, name, len);
1231 } 1229 }
1232 1230
1233 static inline void cec_ops_set_osd_name(const 1231 static inline void cec_ops_set_osd_name(const struct cec_msg *msg,
1234 char 1232 char *name)
1235 { 1233 {
1236 unsigned int len = msg->len > 2 ? msg 1234 unsigned int len = msg->len > 2 ? msg->len - 2 : 0;
1237 1235
1238 if (len > 14) 1236 if (len > 14)
1239 len = 14; 1237 len = 14;
1240 memcpy(name, msg->msg + 2, len); 1238 memcpy(name, msg->msg + 2, len);
1241 name[len] = '\0'; 1239 name[len] = '\0';
1242 } 1240 }
1243 1241
1244 static inline void cec_msg_give_osd_name(stru 1242 static inline void cec_msg_give_osd_name(struct cec_msg *msg,
1245 int 1243 int reply)
1246 { 1244 {
1247 msg->len = 2; 1245 msg->len = 2;
1248 msg->msg[1] = CEC_MSG_GIVE_OSD_NAME; 1246 msg->msg[1] = CEC_MSG_GIVE_OSD_NAME;
1249 msg->reply = reply ? CEC_MSG_SET_OSD_ 1247 msg->reply = reply ? CEC_MSG_SET_OSD_NAME : 0;
1250 } 1248 }
1251 1249
1252 1250
1253 /* Device Menu Control Feature */ 1251 /* Device Menu Control Feature */
1254 static inline void cec_msg_menu_status(struct 1252 static inline void cec_msg_menu_status(struct cec_msg *msg,
1255 __u8 m 1253 __u8 menu_state)
1256 { 1254 {
1257 msg->len = 3; 1255 msg->len = 3;
1258 msg->msg[1] = CEC_MSG_MENU_STATUS; 1256 msg->msg[1] = CEC_MSG_MENU_STATUS;
1259 msg->msg[2] = menu_state; 1257 msg->msg[2] = menu_state;
1260 } 1258 }
1261 1259
1262 static inline void cec_ops_menu_status(const 1260 static inline void cec_ops_menu_status(const struct cec_msg *msg,
1263 __u8 * 1261 __u8 *menu_state)
1264 { 1262 {
1265 *menu_state = msg->msg[2]; 1263 *menu_state = msg->msg[2];
1266 } 1264 }
1267 1265
1268 static inline void cec_msg_menu_request(struc 1266 static inline void cec_msg_menu_request(struct cec_msg *msg,
1269 int r 1267 int reply,
1270 __u8 1268 __u8 menu_req)
1271 { 1269 {
1272 msg->len = 3; 1270 msg->len = 3;
1273 msg->msg[1] = CEC_MSG_MENU_REQUEST; 1271 msg->msg[1] = CEC_MSG_MENU_REQUEST;
1274 msg->msg[2] = menu_req; 1272 msg->msg[2] = menu_req;
1275 msg->reply = reply ? CEC_MSG_MENU_STA 1273 msg->reply = reply ? CEC_MSG_MENU_STATUS : 0;
1276 } 1274 }
1277 1275
1278 static inline void cec_ops_menu_request(const 1276 static inline void cec_ops_menu_request(const struct cec_msg *msg,
1279 __u8 1277 __u8 *menu_req)
1280 { 1278 {
1281 *menu_req = msg->msg[2]; 1279 *menu_req = msg->msg[2];
1282 } 1280 }
1283 1281
1284 struct cec_op_ui_command { 1282 struct cec_op_ui_command {
1285 __u8 ui_cmd; 1283 __u8 ui_cmd;
1286 __u8 has_opt_arg; 1284 __u8 has_opt_arg;
1287 union { 1285 union {
1288 struct cec_op_channel_data ch 1286 struct cec_op_channel_data channel_identifier;
1289 __u8 ui_broadcast_type; 1287 __u8 ui_broadcast_type;
1290 __u8 ui_sound_presentation_co 1288 __u8 ui_sound_presentation_control;
1291 __u8 play_mode; 1289 __u8 play_mode;
1292 __u8 ui_function_media; 1290 __u8 ui_function_media;
1293 __u8 ui_function_select_av_in 1291 __u8 ui_function_select_av_input;
1294 __u8 ui_function_select_audio 1292 __u8 ui_function_select_audio_input;
1295 }; 1293 };
1296 }; 1294 };
1297 1295
1298 static inline void cec_msg_user_control_press 1296 static inline void cec_msg_user_control_pressed(struct cec_msg *msg,
1299 const 1297 const struct cec_op_ui_command *ui_cmd)
1300 { 1298 {
1301 msg->len = 3; 1299 msg->len = 3;
1302 msg->msg[1] = CEC_MSG_USER_CONTROL_PR 1300 msg->msg[1] = CEC_MSG_USER_CONTROL_PRESSED;
1303 msg->msg[2] = ui_cmd->ui_cmd; 1301 msg->msg[2] = ui_cmd->ui_cmd;
1304 if (!ui_cmd->has_opt_arg) 1302 if (!ui_cmd->has_opt_arg)
1305 return; 1303 return;
1306 switch (ui_cmd->ui_cmd) { 1304 switch (ui_cmd->ui_cmd) {
1307 case CEC_OP_UI_CMD_SELECT_BROADCAST_T !! 1305 case 0x56:
1308 case CEC_OP_UI_CMD_SELECT_SOUND_PRESE !! 1306 case 0x57:
1309 case CEC_OP_UI_CMD_PLAY_FUNCTION: !! 1307 case 0x60:
1310 case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCT !! 1308 case 0x68:
1311 case CEC_OP_UI_CMD_SELECT_AV_INPUT_FU !! 1309 case 0x69:
1312 case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT !! 1310 case 0x6a:
1313 /* The optional operand is on 1311 /* The optional operand is one byte for all these ui commands */
1314 msg->len++; 1312 msg->len++;
1315 msg->msg[3] = ui_cmd->play_mo 1313 msg->msg[3] = ui_cmd->play_mode;
1316 break; 1314 break;
1317 case CEC_OP_UI_CMD_TUNE_FUNCTION: !! 1315 case 0x67:
1318 msg->len += 4; 1316 msg->len += 4;
1319 msg->msg[3] = (ui_cmd->channe 1317 msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt << 2) |
1320 (ui_cmd->channe 1318 (ui_cmd->channel_identifier.major >> 8);
1321 msg->msg[4] = ui_cmd->channel 1319 msg->msg[4] = ui_cmd->channel_identifier.major & 0xff;
1322 msg->msg[5] = ui_cmd->channel 1320 msg->msg[5] = ui_cmd->channel_identifier.minor >> 8;
1323 msg->msg[6] = ui_cmd->channel 1321 msg->msg[6] = ui_cmd->channel_identifier.minor & 0xff;
1324 break; 1322 break;
1325 } 1323 }
1326 } 1324 }
1327 1325
1328 static inline void cec_ops_user_control_press 1326 static inline void cec_ops_user_control_pressed(const struct cec_msg *msg,
1329 1327 struct cec_op_ui_command *ui_cmd)
1330 { 1328 {
1331 ui_cmd->ui_cmd = msg->msg[2]; 1329 ui_cmd->ui_cmd = msg->msg[2];
1332 ui_cmd->has_opt_arg = 0; 1330 ui_cmd->has_opt_arg = 0;
1333 if (msg->len == 3) 1331 if (msg->len == 3)
1334 return; 1332 return;
1335 switch (ui_cmd->ui_cmd) { 1333 switch (ui_cmd->ui_cmd) {
1336 case CEC_OP_UI_CMD_SELECT_BROADCAST_T !! 1334 case 0x56:
1337 case CEC_OP_UI_CMD_SELECT_SOUND_PRESE !! 1335 case 0x57:
1338 case CEC_OP_UI_CMD_PLAY_FUNCTION: !! 1336 case 0x60:
1339 case CEC_OP_UI_CMD_SELECT_MEDIA_FUNCT !! 1337 case 0x68:
1340 case CEC_OP_UI_CMD_SELECT_AV_INPUT_FU !! 1338 case 0x69:
1341 case CEC_OP_UI_CMD_SELECT_AUDIO_INPUT !! 1339 case 0x6a:
1342 /* The optional operand is on 1340 /* The optional operand is one byte for all these ui commands */
1343 ui_cmd->play_mode = msg->msg[ 1341 ui_cmd->play_mode = msg->msg[3];
1344 ui_cmd->has_opt_arg = 1; 1342 ui_cmd->has_opt_arg = 1;
1345 break; 1343 break;
1346 case CEC_OP_UI_CMD_TUNE_FUNCTION: !! 1344 case 0x67:
1347 if (msg->len < 7) 1345 if (msg->len < 7)
1348 break; 1346 break;
1349 ui_cmd->has_opt_arg = 1; 1347 ui_cmd->has_opt_arg = 1;
1350 ui_cmd->channel_identifier.ch 1348 ui_cmd->channel_identifier.channel_number_fmt = msg->msg[3] >> 2;
1351 ui_cmd->channel_identifier.ma 1349 ui_cmd->channel_identifier.major = ((msg->msg[3] & 3) << 6) | msg->msg[4];
1352 ui_cmd->channel_identifier.mi 1350 ui_cmd->channel_identifier.minor = (msg->msg[5] << 8) | msg->msg[6];
1353 break; 1351 break;
1354 } 1352 }
1355 } 1353 }
1356 1354
1357 static inline void cec_msg_user_control_relea 1355 static inline void cec_msg_user_control_released(struct cec_msg *msg)
1358 { 1356 {
1359 msg->len = 2; 1357 msg->len = 2;
1360 msg->msg[1] = CEC_MSG_USER_CONTROL_RE 1358 msg->msg[1] = CEC_MSG_USER_CONTROL_RELEASED;
1361 } 1359 }
1362 1360
1363 /* Remote Control Passthrough Feature */ 1361 /* Remote Control Passthrough Feature */
1364 1362
1365 /* Power Status Feature */ 1363 /* Power Status Feature */
1366 static inline void cec_msg_report_power_statu 1364 static inline void cec_msg_report_power_status(struct cec_msg *msg,
1367 1365 __u8 pwr_state)
1368 { 1366 {
1369 msg->len = 3; 1367 msg->len = 3;
1370 msg->msg[1] = CEC_MSG_REPORT_POWER_ST 1368 msg->msg[1] = CEC_MSG_REPORT_POWER_STATUS;
1371 msg->msg[2] = pwr_state; 1369 msg->msg[2] = pwr_state;
1372 } 1370 }
1373 1371
1374 static inline void cec_ops_report_power_statu 1372 static inline void cec_ops_report_power_status(const struct cec_msg *msg,
1375 1373 __u8 *pwr_state)
1376 { 1374 {
1377 *pwr_state = msg->msg[2]; 1375 *pwr_state = msg->msg[2];
1378 } 1376 }
1379 1377
1380 static inline void cec_msg_give_device_power_ 1378 static inline void cec_msg_give_device_power_status(struct cec_msg *msg,
1381 1379 int reply)
1382 { 1380 {
1383 msg->len = 2; 1381 msg->len = 2;
1384 msg->msg[1] = CEC_MSG_GIVE_DEVICE_POW 1382 msg->msg[1] = CEC_MSG_GIVE_DEVICE_POWER_STATUS;
1385 msg->reply = reply ? CEC_MSG_REPORT_P 1383 msg->reply = reply ? CEC_MSG_REPORT_POWER_STATUS : 0;
1386 } 1384 }
1387 1385
1388 /* General Protocol Messages */ 1386 /* General Protocol Messages */
1389 static inline void cec_msg_feature_abort(stru 1387 static inline void cec_msg_feature_abort(struct cec_msg *msg,
1390 __u8 1388 __u8 abort_msg, __u8 reason)
1391 { 1389 {
1392 msg->len = 4; 1390 msg->len = 4;
1393 msg->msg[1] = CEC_MSG_FEATURE_ABORT; 1391 msg->msg[1] = CEC_MSG_FEATURE_ABORT;
1394 msg->msg[2] = abort_msg; 1392 msg->msg[2] = abort_msg;
1395 msg->msg[3] = reason; 1393 msg->msg[3] = reason;
1396 } 1394 }
1397 1395
1398 static inline void cec_ops_feature_abort(cons 1396 static inline void cec_ops_feature_abort(const struct cec_msg *msg,
1399 __u8 1397 __u8 *abort_msg, __u8 *reason)
1400 { 1398 {
1401 *abort_msg = msg->msg[2]; 1399 *abort_msg = msg->msg[2];
1402 *reason = msg->msg[3]; 1400 *reason = msg->msg[3];
1403 } 1401 }
1404 1402
1405 /* This changes the current message into a fe 1403 /* This changes the current message into a feature abort message */
1406 static inline void cec_msg_reply_feature_abor 1404 static inline void cec_msg_reply_feature_abort(struct cec_msg *msg, __u8 reason)
1407 { 1405 {
1408 cec_msg_set_reply_to(msg, msg); 1406 cec_msg_set_reply_to(msg, msg);
1409 msg->len = 4; 1407 msg->len = 4;
1410 msg->msg[2] = msg->msg[1]; 1408 msg->msg[2] = msg->msg[1];
1411 msg->msg[3] = reason; 1409 msg->msg[3] = reason;
1412 msg->msg[1] = CEC_MSG_FEATURE_ABORT; 1410 msg->msg[1] = CEC_MSG_FEATURE_ABORT;
1413 } 1411 }
1414 1412
1415 static inline void cec_msg_abort(struct cec_m 1413 static inline void cec_msg_abort(struct cec_msg *msg)
1416 { 1414 {
1417 msg->len = 2; 1415 msg->len = 2;
1418 msg->msg[1] = CEC_MSG_ABORT; 1416 msg->msg[1] = CEC_MSG_ABORT;
1419 } 1417 }
1420 1418
1421 1419
1422 /* System Audio Control Feature */ 1420 /* System Audio Control Feature */
1423 static inline void cec_msg_report_audio_statu 1421 static inline void cec_msg_report_audio_status(struct cec_msg *msg,
1424 1422 __u8 aud_mute_status,
1425 1423 __u8 aud_vol_status)
1426 { 1424 {
1427 msg->len = 3; 1425 msg->len = 3;
1428 msg->msg[1] = CEC_MSG_REPORT_AUDIO_ST 1426 msg->msg[1] = CEC_MSG_REPORT_AUDIO_STATUS;
1429 msg->msg[2] = (aud_mute_status << 7) 1427 msg->msg[2] = (aud_mute_status << 7) | (aud_vol_status & 0x7f);
1430 } 1428 }
1431 1429
1432 static inline void cec_ops_report_audio_statu 1430 static inline void cec_ops_report_audio_status(const struct cec_msg *msg,
1433 1431 __u8 *aud_mute_status,
1434 1432 __u8 *aud_vol_status)
1435 { 1433 {
1436 *aud_mute_status = msg->msg[2] >> 7; 1434 *aud_mute_status = msg->msg[2] >> 7;
1437 *aud_vol_status = msg->msg[2] & 0x7f; 1435 *aud_vol_status = msg->msg[2] & 0x7f;
1438 } 1436 }
1439 1437
1440 static inline void cec_msg_give_audio_status( 1438 static inline void cec_msg_give_audio_status(struct cec_msg *msg,
1441 1439 int reply)
1442 { 1440 {
1443 msg->len = 2; 1441 msg->len = 2;
1444 msg->msg[1] = CEC_MSG_GIVE_AUDIO_STAT 1442 msg->msg[1] = CEC_MSG_GIVE_AUDIO_STATUS;
1445 msg->reply = reply ? CEC_MSG_REPORT_A 1443 msg->reply = reply ? CEC_MSG_REPORT_AUDIO_STATUS : 0;
1446 } 1444 }
1447 1445
1448 static inline void cec_msg_set_system_audio_m 1446 static inline void cec_msg_set_system_audio_mode(struct cec_msg *msg,
1449 1447 __u8 sys_aud_status)
1450 { 1448 {
1451 msg->len = 3; 1449 msg->len = 3;
1452 msg->msg[1] = CEC_MSG_SET_SYSTEM_AUDI 1450 msg->msg[1] = CEC_MSG_SET_SYSTEM_AUDIO_MODE;
1453 msg->msg[2] = sys_aud_status; 1451 msg->msg[2] = sys_aud_status;
1454 } 1452 }
1455 1453
1456 static inline void cec_ops_set_system_audio_m 1454 static inline void cec_ops_set_system_audio_mode(const struct cec_msg *msg,
1457 1455 __u8 *sys_aud_status)
1458 { 1456 {
1459 *sys_aud_status = msg->msg[2]; 1457 *sys_aud_status = msg->msg[2];
1460 } 1458 }
1461 1459
1462 static inline void cec_msg_system_audio_mode_ 1460 static inline void cec_msg_system_audio_mode_request(struct cec_msg *msg,
1463 1461 int reply,
1464 1462 __u16 phys_addr)
1465 { 1463 {
1466 msg->len = phys_addr == 0xffff ? 2 : 1464 msg->len = phys_addr == 0xffff ? 2 : 4;
1467 msg->msg[1] = CEC_MSG_SYSTEM_AUDIO_MO 1465 msg->msg[1] = CEC_MSG_SYSTEM_AUDIO_MODE_REQUEST;
1468 msg->msg[2] = phys_addr >> 8; 1466 msg->msg[2] = phys_addr >> 8;
1469 msg->msg[3] = phys_addr & 0xff; 1467 msg->msg[3] = phys_addr & 0xff;
1470 msg->reply = reply ? CEC_MSG_SET_SYST 1468 msg->reply = reply ? CEC_MSG_SET_SYSTEM_AUDIO_MODE : 0;
1471 1469
1472 } 1470 }
1473 1471
1474 static inline void cec_ops_system_audio_mode_ 1472 static inline void cec_ops_system_audio_mode_request(const struct cec_msg *msg,
1475 1473 __u16 *phys_addr)
1476 { 1474 {
1477 if (msg->len < 4) 1475 if (msg->len < 4)
1478 *phys_addr = 0xffff; 1476 *phys_addr = 0xffff;
1479 else 1477 else
1480 *phys_addr = (msg->msg[2] << 1478 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1481 } 1479 }
1482 1480
1483 static inline void cec_msg_system_audio_mode_ 1481 static inline void cec_msg_system_audio_mode_status(struct cec_msg *msg,
1484 1482 __u8 sys_aud_status)
1485 { 1483 {
1486 msg->len = 3; 1484 msg->len = 3;
1487 msg->msg[1] = CEC_MSG_SYSTEM_AUDIO_MO 1485 msg->msg[1] = CEC_MSG_SYSTEM_AUDIO_MODE_STATUS;
1488 msg->msg[2] = sys_aud_status; 1486 msg->msg[2] = sys_aud_status;
1489 } 1487 }
1490 1488
1491 static inline void cec_ops_system_audio_mode_ 1489 static inline void cec_ops_system_audio_mode_status(const struct cec_msg *msg,
1492 1490 __u8 *sys_aud_status)
1493 { 1491 {
1494 *sys_aud_status = msg->msg[2]; 1492 *sys_aud_status = msg->msg[2];
1495 } 1493 }
1496 1494
1497 static inline void cec_msg_give_system_audio_ 1495 static inline void cec_msg_give_system_audio_mode_status(struct cec_msg *msg,
1498 1496 int reply)
1499 { 1497 {
1500 msg->len = 2; 1498 msg->len = 2;
1501 msg->msg[1] = CEC_MSG_GIVE_SYSTEM_AUD 1499 msg->msg[1] = CEC_MSG_GIVE_SYSTEM_AUDIO_MODE_STATUS;
1502 msg->reply = reply ? CEC_MSG_SYSTEM_A 1500 msg->reply = reply ? CEC_MSG_SYSTEM_AUDIO_MODE_STATUS : 0;
1503 } 1501 }
1504 1502
1505 static inline void cec_msg_report_short_audio 1503 static inline void cec_msg_report_short_audio_descriptor(struct cec_msg *msg,
1506 __u8 1504 __u8 num_descriptors,
1507 const 1505 const __u32 *descriptors)
1508 { 1506 {
1509 unsigned int i; 1507 unsigned int i;
1510 1508
1511 if (num_descriptors > 4) 1509 if (num_descriptors > 4)
1512 num_descriptors = 4; 1510 num_descriptors = 4;
1513 msg->len = 2 + num_descriptors * 3; 1511 msg->len = 2 + num_descriptors * 3;
1514 msg->msg[1] = CEC_MSG_REPORT_SHORT_AU 1512 msg->msg[1] = CEC_MSG_REPORT_SHORT_AUDIO_DESCRIPTOR;
1515 for (i = 0; i < num_descriptors; i++) 1513 for (i = 0; i < num_descriptors; i++) {
1516 msg->msg[2 + i * 3] = (descri 1514 msg->msg[2 + i * 3] = (descriptors[i] >> 16) & 0xff;
1517 msg->msg[3 + i * 3] = (descri 1515 msg->msg[3 + i * 3] = (descriptors[i] >> 8) & 0xff;
1518 msg->msg[4 + i * 3] = descrip 1516 msg->msg[4 + i * 3] = descriptors[i] & 0xff;
1519 } 1517 }
1520 } 1518 }
1521 1519
1522 static inline void cec_ops_report_short_audio 1520 static inline void cec_ops_report_short_audio_descriptor(const struct cec_msg *msg,
1523 1521 __u8 *num_descriptors,
1524 1522 __u32 *descriptors)
1525 { 1523 {
1526 unsigned int i; 1524 unsigned int i;
1527 1525
1528 *num_descriptors = (msg->len - 2) / 3 1526 *num_descriptors = (msg->len - 2) / 3;
1529 if (*num_descriptors > 4) 1527 if (*num_descriptors > 4)
1530 *num_descriptors = 4; 1528 *num_descriptors = 4;
1531 for (i = 0; i < *num_descriptors; i++ 1529 for (i = 0; i < *num_descriptors; i++)
1532 descriptors[i] = (msg->msg[2 1530 descriptors[i] = (msg->msg[2 + i * 3] << 16) |
1533 (msg->msg[3 + i * 3] 1531 (msg->msg[3 + i * 3] << 8) |
1534 msg->msg[4 + i * 3]; 1532 msg->msg[4 + i * 3];
1535 } 1533 }
1536 1534
1537 static inline void cec_msg_request_short_audi 1535 static inline void cec_msg_request_short_audio_descriptor(struct cec_msg *msg,
1538 int r 1536 int reply,
1539 __u8 1537 __u8 num_descriptors,
1540 const 1538 const __u8 *audio_format_id,
1541 const 1539 const __u8 *audio_format_code)
1542 { 1540 {
1543 unsigned int i; 1541 unsigned int i;
1544 1542
1545 if (num_descriptors > 4) 1543 if (num_descriptors > 4)
1546 num_descriptors = 4; 1544 num_descriptors = 4;
1547 msg->len = 2 + num_descriptors; 1545 msg->len = 2 + num_descriptors;
1548 msg->msg[1] = CEC_MSG_REQUEST_SHORT_A 1546 msg->msg[1] = CEC_MSG_REQUEST_SHORT_AUDIO_DESCRIPTOR;
1549 msg->reply = reply ? CEC_MSG_REPORT_S 1547 msg->reply = reply ? CEC_MSG_REPORT_SHORT_AUDIO_DESCRIPTOR : 0;
1550 for (i = 0; i < num_descriptors; i++) 1548 for (i = 0; i < num_descriptors; i++)
1551 msg->msg[2 + i] = (audio_form 1549 msg->msg[2 + i] = (audio_format_id[i] << 6) |
1552 (audio_form 1550 (audio_format_code[i] & 0x3f);
1553 } 1551 }
1554 1552
1555 static inline void cec_ops_request_short_audi 1553 static inline void cec_ops_request_short_audio_descriptor(const struct cec_msg *msg,
1556 __u8 1554 __u8 *num_descriptors,
1557 __u8 1555 __u8 *audio_format_id,
1558 __u8 1556 __u8 *audio_format_code)
1559 { 1557 {
1560 unsigned int i; 1558 unsigned int i;
1561 1559
1562 *num_descriptors = msg->len - 2; 1560 *num_descriptors = msg->len - 2;
1563 if (*num_descriptors > 4) 1561 if (*num_descriptors > 4)
1564 *num_descriptors = 4; 1562 *num_descriptors = 4;
1565 for (i = 0; i < *num_descriptors; i++ 1563 for (i = 0; i < *num_descriptors; i++) {
1566 audio_format_id[i] = msg->msg 1564 audio_format_id[i] = msg->msg[2 + i] >> 6;
1567 audio_format_code[i] = msg->m 1565 audio_format_code[i] = msg->msg[2 + i] & 0x3f;
1568 } 1566 }
1569 } 1567 }
1570 1568
1571 static inline void cec_msg_set_audio_volume_l <<
1572 <<
1573 { <<
1574 msg->len = 3; <<
1575 msg->msg[1] = CEC_MSG_SET_AUDIO_VOLUM <<
1576 msg->msg[2] = audio_volume_level; <<
1577 } <<
1578 <<
1579 static inline void cec_ops_set_audio_volume_l <<
1580 <<
1581 { <<
1582 *audio_volume_level = msg->msg[2]; <<
1583 } <<
1584 <<
1585 1569
1586 /* Audio Rate Control Feature */ 1570 /* Audio Rate Control Feature */
1587 static inline void cec_msg_set_audio_rate(str 1571 static inline void cec_msg_set_audio_rate(struct cec_msg *msg,
1588 __u 1572 __u8 audio_rate)
1589 { 1573 {
1590 msg->len = 3; 1574 msg->len = 3;
1591 msg->msg[1] = CEC_MSG_SET_AUDIO_RATE; 1575 msg->msg[1] = CEC_MSG_SET_AUDIO_RATE;
1592 msg->msg[2] = audio_rate; 1576 msg->msg[2] = audio_rate;
1593 } 1577 }
1594 1578
1595 static inline void cec_ops_set_audio_rate(con 1579 static inline void cec_ops_set_audio_rate(const struct cec_msg *msg,
1596 __u 1580 __u8 *audio_rate)
1597 { 1581 {
1598 *audio_rate = msg->msg[2]; 1582 *audio_rate = msg->msg[2];
1599 } 1583 }
1600 1584
1601 1585
1602 /* Audio Return Channel Control Feature */ 1586 /* Audio Return Channel Control Feature */
1603 static inline void cec_msg_report_arc_initiat 1587 static inline void cec_msg_report_arc_initiated(struct cec_msg *msg)
1604 { 1588 {
1605 msg->len = 2; 1589 msg->len = 2;
1606 msg->msg[1] = CEC_MSG_REPORT_ARC_INIT 1590 msg->msg[1] = CEC_MSG_REPORT_ARC_INITIATED;
1607 } 1591 }
1608 1592
1609 static inline void cec_msg_initiate_arc(struc 1593 static inline void cec_msg_initiate_arc(struct cec_msg *msg,
1610 int r 1594 int reply)
1611 { 1595 {
1612 msg->len = 2; 1596 msg->len = 2;
1613 msg->msg[1] = CEC_MSG_INITIATE_ARC; 1597 msg->msg[1] = CEC_MSG_INITIATE_ARC;
1614 msg->reply = reply ? CEC_MSG_REPORT_A 1598 msg->reply = reply ? CEC_MSG_REPORT_ARC_INITIATED : 0;
1615 } 1599 }
1616 1600
1617 static inline void cec_msg_request_arc_initia 1601 static inline void cec_msg_request_arc_initiation(struct cec_msg *msg,
1618 1602 int reply)
1619 { 1603 {
1620 msg->len = 2; 1604 msg->len = 2;
1621 msg->msg[1] = CEC_MSG_REQUEST_ARC_INI 1605 msg->msg[1] = CEC_MSG_REQUEST_ARC_INITIATION;
1622 msg->reply = reply ? CEC_MSG_INITIATE 1606 msg->reply = reply ? CEC_MSG_INITIATE_ARC : 0;
1623 } 1607 }
1624 1608
1625 static inline void cec_msg_report_arc_termina 1609 static inline void cec_msg_report_arc_terminated(struct cec_msg *msg)
1626 { 1610 {
1627 msg->len = 2; 1611 msg->len = 2;
1628 msg->msg[1] = CEC_MSG_REPORT_ARC_TERM 1612 msg->msg[1] = CEC_MSG_REPORT_ARC_TERMINATED;
1629 } 1613 }
1630 1614
1631 static inline void cec_msg_terminate_arc(stru 1615 static inline void cec_msg_terminate_arc(struct cec_msg *msg,
1632 int 1616 int reply)
1633 { 1617 {
1634 msg->len = 2; 1618 msg->len = 2;
1635 msg->msg[1] = CEC_MSG_TERMINATE_ARC; 1619 msg->msg[1] = CEC_MSG_TERMINATE_ARC;
1636 msg->reply = reply ? CEC_MSG_REPORT_A 1620 msg->reply = reply ? CEC_MSG_REPORT_ARC_TERMINATED : 0;
1637 } 1621 }
1638 1622
1639 static inline void cec_msg_request_arc_termin 1623 static inline void cec_msg_request_arc_termination(struct cec_msg *msg,
1640 1624 int reply)
1641 { 1625 {
1642 msg->len = 2; 1626 msg->len = 2;
1643 msg->msg[1] = CEC_MSG_REQUEST_ARC_TER 1627 msg->msg[1] = CEC_MSG_REQUEST_ARC_TERMINATION;
1644 msg->reply = reply ? CEC_MSG_TERMINAT 1628 msg->reply = reply ? CEC_MSG_TERMINATE_ARC : 0;
1645 } 1629 }
1646 1630
1647 1631
1648 /* Dynamic Audio Lipsync Feature */ 1632 /* Dynamic Audio Lipsync Feature */
1649 /* Only for CEC 2.0 and up */ 1633 /* Only for CEC 2.0 and up */
1650 static inline void cec_msg_report_current_lat 1634 static inline void cec_msg_report_current_latency(struct cec_msg *msg,
1651 1635 __u16 phys_addr,
1652 1636 __u8 video_latency,
1653 1637 __u8 low_latency_mode,
1654 1638 __u8 audio_out_compensated,
1655 1639 __u8 audio_out_delay)
1656 { 1640 {
1657 msg->len = 6; 1641 msg->len = 6;
1658 msg->msg[0] |= 0xf; /* broadcast */ 1642 msg->msg[0] |= 0xf; /* broadcast */
1659 msg->msg[1] = CEC_MSG_REPORT_CURRENT_ 1643 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;
1660 msg->msg[2] = phys_addr >> 8; 1644 msg->msg[2] = phys_addr >> 8;
1661 msg->msg[3] = phys_addr & 0xff; 1645 msg->msg[3] = phys_addr & 0xff;
1662 msg->msg[4] = video_latency; 1646 msg->msg[4] = video_latency;
1663 msg->msg[5] = (low_latency_mode << 2) 1647 msg->msg[5] = (low_latency_mode << 2) | audio_out_compensated;
1664 if (audio_out_compensated == 3) 1648 if (audio_out_compensated == 3)
1665 msg->msg[msg->len++] = audio_ 1649 msg->msg[msg->len++] = audio_out_delay;
1666 } 1650 }
1667 1651
1668 static inline void cec_ops_report_current_lat 1652 static inline void cec_ops_report_current_latency(const struct cec_msg *msg,
1669 1653 __u16 *phys_addr,
1670 1654 __u8 *video_latency,
1671 1655 __u8 *low_latency_mode,
1672 1656 __u8 *audio_out_compensated,
1673 1657 __u8 *audio_out_delay)
1674 { 1658 {
1675 *phys_addr = (msg->msg[2] << 8) | msg 1659 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1676 *video_latency = msg->msg[4]; 1660 *video_latency = msg->msg[4];
1677 *low_latency_mode = (msg->msg[5] >> 2 1661 *low_latency_mode = (msg->msg[5] >> 2) & 1;
1678 *audio_out_compensated = msg->msg[5] 1662 *audio_out_compensated = msg->msg[5] & 3;
1679 if (*audio_out_compensated == 3 && ms 1663 if (*audio_out_compensated == 3 && msg->len >= 7)
1680 *audio_out_delay = msg->msg[6 1664 *audio_out_delay = msg->msg[6];
1681 else 1665 else
1682 *audio_out_delay = 1; !! 1666 *audio_out_delay = 0;
1683 } 1667 }
1684 1668
1685 static inline void cec_msg_request_current_la 1669 static inline void cec_msg_request_current_latency(struct cec_msg *msg,
1686 1670 int reply,
1687 1671 __u16 phys_addr)
1688 { 1672 {
1689 msg->len = 4; 1673 msg->len = 4;
1690 msg->msg[0] |= 0xf; /* broadcast */ 1674 msg->msg[0] |= 0xf; /* broadcast */
1691 msg->msg[1] = CEC_MSG_REQUEST_CURRENT 1675 msg->msg[1] = CEC_MSG_REQUEST_CURRENT_LATENCY;
1692 msg->msg[2] = phys_addr >> 8; 1676 msg->msg[2] = phys_addr >> 8;
1693 msg->msg[3] = phys_addr & 0xff; 1677 msg->msg[3] = phys_addr & 0xff;
1694 msg->reply = reply ? CEC_MSG_REPORT_C 1678 msg->reply = reply ? CEC_MSG_REPORT_CURRENT_LATENCY : 0;
1695 } 1679 }
1696 1680
1697 static inline void cec_ops_request_current_la 1681 static inline void cec_ops_request_current_latency(const struct cec_msg *msg,
1698 1682 __u16 *phys_addr)
1699 { 1683 {
1700 *phys_addr = (msg->msg[2] << 8) | msg 1684 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1701 } 1685 }
1702 1686
1703 1687
1704 /* Capability Discovery and Control Feature * 1688 /* Capability Discovery and Control Feature */
1705 static inline void cec_msg_cdc_hec_inquire_st 1689 static inline void cec_msg_cdc_hec_inquire_state(struct cec_msg *msg,
1706 1690 __u16 phys_addr1,
1707 1691 __u16 phys_addr2)
1708 { 1692 {
1709 msg->len = 9; 1693 msg->len = 9;
1710 msg->msg[0] |= 0xf; /* broadcast */ 1694 msg->msg[0] |= 0xf; /* broadcast */
1711 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1695 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1712 /* msg[2] and msg[3] (phys_addr) are 1696 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1713 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE 1697 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE_STATE;
1714 msg->msg[5] = phys_addr1 >> 8; 1698 msg->msg[5] = phys_addr1 >> 8;
1715 msg->msg[6] = phys_addr1 & 0xff; 1699 msg->msg[6] = phys_addr1 & 0xff;
1716 msg->msg[7] = phys_addr2 >> 8; 1700 msg->msg[7] = phys_addr2 >> 8;
1717 msg->msg[8] = phys_addr2 & 0xff; 1701 msg->msg[8] = phys_addr2 & 0xff;
1718 } 1702 }
1719 1703
1720 static inline void cec_ops_cdc_hec_inquire_st 1704 static inline void cec_ops_cdc_hec_inquire_state(const struct cec_msg *msg,
1721 1705 __u16 *phys_addr,
1722 1706 __u16 *phys_addr1,
1723 1707 __u16 *phys_addr2)
1724 { 1708 {
1725 *phys_addr = (msg->msg[2] << 8) | msg 1709 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1726 *phys_addr1 = (msg->msg[5] << 8) | ms 1710 *phys_addr1 = (msg->msg[5] << 8) | msg->msg[6];
1727 *phys_addr2 = (msg->msg[7] << 8) | ms 1711 *phys_addr2 = (msg->msg[7] << 8) | msg->msg[8];
1728 } 1712 }
1729 1713
1730 static inline void cec_msg_cdc_hec_report_sta 1714 static inline void cec_msg_cdc_hec_report_state(struct cec_msg *msg,
1731 1715 __u16 target_phys_addr,
1732 1716 __u8 hec_func_state,
1733 1717 __u8 host_func_state,
1734 1718 __u8 enc_func_state,
1735 1719 __u8 cdc_errcode,
1736 1720 __u8 has_field,
1737 1721 __u16 hec_field)
1738 { 1722 {
1739 msg->len = has_field ? 10 : 8; 1723 msg->len = has_field ? 10 : 8;
1740 msg->msg[0] |= 0xf; /* broadcast */ 1724 msg->msg[0] |= 0xf; /* broadcast */
1741 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1725 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1742 /* msg[2] and msg[3] (phys_addr) are 1726 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1743 msg->msg[4] = CEC_MSG_CDC_HEC_REPORT_ 1727 msg->msg[4] = CEC_MSG_CDC_HEC_REPORT_STATE;
1744 msg->msg[5] = target_phys_addr >> 8; 1728 msg->msg[5] = target_phys_addr >> 8;
1745 msg->msg[6] = target_phys_addr & 0xff 1729 msg->msg[6] = target_phys_addr & 0xff;
1746 msg->msg[7] = (hec_func_state << 6) | 1730 msg->msg[7] = (hec_func_state << 6) |
1747 (host_func_state << 4) 1731 (host_func_state << 4) |
1748 (enc_func_state << 2) | 1732 (enc_func_state << 2) |
1749 cdc_errcode; 1733 cdc_errcode;
1750 if (has_field) { 1734 if (has_field) {
1751 msg->msg[8] = hec_field >> 8; 1735 msg->msg[8] = hec_field >> 8;
1752 msg->msg[9] = hec_field & 0xf 1736 msg->msg[9] = hec_field & 0xff;
1753 } 1737 }
1754 } 1738 }
1755 1739
1756 static inline void cec_ops_cdc_hec_report_sta 1740 static inline void cec_ops_cdc_hec_report_state(const struct cec_msg *msg,
1757 1741 __u16 *phys_addr,
1758 1742 __u16 *target_phys_addr,
1759 1743 __u8 *hec_func_state,
1760 1744 __u8 *host_func_state,
1761 1745 __u8 *enc_func_state,
1762 1746 __u8 *cdc_errcode,
1763 1747 __u8 *has_field,
1764 1748 __u16 *hec_field)
1765 { 1749 {
1766 *phys_addr = (msg->msg[2] << 8) | msg 1750 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1767 *target_phys_addr = (msg->msg[5] << 8 1751 *target_phys_addr = (msg->msg[5] << 8) | msg->msg[6];
1768 *hec_func_state = msg->msg[7] >> 6; 1752 *hec_func_state = msg->msg[7] >> 6;
1769 *host_func_state = (msg->msg[7] >> 4) 1753 *host_func_state = (msg->msg[7] >> 4) & 3;
1770 *enc_func_state = (msg->msg[7] >> 4) 1754 *enc_func_state = (msg->msg[7] >> 4) & 3;
1771 *cdc_errcode = msg->msg[7] & 3; 1755 *cdc_errcode = msg->msg[7] & 3;
1772 *has_field = msg->len >= 10; 1756 *has_field = msg->len >= 10;
1773 *hec_field = *has_field ? ((msg->msg[ 1757 *hec_field = *has_field ? ((msg->msg[8] << 8) | msg->msg[9]) : 0;
1774 } 1758 }
1775 1759
1776 static inline void cec_msg_cdc_hec_set_state( 1760 static inline void cec_msg_cdc_hec_set_state(struct cec_msg *msg,
1777 1761 __u16 phys_addr1,
1778 1762 __u16 phys_addr2,
1779 1763 __u8 hec_set_state,
1780 1764 __u16 phys_addr3,
1781 1765 __u16 phys_addr4,
1782 1766 __u16 phys_addr5)
1783 { 1767 {
1784 msg->len = 10; 1768 msg->len = 10;
1785 msg->msg[0] |= 0xf; /* broadcast */ 1769 msg->msg[0] |= 0xf; /* broadcast */
1786 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1770 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1787 /* msg[2] and msg[3] (phys_addr) are 1771 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1788 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE 1772 msg->msg[4] = CEC_MSG_CDC_HEC_INQUIRE_STATE;
1789 msg->msg[5] = phys_addr1 >> 8; 1773 msg->msg[5] = phys_addr1 >> 8;
1790 msg->msg[6] = phys_addr1 & 0xff; 1774 msg->msg[6] = phys_addr1 & 0xff;
1791 msg->msg[7] = phys_addr2 >> 8; 1775 msg->msg[7] = phys_addr2 >> 8;
1792 msg->msg[8] = phys_addr2 & 0xff; 1776 msg->msg[8] = phys_addr2 & 0xff;
1793 msg->msg[9] = hec_set_state; 1777 msg->msg[9] = hec_set_state;
1794 if (phys_addr3 != CEC_PHYS_ADDR_INVAL 1778 if (phys_addr3 != CEC_PHYS_ADDR_INVALID) {
1795 msg->msg[msg->len++] = phys_a 1779 msg->msg[msg->len++] = phys_addr3 >> 8;
1796 msg->msg[msg->len++] = phys_a 1780 msg->msg[msg->len++] = phys_addr3 & 0xff;
1797 if (phys_addr4 != CEC_PHYS_AD 1781 if (phys_addr4 != CEC_PHYS_ADDR_INVALID) {
1798 msg->msg[msg->len++] 1782 msg->msg[msg->len++] = phys_addr4 >> 8;
1799 msg->msg[msg->len++] 1783 msg->msg[msg->len++] = phys_addr4 & 0xff;
1800 if (phys_addr5 != CEC 1784 if (phys_addr5 != CEC_PHYS_ADDR_INVALID) {
1801 msg->msg[msg- 1785 msg->msg[msg->len++] = phys_addr5 >> 8;
1802 msg->msg[msg- 1786 msg->msg[msg->len++] = phys_addr5 & 0xff;
1803 } 1787 }
1804 } 1788 }
1805 } 1789 }
1806 } 1790 }
1807 1791
1808 static inline void cec_ops_cdc_hec_set_state( 1792 static inline void cec_ops_cdc_hec_set_state(const struct cec_msg *msg,
1809 1793 __u16 *phys_addr,
1810 1794 __u16 *phys_addr1,
1811 1795 __u16 *phys_addr2,
1812 1796 __u8 *hec_set_state,
1813 1797 __u16 *phys_addr3,
1814 1798 __u16 *phys_addr4,
1815 1799 __u16 *phys_addr5)
1816 { 1800 {
1817 *phys_addr = (msg->msg[2] << 8) | msg 1801 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1818 *phys_addr1 = (msg->msg[5] << 8) | ms 1802 *phys_addr1 = (msg->msg[5] << 8) | msg->msg[6];
1819 *phys_addr2 = (msg->msg[7] << 8) | ms 1803 *phys_addr2 = (msg->msg[7] << 8) | msg->msg[8];
1820 *hec_set_state = msg->msg[9]; 1804 *hec_set_state = msg->msg[9];
1821 *phys_addr3 = *phys_addr4 = *phys_add 1805 *phys_addr3 = *phys_addr4 = *phys_addr5 = CEC_PHYS_ADDR_INVALID;
1822 if (msg->len >= 12) 1806 if (msg->len >= 12)
1823 *phys_addr3 = (msg->msg[10] < 1807 *phys_addr3 = (msg->msg[10] << 8) | msg->msg[11];
1824 if (msg->len >= 14) 1808 if (msg->len >= 14)
1825 *phys_addr4 = (msg->msg[12] < 1809 *phys_addr4 = (msg->msg[12] << 8) | msg->msg[13];
1826 if (msg->len >= 16) 1810 if (msg->len >= 16)
1827 *phys_addr5 = (msg->msg[14] < 1811 *phys_addr5 = (msg->msg[14] << 8) | msg->msg[15];
1828 } 1812 }
1829 1813
1830 static inline void cec_msg_cdc_hec_set_state_ 1814 static inline void cec_msg_cdc_hec_set_state_adjacent(struct cec_msg *msg,
1831 1815 __u16 phys_addr1,
1832 1816 __u8 hec_set_state)
1833 { 1817 {
1834 msg->len = 8; 1818 msg->len = 8;
1835 msg->msg[0] |= 0xf; /* broadcast */ 1819 msg->msg[0] |= 0xf; /* broadcast */
1836 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1820 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1837 /* msg[2] and msg[3] (phys_addr) are 1821 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1838 msg->msg[4] = CEC_MSG_CDC_HEC_SET_STA 1822 msg->msg[4] = CEC_MSG_CDC_HEC_SET_STATE_ADJACENT;
1839 msg->msg[5] = phys_addr1 >> 8; 1823 msg->msg[5] = phys_addr1 >> 8;
1840 msg->msg[6] = phys_addr1 & 0xff; 1824 msg->msg[6] = phys_addr1 & 0xff;
1841 msg->msg[7] = hec_set_state; 1825 msg->msg[7] = hec_set_state;
1842 } 1826 }
1843 1827
1844 static inline void cec_ops_cdc_hec_set_state_ 1828 static inline void cec_ops_cdc_hec_set_state_adjacent(const struct cec_msg *msg,
1845 1829 __u16 *phys_addr,
1846 1830 __u16 *phys_addr1,
1847 1831 __u8 *hec_set_state)
1848 { 1832 {
1849 *phys_addr = (msg->msg[2] << 8) | msg 1833 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1850 *phys_addr1 = (msg->msg[5] << 8) | ms 1834 *phys_addr1 = (msg->msg[5] << 8) | msg->msg[6];
1851 *hec_set_state = msg->msg[7]; 1835 *hec_set_state = msg->msg[7];
1852 } 1836 }
1853 1837
1854 static inline void cec_msg_cdc_hec_request_de 1838 static inline void cec_msg_cdc_hec_request_deactivation(struct cec_msg *msg,
1855 1839 __u16 phys_addr1,
1856 1840 __u16 phys_addr2,
1857 1841 __u16 phys_addr3)
1858 { 1842 {
1859 msg->len = 11; 1843 msg->len = 11;
1860 msg->msg[0] |= 0xf; /* broadcast */ 1844 msg->msg[0] |= 0xf; /* broadcast */
1861 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1845 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1862 /* msg[2] and msg[3] (phys_addr) are 1846 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1863 msg->msg[4] = CEC_MSG_CDC_HEC_REQUEST 1847 msg->msg[4] = CEC_MSG_CDC_HEC_REQUEST_DEACTIVATION;
1864 msg->msg[5] = phys_addr1 >> 8; 1848 msg->msg[5] = phys_addr1 >> 8;
1865 msg->msg[6] = phys_addr1 & 0xff; 1849 msg->msg[6] = phys_addr1 & 0xff;
1866 msg->msg[7] = phys_addr2 >> 8; 1850 msg->msg[7] = phys_addr2 >> 8;
1867 msg->msg[8] = phys_addr2 & 0xff; 1851 msg->msg[8] = phys_addr2 & 0xff;
1868 msg->msg[9] = phys_addr3 >> 8; 1852 msg->msg[9] = phys_addr3 >> 8;
1869 msg->msg[10] = phys_addr3 & 0xff; 1853 msg->msg[10] = phys_addr3 & 0xff;
1870 } 1854 }
1871 1855
1872 static inline void cec_ops_cdc_hec_request_de 1856 static inline void cec_ops_cdc_hec_request_deactivation(const struct cec_msg *msg,
1873 1857 __u16 *phys_addr,
1874 1858 __u16 *phys_addr1,
1875 1859 __u16 *phys_addr2,
1876 1860 __u16 *phys_addr3)
1877 { 1861 {
1878 *phys_addr = (msg->msg[2] << 8) | msg 1862 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1879 *phys_addr1 = (msg->msg[5] << 8) | ms 1863 *phys_addr1 = (msg->msg[5] << 8) | msg->msg[6];
1880 *phys_addr2 = (msg->msg[7] << 8) | ms 1864 *phys_addr2 = (msg->msg[7] << 8) | msg->msg[8];
1881 *phys_addr3 = (msg->msg[9] << 8) | ms 1865 *phys_addr3 = (msg->msg[9] << 8) | msg->msg[10];
1882 } 1866 }
1883 1867
1884 static inline void cec_msg_cdc_hec_notify_ali 1868 static inline void cec_msg_cdc_hec_notify_alive(struct cec_msg *msg)
1885 { 1869 {
1886 msg->len = 5; 1870 msg->len = 5;
1887 msg->msg[0] |= 0xf; /* broadcast */ 1871 msg->msg[0] |= 0xf; /* broadcast */
1888 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1872 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1889 /* msg[2] and msg[3] (phys_addr) are 1873 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1890 msg->msg[4] = CEC_MSG_CDC_HEC_NOTIFY_ 1874 msg->msg[4] = CEC_MSG_CDC_HEC_NOTIFY_ALIVE;
1891 } 1875 }
1892 1876
1893 static inline void cec_ops_cdc_hec_notify_ali 1877 static inline void cec_ops_cdc_hec_notify_alive(const struct cec_msg *msg,
1894 1878 __u16 *phys_addr)
1895 { 1879 {
1896 *phys_addr = (msg->msg[2] << 8) | msg 1880 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1897 } 1881 }
1898 1882
1899 static inline void cec_msg_cdc_hec_discover(s 1883 static inline void cec_msg_cdc_hec_discover(struct cec_msg *msg)
1900 { 1884 {
1901 msg->len = 5; 1885 msg->len = 5;
1902 msg->msg[0] |= 0xf; /* broadcast */ 1886 msg->msg[0] |= 0xf; /* broadcast */
1903 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1887 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1904 /* msg[2] and msg[3] (phys_addr) are 1888 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1905 msg->msg[4] = CEC_MSG_CDC_HEC_DISCOVE 1889 msg->msg[4] = CEC_MSG_CDC_HEC_DISCOVER;
1906 } 1890 }
1907 1891
1908 static inline void cec_ops_cdc_hec_discover(c 1892 static inline void cec_ops_cdc_hec_discover(const struct cec_msg *msg,
1909 _ 1893 __u16 *phys_addr)
1910 { 1894 {
1911 *phys_addr = (msg->msg[2] << 8) | msg 1895 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1912 } 1896 }
1913 1897
1914 static inline void cec_msg_cdc_hpd_set_state( 1898 static inline void cec_msg_cdc_hpd_set_state(struct cec_msg *msg,
1915 1899 __u8 input_port,
1916 1900 __u8 hpd_state)
1917 { 1901 {
1918 msg->len = 6; 1902 msg->len = 6;
1919 msg->msg[0] |= 0xf; /* broadcast */ 1903 msg->msg[0] |= 0xf; /* broadcast */
1920 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1904 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1921 /* msg[2] and msg[3] (phys_addr) are 1905 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1922 msg->msg[4] = CEC_MSG_CDC_HPD_SET_STA 1906 msg->msg[4] = CEC_MSG_CDC_HPD_SET_STATE;
1923 msg->msg[5] = (input_port << 4) | hpd 1907 msg->msg[5] = (input_port << 4) | hpd_state;
1924 } 1908 }
1925 1909
1926 static inline void cec_ops_cdc_hpd_set_state( 1910 static inline void cec_ops_cdc_hpd_set_state(const struct cec_msg *msg,
1927 _ 1911 __u16 *phys_addr,
1928 _ 1912 __u8 *input_port,
1929 _ 1913 __u8 *hpd_state)
1930 { 1914 {
1931 *phys_addr = (msg->msg[2] << 8) | msg 1915 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1932 *input_port = msg->msg[5] >> 4; 1916 *input_port = msg->msg[5] >> 4;
1933 *hpd_state = msg->msg[5] & 0xf; 1917 *hpd_state = msg->msg[5] & 0xf;
1934 } 1918 }
1935 1919
1936 static inline void cec_msg_cdc_hpd_report_sta 1920 static inline void cec_msg_cdc_hpd_report_state(struct cec_msg *msg,
1937 1921 __u8 hpd_state,
1938 1922 __u8 hpd_error)
1939 { 1923 {
1940 msg->len = 6; 1924 msg->len = 6;
1941 msg->msg[0] |= 0xf; /* broadcast */ 1925 msg->msg[0] |= 0xf; /* broadcast */
1942 msg->msg[1] = CEC_MSG_CDC_MESSAGE; 1926 msg->msg[1] = CEC_MSG_CDC_MESSAGE;
1943 /* msg[2] and msg[3] (phys_addr) are 1927 /* msg[2] and msg[3] (phys_addr) are filled in by the CEC framework */
1944 msg->msg[4] = CEC_MSG_CDC_HPD_REPORT_ 1928 msg->msg[4] = CEC_MSG_CDC_HPD_REPORT_STATE;
1945 msg->msg[5] = (hpd_state << 4) | hpd_ 1929 msg->msg[5] = (hpd_state << 4) | hpd_error;
1946 } 1930 }
1947 1931
1948 static inline void cec_ops_cdc_hpd_report_sta 1932 static inline void cec_ops_cdc_hpd_report_state(const struct cec_msg *msg,
1949 1933 __u16 *phys_addr,
1950 1934 __u8 *hpd_state,
1951 1935 __u8 *hpd_error)
1952 { 1936 {
1953 *phys_addr = (msg->msg[2] << 8) | msg 1937 *phys_addr = (msg->msg[2] << 8) | msg->msg[3];
1954 *hpd_state = msg->msg[5] >> 4; 1938 *hpd_state = msg->msg[5] >> 4;
1955 *hpd_error = msg->msg[5] & 0xf; 1939 *hpd_error = msg->msg[5] & 0xf;
1956 } 1940 }
1957 1941
1958 #endif 1942 #endif
1959 1943
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.