diff options
Diffstat (limited to 'drivers/media/usb/uvc/uvcvideo.h')
-rw-r--r-- | drivers/media/usb/uvc/uvcvideo.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index af216ec45e39..af505fdd9b3f 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h | |||
@@ -225,10 +225,14 @@ struct uvc_format_desc { | |||
225 | * always be accessed with the UVC_ENTITY_* macros and never directly. | 225 | * always be accessed with the UVC_ENTITY_* macros and never directly. |
226 | */ | 226 | */ |
227 | 227 | ||
228 | #define UVC_ENTITY_FLAG_DEFAULT (1 << 0) | ||
229 | |||
228 | struct uvc_entity { | 230 | struct uvc_entity { |
229 | struct list_head list; /* Entity as part of a UVC device. */ | 231 | struct list_head list; /* Entity as part of a UVC device. */ |
230 | struct list_head chain; /* Entity as part of a video device | 232 | struct list_head chain; /* Entity as part of a video device |
231 | * chain. */ | 233 | * chain. */ |
234 | unsigned int flags; | ||
235 | |||
232 | __u8 id; | 236 | __u8 id; |
233 | __u16 type; | 237 | __u16 type; |
234 | char name[64]; | 238 | char name[64]; |
@@ -371,6 +375,9 @@ struct uvc_video_chain { | |||
371 | struct uvc_entity *selector; /* Selector unit */ | 375 | struct uvc_entity *selector; /* Selector unit */ |
372 | 376 | ||
373 | struct mutex ctrl_mutex; /* Protects ctrl.info */ | 377 | struct mutex ctrl_mutex; /* Protects ctrl.info */ |
378 | |||
379 | struct v4l2_prio_state prio; /* V4L2 priority state */ | ||
380 | u32 caps; /* V4L2 chain-wide caps */ | ||
374 | }; | 381 | }; |
375 | 382 | ||
376 | struct uvc_stats_frame { | 383 | struct uvc_stats_frame { |
@@ -436,6 +443,7 @@ struct uvc_streaming { | |||
436 | struct uvc_format *format; | 443 | struct uvc_format *format; |
437 | 444 | ||
438 | struct uvc_streaming_control ctrl; | 445 | struct uvc_streaming_control ctrl; |
446 | struct uvc_format *def_format; | ||
439 | struct uvc_format *cur_format; | 447 | struct uvc_format *cur_format; |
440 | struct uvc_frame *cur_frame; | 448 | struct uvc_frame *cur_frame; |
441 | /* Protect access to ctrl, cur_format, cur_frame and hardware video | 449 | /* Protect access to ctrl, cur_format, cur_frame and hardware video |