projects / openwrt / staging / blocktrron.git / blob
? search:


28100d7c28d9fb7440a521feeba8304b60708718
[openwrt/staging/blocktrron.git] /
1 From ce37cf5ffd6f3913bb3a66de851124e486c31ad5 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Wed, 21 Feb 2018 13:49:32 +0000
4 Subject: [PATCH 244/782] staging: bcm2835-camera: Fix comment style
5 violations.
6
7 Fix comment style violations in the header files.
8
9 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
10 ---
11 .../bcm2835-camera/mmal-msg-format.h | 95 ++++++------
12 .../bcm2835-camera/mmal-msg-port.h | 124 ++++++++--------
13 .../vc04_services/bcm2835-camera/mmal-msg.h | 135 +++++++++---------
14 3 files changed, 185 insertions(+), 169 deletions(-)
15
16 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h
17 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h
18 @@ -19,22 +19,23 @@
19 /* MMAL_ES_FORMAT_T */
20
21 struct mmal_audio_format {
22 - u32 channels; /**< Number of audio channels */
23 - u32 sample_rate; /**< Sample rate */
24 + u32 channels; /* Number of audio channels */
25 + u32 sample_rate; /* Sample rate */
26
27 - u32 bits_per_sample; /**< Bits per sample */
28 - u32 block_align; /**< Size of a block of data */
29 + u32 bits_per_sample; /* Bits per sample */
30 + u32 block_align; /* Size of a block of data */
31 };
32
33 struct mmal_video_format {
34 - u32 width; /**< Width of frame in pixels */
35 - u32 height; /**< Height of frame in rows of pixels */
36 - struct mmal_rect crop; /**< Visible region of the frame */
37 - struct mmal_rational frame_rate; /**< Frame rate */
38 - struct mmal_rational par; /**< Pixel aspect ratio */
39 -
40 - /* FourCC specifying the color space of the video stream. See the
41 - * \ref MmalColorSpace "pre-defined color spaces" for some examples.
42 + u32 width; /* Width of frame in pixels */
43 + u32 height; /* Height of frame in rows of pixels */
44 + struct mmal_rect crop; /* Visible region of the frame */
45 + struct mmal_rational frame_rate; /* Frame rate */
46 + struct mmal_rational par; /* Pixel aspect ratio */
47 +
48 + /*
49 + * FourCC specifying the color space of the video stream. See the
50 + * MmalColorSpace "pre-defined color spaces" for some examples.
51 */
52 u32 color_space;
53 };
54 @@ -50,48 +51,56 @@ union mmal_es_specific_format {
55 struct mmal_subpicture_format subpicture;
56 };
57
58 -/** Definition of an elementary stream format (MMAL_ES_FORMAT_T) */
59 +/* Definition of an elementary stream format (MMAL_ES_FORMAT_T) */
60 struct mmal_es_format_local {
61 - u32 type; /* enum mmal_es_type */
62 -
63 - u32 encoding; /* FourCC specifying encoding of the elementary stream.*/
64 - u32 encoding_variant; /* FourCC specifying the specific
65 - * encoding variant of the elementary
66 - * stream.
67 - */
68 -
69 - union mmal_es_specific_format *es; /* Type specific
70 - * information for the
71 - * elementary stream
72 - */
73 + u32 type; /* enum mmal_es_type */
74
75 - u32 bitrate; /**< Bitrate in bits per second */
76 - u32 flags; /**< Flags describing properties of the elementary stream. */
77 + u32 encoding; /* FourCC specifying encoding of the elementary
78 + * stream.
79 + */
80 + u32 encoding_variant; /* FourCC specifying the specific
81 + * encoding variant of the elementary
82 + * stream.
83 + */
84 +
85 + union mmal_es_specific_format *es; /* Type specific
86 + * information for the
87 + * elementary stream
88 + */
89 +
90 + u32 bitrate; /* Bitrate in bits per second */
91 + u32 flags; /* Flags describing properties of the elementary
92 + * stream.
93 + */
94
95 - u32 extradata_size; /**< Size of the codec specific data */
96 - u8 *extradata; /**< Codec specific data */
97 + u32 extradata_size; /* Size of the codec specific data */
98 + u8 *extradata; /* Codec specific data */
99 };
100
101 -/** Remote definition of an elementary stream format (MMAL_ES_FORMAT_T) */
102 +/* Remote definition of an elementary stream format (MMAL_ES_FORMAT_T) */
103 struct mmal_es_format {
104 - u32 type; /* enum mmal_es_type */
105 + u32 type; /* enum mmal_es_type */
106
107 - u32 encoding; /* FourCC specifying encoding of the elementary stream.*/
108 - u32 encoding_variant; /* FourCC specifying the specific
109 - * encoding variant of the elementary
110 - * stream.
111 - */
112 + u32 encoding; /* FourCC specifying encoding of the elementary
113 + * stream.
114 + */
115 + u32 encoding_variant; /* FourCC specifying the specific
116 + * encoding variant of the elementary
117 + * stream.
118 + */
119
120 - u32 es; /* Type specific
121 + u32 es; /* Type specific
122 * information for the
123 * elementary stream
124 */
125
126 - u32 bitrate; /**< Bitrate in bits per second */
127 - u32 flags; /**< Flags describing properties of the elementary stream. */
128 + u32 bitrate; /* Bitrate in bits per second */
129 + u32 flags; /* Flags describing properties of the elementary
130 + * stream.
131 + */
132
133 - u32 extradata_size; /**< Size of the codec specific data */
134 - u32 extradata; /**< Codec specific data */
135 + u32 extradata_size; /* Size of the codec specific data */
136 + u32 extradata; /* Codec specific data */
137 };
138
139 #endif /* MMAL_MSG_FORMAT_H */
140 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h
141 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h
142 @@ -13,28 +13,31 @@
143
144 /* MMAL_PORT_TYPE_T */
145 enum mmal_port_type {
146 - MMAL_PORT_TYPE_UNKNOWN = 0, /**< Unknown port type */
147 - MMAL_PORT_TYPE_CONTROL, /**< Control port */
148 - MMAL_PORT_TYPE_INPUT, /**< Input port */
149 - MMAL_PORT_TYPE_OUTPUT, /**< Output port */
150 - MMAL_PORT_TYPE_CLOCK, /**< Clock port */
151 + MMAL_PORT_TYPE_UNKNOWN = 0, /* Unknown port type */
152 + MMAL_PORT_TYPE_CONTROL, /* Control port */
153 + MMAL_PORT_TYPE_INPUT, /* Input port */
154 + MMAL_PORT_TYPE_OUTPUT, /* Output port */
155 + MMAL_PORT_TYPE_CLOCK, /* Clock port */
156 };
157
158 -/** The port is pass-through and doesn't need buffer headers allocated */
159 +/* The port is pass-through and doesn't need buffer headers allocated */
160 #define MMAL_PORT_CAPABILITY_PASSTHROUGH 0x01
161 -/** The port wants to allocate the buffer payloads.
162 +/*
163 + *The port wants to allocate the buffer payloads.
164 * This signals a preference that payload allocation should be done
165 * on this port for efficiency reasons.
166 */
167 #define MMAL_PORT_CAPABILITY_ALLOCATION 0x02
168 -/** The port supports format change events.
169 +/*
170 + * The port supports format change events.
171 * This applies to input ports and is used to let the client know
172 * whether the port supports being reconfigured via a format
173 * change event (i.e. without having to disable the port).
174 */
175 #define MMAL_PORT_CAPABILITY_SUPPORTS_EVENT_FORMAT_CHANGE 0x04
176
177 -/* mmal port structure (MMAL_PORT_T)
178 +/*
179 + * mmal port structure (MMAL_PORT_T)
180 *
181 * most elements are informational only, the pointer values for
182 * interogation messages are generally provided as additional
183 @@ -42,50 +45,50 @@ enum mmal_port_type {
184 * buffer_num, buffer_size and userdata parameters are writable.
185 */
186 struct mmal_port {
187 - u32 priv; /* Private member used by the framework */
188 - u32 name; /* Port name. Used for debugging purposes (RO) */
189 + u32 priv; /* Private member used by the framework */
190 + u32 name; /* Port name. Used for debugging purposes (RO) */
191
192 - u32 type; /* Type of the port (RO) enum mmal_port_type */
193 - u16 index; /* Index of the port in its type list (RO) */
194 - u16 index_all; /* Index of the port in the list of all ports (RO) */
195 -
196 - u32 is_enabled; /* Indicates whether the port is enabled or not (RO) */
197 - u32 format; /* Format of the elementary stream */
198 -
199 - u32 buffer_num_min; /* Minimum number of buffers the port
200 - * requires (RO). This is set by the
201 - * component.
202 - */
203 -
204 - u32 buffer_size_min; /* Minimum size of buffers the port
205 - * requires (RO). This is set by the
206 - * component.
207 - */
208 -
209 - u32 buffer_alignment_min; /* Minimum alignment requirement for
210 - * the buffers (RO). A value of
211 - * zero means no special alignment
212 - * requirements. This is set by the
213 - * component.
214 - */
215 -
216 - u32 buffer_num_recommended; /* Number of buffers the port
217 - * recommends for optimal
218 - * performance (RO). A value of
219 - * zero means no special
220 - * recommendation. This is set
221 - * by the component.
222 - */
223 -
224 - u32 buffer_size_recommended; /* Size of buffers the port
225 - * recommends for optimal
226 - * performance (RO). A value of
227 - * zero means no special
228 - * recommendation. This is set
229 - * by the component.
230 - */
231 + u32 type; /* Type of the port (RO) enum mmal_port_type */
232 + u16 index; /* Index of the port in its type list (RO) */
233 + u16 index_all; /* Index of the port in the list of all ports (RO) */
234 +
235 + u32 is_enabled; /* Indicates whether the port is enabled or not (RO) */
236 + u32 format; /* Format of the elementary stream */
237 +
238 + u32 buffer_num_min; /* Minimum number of buffers the port
239 + * requires (RO). This is set by the
240 + * component.
241 + */
242 +
243 + u32 buffer_size_min; /* Minimum size of buffers the port
244 + * requires (RO). This is set by the
245 + * component.
246 + */
247 +
248 + u32 buffer_alignment_min;/* Minimum alignment requirement for
249 + * the buffers (RO). A value of
250 + * zero means no special alignment
251 + * requirements. This is set by the
252 + * component.
253 + */
254 +
255 + u32 buffer_num_recommended; /* Number of buffers the port
256 + * recommends for optimal
257 + * performance (RO). A value of
258 + * zero means no special
259 + * recommendation. This is set
260 + * by the component.
261 + */
262 +
263 + u32 buffer_size_recommended; /* Size of buffers the port
264 + * recommends for optimal
265 + * performance (RO). A value of
266 + * zero means no special
267 + * recommendation. This is set
268 + * by the component.
269 + */
270
271 - u32 buffer_num; /* Actual number of buffers the port will use.
272 + u32 buffer_num; /* Actual number of buffers the port will use.
273 * This is set by the client.
274 */
275
276 @@ -94,14 +97,13 @@ struct mmal_port {
277 * the client.
278 */
279
280 - u32 component; /* Component this port belongs to (Read Only) */
281 + u32 component; /* Component this port belongs to (Read Only) */
282
283 - u32 userdata; /* Field reserved for use by the client */
284 -
285 - u32 capabilities; /* Flags describing the capabilities of a
286 - * port (RO). Bitwise combination of \ref
287 - * portcapabilities "Port capabilities"
288 - * values.
289 - */
290 + u32 userdata; /* Field reserved for use by the client */
291
292 + u32 capabilities; /* Flags describing the capabilities of a
293 + * port (RO). Bitwise combination of \ref
294 + * portcapabilities "Port capabilities"
295 + * values.
296 + */
297 };
298 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
299 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
300 @@ -11,7 +11,8 @@
301 * Luke Diamand @ Broadcom
302 */
303
304 -/* all the data structures which serialise the MMAL protocol. note
305 +/*
306 + * all the data structures which serialise the MMAL protocol. note
307 * these are directly mapped onto the recived message data.
308 *
309 * BEWARE: They seem to *assume* pointers are u32 and that there is no
310 @@ -41,51 +42,51 @@ enum mmal_msg_type {
311 MMAL_MSG_TYPE_SERVICE_CLOSED,
312 MMAL_MSG_TYPE_GET_VERSION,
313 MMAL_MSG_TYPE_COMPONENT_CREATE,
314 - MMAL_MSG_TYPE_COMPONENT_DESTROY, /* 5 */
315 + MMAL_MSG_TYPE_COMPONENT_DESTROY, /* 5 */
316 MMAL_MSG_TYPE_COMPONENT_ENABLE,
317 MMAL_MSG_TYPE_COMPONENT_DISABLE,
318 MMAL_MSG_TYPE_PORT_INFO_GET,
319 MMAL_MSG_TYPE_PORT_INFO_SET,
320 - MMAL_MSG_TYPE_PORT_ACTION, /* 10 */
321 + MMAL_MSG_TYPE_PORT_ACTION, /* 10 */
322 MMAL_MSG_TYPE_BUFFER_FROM_HOST,
323 MMAL_MSG_TYPE_BUFFER_TO_HOST,
324 MMAL_MSG_TYPE_GET_STATS,
325 MMAL_MSG_TYPE_PORT_PARAMETER_SET,
326 - MMAL_MSG_TYPE_PORT_PARAMETER_GET, /* 15 */
327 + MMAL_MSG_TYPE_PORT_PARAMETER_GET, /* 15 */
328 MMAL_MSG_TYPE_EVENT_TO_HOST,
329 MMAL_MSG_TYPE_GET_CORE_STATS_FOR_PORT,
330 MMAL_MSG_TYPE_OPAQUE_ALLOCATOR,
331 MMAL_MSG_TYPE_CONSUME_MEM,
332 - MMAL_MSG_TYPE_LMK, /* 20 */
333 + MMAL_MSG_TYPE_LMK, /* 20 */
334 MMAL_MSG_TYPE_OPAQUE_ALLOCATOR_DESC,
335 MMAL_MSG_TYPE_DRM_GET_LHS32,
336 MMAL_MSG_TYPE_DRM_GET_TIME,
337 MMAL_MSG_TYPE_BUFFER_FROM_HOST_ZEROLEN,
338 - MMAL_MSG_TYPE_PORT_FLUSH, /* 25 */
339 + MMAL_MSG_TYPE_PORT_FLUSH, /* 25 */
340 MMAL_MSG_TYPE_HOST_LOG,
341 MMAL_MSG_TYPE_MSG_LAST
342 };
343
344 /* port action request messages differ depending on the action type */
345 enum mmal_msg_port_action_type {
346 - MMAL_MSG_PORT_ACTION_TYPE_UNKNOWN = 0, /* Unknown action */
347 - MMAL_MSG_PORT_ACTION_TYPE_ENABLE, /* Enable a port */
348 - MMAL_MSG_PORT_ACTION_TYPE_DISABLE, /* Disable a port */
349 - MMAL_MSG_PORT_ACTION_TYPE_FLUSH, /* Flush a port */
350 - MMAL_MSG_PORT_ACTION_TYPE_CONNECT, /* Connect ports */
351 - MMAL_MSG_PORT_ACTION_TYPE_DISCONNECT, /* Disconnect ports */
352 + MMAL_MSG_PORT_ACTION_TYPE_UNKNOWN = 0, /* Unknown action */
353 + MMAL_MSG_PORT_ACTION_TYPE_ENABLE, /* Enable a port */
354 + MMAL_MSG_PORT_ACTION_TYPE_DISABLE, /* Disable a port */
355 + MMAL_MSG_PORT_ACTION_TYPE_FLUSH, /* Flush a port */
356 + MMAL_MSG_PORT_ACTION_TYPE_CONNECT, /* Connect ports */
357 + MMAL_MSG_PORT_ACTION_TYPE_DISCONNECT, /* Disconnect ports */
358 MMAL_MSG_PORT_ACTION_TYPE_SET_REQUIREMENTS, /* Set buffer requirements*/
359 };
360
361 struct mmal_msg_header {
362 u32 magic;
363 - u32 type; /** enum mmal_msg_type */
364 + u32 type; /* enum mmal_msg_type */
365
366 /* Opaque handle to the control service */
367 u32 control_service;
368
369 - u32 context; /** a u32 per message context */
370 - u32 status; /** The status of the vchiq operation */
371 + u32 context; /* a u32 per message context */
372 + u32 status; /* The status of the vchiq operation */
373 u32 padding;
374 };
375
376 @@ -99,9 +100,9 @@ struct mmal_msg_version {
377
378 /* request to VC to create component */
379 struct mmal_msg_component_create {
380 - u32 client_component; /* component context */
381 + u32 client_component; /* component context */
382 char name[128];
383 - u32 pid; /* For debug */
384 + u32 pid; /* For debug */
385 };
386
387 /* reply from VC to component creation request */
388 @@ -121,7 +122,7 @@ struct mmal_msg_component_destroy {
389 };
390
391 struct mmal_msg_component_destroy_reply {
392 - u32 status; /** The component destruction status */
393 + u32 status; /* The component destruction status */
394 };
395
396 /* request and reply to VC to enable a component */
397 @@ -130,7 +131,7 @@ struct mmal_msg_component_enable {
398 };
399
400 struct mmal_msg_component_enable_reply {
401 - u32 status; /** The component enable status */
402 + u32 status; /* The component enable status */
403 };
404
405 /* request and reply to VC to disable a component */
406 @@ -139,7 +140,7 @@ struct mmal_msg_component_disable {
407 };
408
409 struct mmal_msg_component_disable_reply {
410 - u32 status; /** The component disable status */
411 + u32 status; /* The component disable status */
412 };
413
414 /* request to VC to get port information */
415 @@ -151,12 +152,12 @@ struct mmal_msg_port_info_get {
416
417 /* reply from VC to get port info request */
418 struct mmal_msg_port_info_get_reply {
419 - u32 status; /** enum mmal_msg_status */
420 - u32 component_handle; /* component handle port is associated with */
421 - u32 port_type; /* enum mmal_msg_port_type */
422 - u32 port_index; /* port indexed in query */
423 - s32 found; /* unused */
424 - u32 port_handle; /**< Handle to use for this port */
425 + u32 status; /* enum mmal_msg_status */
426 + u32 component_handle; /* component handle port is associated with */
427 + u32 port_type; /* enum mmal_msg_port_type */
428 + u32 port_index; /* port indexed in query */
429 + s32 found; /* unused */
430 + u32 port_handle; /* Handle to use for this port */
431 struct mmal_port port;
432 struct mmal_es_format format; /* elementary stream format */
433 union mmal_es_specific_format es; /* es type specific data */
434 @@ -166,8 +167,8 @@ struct mmal_msg_port_info_get_reply {
435 /* request to VC to set port information */
436 struct mmal_msg_port_info_set {
437 u32 component_handle;
438 - u32 port_type; /* enum mmal_msg_port_type */
439 - u32 port_index; /* port indexed in query */
440 + u32 port_type; /* enum mmal_msg_port_type */
441 + u32 port_index; /* port indexed in query */
442 struct mmal_port port;
443 struct mmal_es_format format;
444 union mmal_es_specific_format es;
445 @@ -177,11 +178,11 @@ struct mmal_msg_port_info_set {
446 /* reply from VC to port info set request */
447 struct mmal_msg_port_info_set_reply {
448 u32 status;
449 - u32 component_handle; /* component handle port is associated with */
450 - u32 port_type; /* enum mmal_msg_port_type */
451 - u32 index; /* port indexed in query */
452 - s32 found; /* unused */
453 - u32 port_handle; /**< Handle to use for this port */
454 + u32 component_handle; /* component handle port is associated with */
455 + u32 port_type; /* enum mmal_msg_port_type */
456 + u32 index; /* port indexed in query */
457 + s32 found; /* unused */
458 + u32 port_handle; /* Handle to use for this port */
459 struct mmal_port port;
460 struct mmal_es_format format;
461 union mmal_es_specific_format es;
462 @@ -192,7 +193,7 @@ struct mmal_msg_port_info_set_reply {
463 struct mmal_msg_port_action_port {
464 u32 component_handle;
465 u32 port_handle;
466 - u32 action; /* enum mmal_msg_port_action_type */
467 + u32 action; /* enum mmal_msg_port_action_type */
468 struct mmal_port port;
469 };
470
471 @@ -200,50 +201,53 @@ struct mmal_msg_port_action_port {
472 struct mmal_msg_port_action_handle {
473 u32 component_handle;
474 u32 port_handle;
475 - u32 action; /* enum mmal_msg_port_action_type */
476 + u32 action; /* enum mmal_msg_port_action_type */
477 u32 connect_component_handle;
478 u32 connect_port_handle;
479 };
480
481 struct mmal_msg_port_action_reply {
482 - u32 status; /** The port action operation status */
483 + u32 status; /* The port action operation status */
484 };
485
486 /* MMAL buffer transfer */
487
488 -/** Size of space reserved in a buffer message for short messages. */
489 +/* Size of space reserved in a buffer message for short messages. */
490 #define MMAL_VC_SHORT_DATA 128
491
492 -/** Signals that the current payload is the end of the stream of data */
493 +/* Signals that the current payload is the end of the stream of data */
494 #define MMAL_BUFFER_HEADER_FLAG_EOS BIT(0)
495 -/** Signals that the start of the current payload starts a frame */
496 +/* Signals that the start of the current payload starts a frame */
497 #define MMAL_BUFFER_HEADER_FLAG_FRAME_START BIT(1)
498 -/** Signals that the end of the current payload ends a frame */
499 +/* Signals that the end of the current payload ends a frame */
500 #define MMAL_BUFFER_HEADER_FLAG_FRAME_END BIT(2)
501 -/** Signals that the current payload contains only complete frames (>1) */
502 +/* Signals that the current payload contains only complete frames (>1) */
503 #define MMAL_BUFFER_HEADER_FLAG_FRAME \
504 (MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)
505 -/** Signals that the current payload is a keyframe (i.e. self decodable) */
506 +/* Signals that the current payload is a keyframe (i.e. self decodable) */
507 #define MMAL_BUFFER_HEADER_FLAG_KEYFRAME BIT(3)
508 -/** Signals a discontinuity in the stream of data (e.g. after a seek).
509 +/*
510 + * Signals a discontinuity in the stream of data (e.g. after a seek).
511 * Can be used for instance by a decoder to reset its state
512 */
513 #define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY BIT(4)
514 -/** Signals a buffer containing some kind of config data for the component
515 +/*
516 + * Signals a buffer containing some kind of config data for the component
517 * (e.g. codec config data)
518 */
519 #define MMAL_BUFFER_HEADER_FLAG_CONFIG BIT(5)
520 -/** Signals an encrypted payload */
521 +/* Signals an encrypted payload */
522 #define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED BIT(6)
523 -/** Signals a buffer containing side information */
524 +/* Signals a buffer containing side information */
525 #define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO BIT(7)
526 -/** Signals a buffer which is the snapshot/postview image from a stills
527 +/*
528 + * Signals a buffer which is the snapshot/postview image from a stills
529 * capture
530 */
531 #define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT BIT(8)
532 -/** Signals a buffer which contains data known to be corrupted */
533 +/* Signals a buffer which contains data known to be corrupted */
534 #define MMAL_BUFFER_HEADER_FLAG_CORRUPTED BIT(9)
535 -/** Signals that a buffer failed to be transmitted */
536 +/* Signals that a buffer failed to be transmitted */
537 #define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED BIT(10)
538
539 struct mmal_driver_buffer {
540 @@ -255,8 +259,8 @@ struct mmal_driver_buffer {
541
542 /* buffer header */
543 struct mmal_buffer_header {
544 - u32 next; /* next header */
545 - u32 priv; /* framework private data */
546 + u32 next; /* next header */
547 + u32 priv; /* framework private data */
548 u32 cmd;
549 u32 data;
550 u32 alloc_size;
551 @@ -281,7 +285,8 @@ struct mmal_buffer_header_type_specific
552 };
553
554 struct mmal_msg_buffer_from_host {
555 - /* The front 32 bytes of the buffer header are copied
556 + /*
557 + *The front 32 bytes of the buffer header are copied
558 * back to us in the reply to allow for context. This
559 * area is used to store two mmal_driver_buffer structures to
560 * allow for multiple concurrent service users.
561 @@ -296,7 +301,7 @@ struct mmal_msg_buffer_from_host {
562 s32 is_zero_copy;
563 s32 has_reference;
564
565 - /** allows short data to be xfered in control message */
566 + /* allows short data to be xfered in control message */
567 u32 payload_in_message;
568 u8 short_data[MMAL_VC_SHORT_DATA];
569 };
570 @@ -306,10 +311,10 @@ struct mmal_msg_buffer_from_host {
571 #define MMAL_WORKER_PORT_PARAMETER_SPACE 96
572
573 struct mmal_msg_port_parameter_set {
574 - u32 component_handle; /* component */
575 - u32 port_handle; /* port */
576 - u32 id; /* Parameter ID */
577 - u32 size; /* Parameter size */
578 + u32 component_handle; /* component */
579 + u32 port_handle; /* port */
580 + u32 id; /* Parameter ID */
581 + u32 size; /* Parameter size */
582 uint32_t value[MMAL_WORKER_PORT_PARAMETER_SPACE];
583 };
584
585 @@ -322,16 +327,16 @@ struct mmal_msg_port_parameter_set_reply
586 /* port parameter getting */
587
588 struct mmal_msg_port_parameter_get {
589 - u32 component_handle; /* component */
590 - u32 port_handle; /* port */
591 - u32 id; /* Parameter ID */
592 - u32 size; /* Parameter size */
593 + u32 component_handle; /* component */
594 + u32 port_handle; /* port */
595 + u32 id; /* Parameter ID */
596 + u32 size; /* Parameter size */
597 };
598
599 struct mmal_msg_port_parameter_get_reply {
600 - u32 status; /* Status of mmal_port_parameter_get call */
601 - u32 id; /* Parameter ID */
602 - u32 size; /* Parameter size */
603 + u32 status; /* Status of mmal_port_parameter_get call */
604 + u32 id; /* Parameter ID */
605 + u32 size; /* Parameter size */
606 uint32_t value[MMAL_WORKER_PORT_PARAMETER_SPACE];
607 };
608
609 @@ -339,7 +344,7 @@ struct mmal_msg_port_parameter_get_reply
610 #define MMAL_WORKER_EVENT_SPACE 256
611
612 struct mmal_msg_event_to_host {
613 - u32 client_component; /* component context */
614 + u32 client_component; /* component context */
615
616 u32 port_type;
617 u32 port_num;
Staging tree of David Bauer