Update documentation to reflect changes in UVC configfs interface. Signed-off-by: Robert Baldyga <r.baldyga@xxxxxxxxxxx> --- Documentation/ABI/testing/configfs-usb-gadget-uvc | 39 ++++------------------- Documentation/usb/gadget-testing.txt | 18 +++-------- 2 files changed, 12 insertions(+), 45 deletions(-) diff --git a/Documentation/ABI/testing/configfs-usb-gadget-uvc b/Documentation/ABI/testing/configfs-usb-gadget-uvc index 2f4a005..a765437 100644 --- a/Documentation/ABI/testing/configfs-usb-gadget-uvc +++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc @@ -12,20 +12,10 @@ Date: Dec 2014 KernelVersion: 3.20 Description: Control descriptors -What: /config/usb-gadget/gadget/functions/uvc.name/control/class -Date: Dec 2014 -KernelVersion: 3.20 -Description: Class descriptors - -What: /config/usb-gadget/gadget/functions/uvc.name/control/class/ss -Date: Dec 2014 -KernelVersion: 3.20 -Description: Super speed control class descriptors - -What: /config/usb-gadget/gadget/functions/uvc.name/control/class/fs -Date: Dec 2014 -KernelVersion: 3.20 -Description: Full speed control class descriptors +What: /config/usb-gadget/gadget/functions/uvc.name/control/desc +Date: Jan 2015 +KernelVersion: 4.4 +Description: Control class descriptors What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal Date: Dec 2014 @@ -109,26 +99,11 @@ Date: Dec 2014 KernelVersion: 3.20 Description: Streaming descriptors -What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class -Date: Dec 2014 -KernelVersion: 3.20 +What: /config/usb-gadget/gadget/functions/uvc.name/streaming/desc +Date: Jan 2015 +KernelVersion: 4,4 Description: Streaming class descriptors -What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss -Date: Dec 2014 -KernelVersion: 3.20 -Description: Super speed streaming class descriptors - -What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs -Date: Dec 2014 -KernelVersion: 3.20 -Description: High speed streaming class descriptors - -What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs -Date: Dec 2014 -KernelVersion: 3.20 -Description: Full speed streaming class descriptors - What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching Date: Dec 2014 KernelVersion: 3.20 diff --git a/Documentation/usb/gadget-testing.txt b/Documentation/usb/gadget-testing.txt index 5819605..5643719 100644 --- a/Documentation/usb/gadget-testing.txt +++ b/Documentation/usb/gadget-testing.txt @@ -674,11 +674,8 @@ There are also "control" and "streaming" subdirectories, each of which contain a number of their subdirectories. There are some sane defaults provided, but the user must provide the following: - control header - create in control/header, link from control/class/fs - and/or control/class/ss - streaming header - create in streaming/header, link from - streaming/class/fs and/or streaming/class/hs and/or - streaming/class/ss + control header - create in control/header, link from control/desc + streaming header - create in streaming/header, link from streaming/desc format description - create in streaming/mjpeg and/or streaming/uncompressed frame description - create in streaming/mjpeg/<format> and/or in @@ -690,8 +687,7 @@ in each line. The rules stated above are best illustrated with an example: # mkdir functions/uvc.usb0/control/header/h # cd functions/uvc.usb0/control/header/h -# ln -s header/h class/fs -# ln -s header/h class/ss +# ln -s header/h desc # mkdir -p functions/uvc.usb0/streaming/uncompressed/u/360p # cat <<EOF > functions/uvc.usb0/streaming/uncompressed/u/360p/dwFrameInterval 666666 @@ -702,12 +698,8 @@ EOF # mkdir functions/uvc.usb0/streaming/header/h # cd functions/uvc.usb0/streaming/header/h # ln -s ../../uncompressed/u -# cd ../../class/fs -# ln -s ../../header/h -# cd ../../class/hs -# ln -s ../../header/h -# cd ../../class/ss -# ln -s ../../header/h +# cd ../../desc +# ln -s ../header/h Testing the UVC function -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
