.. | .. |
---|
157 | 157 | #define UVC_GUID_FORMAT_INVI \ |
---|
158 | 158 | { 'I', 'N', 'V', 'I', 0xdb, 0x57, 0x49, 0x5e, \ |
---|
159 | 159 | 0x8e, 0x3f, 0xf4, 0x79, 0x53, 0x2b, 0x94, 0x6f} |
---|
| 160 | +#define UVC_GUID_FORMAT_CNF4 \ |
---|
| 161 | + { 'C', ' ', ' ', ' ', 0x00, 0x00, 0x10, 0x00, \ |
---|
| 162 | + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |
---|
160 | 163 | |
---|
161 | 164 | #define UVC_GUID_FORMAT_D3DFMT_L8 \ |
---|
162 | 165 | {0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \ |
---|
163 | 166 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |
---|
164 | 167 | #define UVC_GUID_FORMAT_KSMEDIA_L8_IR \ |
---|
165 | 168 | {0x32, 0x00, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, \ |
---|
| 169 | + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |
---|
| 170 | + |
---|
| 171 | +#define UVC_GUID_FORMAT_HEVC \ |
---|
| 172 | + { 'H', 'E', 'V', 'C', 0x00, 0x00, 0x10, 0x00, \ |
---|
166 | 173 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |
---|
167 | 174 | |
---|
168 | 175 | |
---|
.. | .. |
---|
198 | 205 | #define UVC_QUIRK_RESTRICT_FRAME_RATE 0x00000200 |
---|
199 | 206 | #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400 |
---|
200 | 207 | #define UVC_QUIRK_FORCE_Y8 0x00000800 |
---|
| 208 | +#define UVC_QUIRK_FORCE_BPP 0x00001000 |
---|
201 | 209 | |
---|
202 | 210 | /* Format flags */ |
---|
203 | 211 | #define UVC_FMT_FLAG_COMPRESSED 0x00000001 |
---|
.. | .. |
---|
237 | 245 | enum v4l2_ctrl_type v4l2_type; |
---|
238 | 246 | u32 data_type; |
---|
239 | 247 | |
---|
240 | | - struct uvc_menu_info *menu_info; |
---|
| 248 | + const struct uvc_menu_info *menu_info; |
---|
241 | 249 | u32 menu_count; |
---|
242 | 250 | |
---|
243 | 251 | u32 master_id; |
---|
.. | .. |
---|
369 | 377 | u8 type; |
---|
370 | 378 | u8 index; |
---|
371 | 379 | u8 bpp; |
---|
372 | | - u8 colorspace; |
---|
| 380 | + enum v4l2_colorspace colorspace; |
---|
| 381 | + enum v4l2_xfer_func xfer_func; |
---|
| 382 | + enum v4l2_ycbcr_encoding ycbcr_enc; |
---|
373 | 383 | u32 fcc; |
---|
374 | 384 | u32 flags; |
---|
375 | 385 | |
---|
.. | .. |
---|
491 | 501 | unsigned int max_sof; /* Maximum STC.SOF value */ |
---|
492 | 502 | }; |
---|
493 | 503 | |
---|
494 | | -#define UVC_METATADA_BUF_SIZE 1024 |
---|
| 504 | +#define UVC_METADATA_BUF_SIZE 1024 |
---|
495 | 505 | |
---|
496 | 506 | /** |
---|
497 | 507 | * struct uvc_copy_op: Context structure to schedule asynchronous memcpy |
---|
.. | .. |
---|
619 | 629 | for ((uvc_urb) = &(uvc_streaming)->uvc_urb[0]; \ |
---|
620 | 630 | (uvc_urb) < &(uvc_streaming)->uvc_urb[UVC_URBS]; \ |
---|
621 | 631 | ++(uvc_urb)) |
---|
| 632 | + |
---|
| 633 | +static inline u32 uvc_urb_index(const struct uvc_urb *uvc_urb) |
---|
| 634 | +{ |
---|
| 635 | + return uvc_urb - &uvc_urb->stream->uvc_urb[0]; |
---|
| 636 | +} |
---|
622 | 637 | |
---|
623 | 638 | struct uvc_device_info { |
---|
624 | 639 | u32 quirks; |
---|
.. | .. |
---|
748 | 763 | int uvc_create_buffers(struct uvc_video_queue *queue, |
---|
749 | 764 | struct v4l2_create_buffers *v4l2_cb); |
---|
750 | 765 | int uvc_queue_buffer(struct uvc_video_queue *queue, |
---|
| 766 | + struct media_device *mdev, |
---|
751 | 767 | struct v4l2_buffer *v4l2_buf); |
---|
752 | 768 | int uvc_export_buffer(struct uvc_video_queue *queue, |
---|
753 | 769 | struct v4l2_exportbuffer *exp); |
---|
.. | .. |
---|
786 | 802 | int uvc_video_init(struct uvc_streaming *stream); |
---|
787 | 803 | int uvc_video_suspend(struct uvc_streaming *stream); |
---|
788 | 804 | int uvc_video_resume(struct uvc_streaming *stream, int reset); |
---|
789 | | -int uvc_video_enable(struct uvc_streaming *stream, int enable); |
---|
| 805 | +int uvc_video_start_streaming(struct uvc_streaming *stream); |
---|
| 806 | +void uvc_video_stop_streaming(struct uvc_streaming *stream); |
---|
790 | 807 | int uvc_probe_video(struct uvc_streaming *stream, |
---|
791 | 808 | struct uvc_streaming_control *probe); |
---|
792 | 809 | int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, |
---|