[media] uvcvideo: Hardcode the index/selector relationship for XU controls

Browse source

Devices advertise XU controls using a bitmask, in which each bit
corresponds to a control. The control selector, used to query the
control, isn't available in the USB descriptors.

All known UVC devices use control selectors equal to the control bit
index plus one. Hardcode that relationship in the driver, making the
UVCIOC_CTRL_ADD ioctl obsolete. All necessary information about XU
controls can be obtained by the driver at enumeration time.

The UVCIOC_CTRL_ADD ioctl is still supported for compatibility reasons,
but now always returns -EEXIST.

Finally, control mappings are now on a per-device basis and no longer
global.

As this changes the userspace interface, bump the driver version number
to 1.0.0 (it was about time).

Signed-off-by: Martin Rubli <martin_rubli@logitech.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

...

This commit is contained in:

Laurent Pinchart 2010-09-20 05:53:21 -03:00 • committed by Mauro Carvalho Chehab

parent 650b95feee

commit ba2fa99668

4 changed files with 240 additions and 270 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

485

drivers/media/video/uvc/uvc_ctrl.c

View file

10

drivers/media/video/uvc/uvc_driver.c

View file

46

drivers/media/video/uvc/uvc_v4l2.c

View file

21

drivers/media/video/uvc/uvcvideo.h

View file