shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: f_uvc: add extension unit descriptor

Browse Source 
Add extension unit descriptor for uvc. Support 3
controls in this extension unit. The rockchip IQ
tool use it to transfer vendor specific control
data.

Change-Id: I219e12616629bc75548b30ce63d46136aeac6561
Signed-off-by: William Wu <william.wu@rock-chips.com>
This commit is contained in:
William Wu
2018-09-05 15:28:40 +08:00
committed by Tao Huang
parent 89f2299475
commit 4ac7546e3b
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/usb/gadget/function/f_uvc.c
View File

@@ -780,6 +780,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
struct uvc_camera_terminal_descriptor *cd;
struct uvc_processing_unit_descriptor *pd;
struct uvc_output_terminal_descriptor *od;
struct UVC_EXTENSION_UNIT_DESCRIPTOR(1, 1) *ed;
struct uvc_color_matching_descriptor *md;
struct uvc_descriptor_header **ctl_cls;
int ret;
@@ -828,6 +829,34 @@ static struct usb_function_instance *uvc_alloc_inst(void)
od->bSourceID = 2;
od->iTerminal = 0;
ed = &opts->uvc_extension;
ed->bLength = UVC_DT_EXTENSION_UNIT_SIZE(1, 1);
ed->bDescriptorType = USB_DT_CS_INTERFACE;
ed->bDescriptorSubType = UVC_VC_EXTENSION_UNIT;
ed->bUnitID = 6;
ed->guidExtensionCode[0] = 0xa2;
ed->guidExtensionCode[1] = 0x9e;
ed->guidExtensionCode[2] = 0x76;
ed->guidExtensionCode[3] = 0x41;
ed->guidExtensionCode[4] = 0xde;
ed->guidExtensionCode[5] = 0x04;
ed->guidExtensionCode[6] = 0x47;
ed->guidExtensionCode[7] = 0xe3;
ed->guidExtensionCode[8] = 0x8b;
ed->guidExtensionCode[9] = 0x2b;
ed->guidExtensionCode[10] = 0xf4;
ed->guidExtensionCode[11] = 0x34;
ed->guidExtensionCode[12] = 0x1a;
ed->guidExtensionCode[13] = 0xff;
ed->guidExtensionCode[14] = 0x00;
ed->guidExtensionCode[15] = 0x3b;
ed->bNumControls = 3;
ed->bNrInPins = 1;
ed->baSourceID[0] = 2;
ed->bControlSize = 1;
ed->bmControls[0] = 7;
ed->iExtension = 0;
md = &opts->uvc_color_matching;
md->bLength = UVC_DT_COLOR_MATCHING_SIZE;
md->bDescriptorType = USB_DT_CS_INTERFACE;
@@ -842,7 +871,8 @@ static struct usb_function_instance *uvc_alloc_inst(void)
ctl_cls[1] = (struct uvc_descriptor_header *)cd;
ctl_cls[2] = (struct uvc_descriptor_header *)pd;
ctl_cls[3] = (struct uvc_descriptor_header *)od;
ctl_cls[4] = NULL; /* NULL-terminate */
ctl_cls[4] = (struct uvc_descriptor_header *)ed;
ctl_cls[5] = NULL; /* NULL-terminate */
opts->fs_control =
(const struct uvc_descriptor_header * const *)ctl_cls;
@@ -852,7 +882,8 @@ static struct usb_function_instance *uvc_alloc_inst(void)
ctl_cls[1] = (struct uvc_descriptor_header *)cd;
ctl_cls[2] = (struct uvc_descriptor_header *)pd;
ctl_cls[3] = (struct uvc_descriptor_header *)od;
ctl_cls[4] = NULL; /* NULL-terminate */
ctl_cls[4] = (struct uvc_descriptor_header *)ed;
ctl_cls[5] = NULL; /* NULL-terminate */
opts->ss_control =
(const struct uvc_descriptor_header * const *)ctl_cls;

6
drivers/usb/gadget/function/u_uvc.h
View File

@@ -18,6 +18,7 @@
#include <linux/usb/video.h>
#define fi_to_f_uvc_opts(f) container_of(f, struct f_uvc_opts, func_inst)
DECLARE_UVC_EXTENSION_UNIT_DESCRIPTOR(1, 1);
struct f_uvc_opts {
struct usb_function_instance func_inst;
@@ -51,6 +52,7 @@ struct f_uvc_opts {
struct uvc_camera_terminal_descriptor uvc_camera_terminal;
struct uvc_processing_unit_descriptor uvc_processing;
struct uvc_output_terminal_descriptor uvc_output_terminal;
struct UVC_EXTENSION_UNIT_DESCRIPTOR(1, 1) uvc_extension;
struct uvc_color_matching_descriptor uvc_color_matching;
/*
@@ -60,8 +62,8 @@ struct f_uvc_opts {
* descriptors. Used by configfs only, must not be touched by legacy
* gadgets.
*/
struct uvc_descriptor_header *uvc_fs_control_cls[5];
struct uvc_descriptor_header *uvc_ss_control_cls[5];
struct uvc_descriptor_header *uvc_fs_control_cls[6];
struct uvc_descriptor_header *uvc_ss_control_cls[6];
/*
* Streaming descriptors for full-speed, high-speed and super-speed.