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