Merge tag 'for_v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[sfrench/cifs-2.6.git] / Documentation / ABI / testing / configfs-usb-gadget-uvc

diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc
index 490a0136fb02a5135e8490c489e8917b2dafcdb0..809765bd95730649f89030c4441831559da8da51 100644 (file)
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -168,6 +168,10 @@ Description:       Specific MJPEG format descriptors
 
                All attributes read only,
                except bmaControls and bDefaultFrameIndex:
+               bFormatIndex            - unique id for this format descriptor;
+                                       only defined after parent header is
+                                       linked into the streaming class;
+                                       read-only
                bmaControls             - this format's data for bmaControls in
                                        the streaming header
                bmInterfaceFlags        - specifies interlace information,
@@ -185,6 +189,10 @@ Date:              Dec 2014
 KernelVersion: 4.0
 Description:   Specific MJPEG frame descriptors
 
+               bFrameIndex             - unique id for this framedescriptor;
+                                       only defined after parent format is
+                                       linked into the streaming header;
+                                       read-only
                dwFrameInterval         - indicates how frame interval can be
                                        programmed; a number of values
                                        separated by newline can be specified
@@ -212,6 +220,10 @@ Date:              Dec 2014
 KernelVersion: 4.0
 Description:   Specific uncompressed format descriptors
 
+               bFormatIndex            - unique id for this format descriptor;
+                                       only defined after parent header is
+                                       linked into the streaming class;
+                                       read-only
                bmaControls             - this format's data for bmaControls in
                                        the streaming header
                bmInterfaceFlags        - specifies interlace information,
@@ -232,6 +244,10 @@ Date:              Dec 2014
 KernelVersion: 4.0
 Description:   Specific uncompressed frame descriptors
 
+               bFrameIndex             - unique id for this framedescriptor;
+                                       only defined after parent format is
+                                       linked into the streaming header;
+                                       read-only
                dwFrameInterval         - indicates how frame interval can be
                                        programmed; a number of values
                                        separated by newline can be specified