UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] uvcvideo: Blacklist more controls for Hercules Dualpix Exchange 

The Hercules Dualpix Exchange (06f8:3005) camera expose an absolute zoom
that is not implemented. Blacklist it.

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-07-23 10:06:08 -03:00 committed by Mauro Carvalho Chehab
parent 9c84d89bf1
commit fa34168bd8
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/media/video/uvc/uvc_ctrl.c
View File

@ -1499,26 +1499,46 @@ end:
static void static void
uvc_ctrl_prune_entity(struct uvc_device *dev, struct uvc_entity *entity) uvc_ctrl_prune_entity(struct uvc_device *dev, struct uvc_entity *entity)
{ {
static const struct { struct uvc_ctrl_blacklist {
struct usb_device_id id; struct usb_device_id id;
u8 index; u8 index;
} blacklist[] = { };
static const struct uvc_ctrl_blacklist processing_blacklist[] = {
{ { USB_DEVICE(0x13d3, 0x509b) }, 9 }, /* Gain */ { { USB_DEVICE(0x13d3, 0x509b) }, 9 }, /* Gain */
{ { USB_DEVICE(0x1c4f, 0x3000) }, 6 }, /* WB Temperature */ { { USB_DEVICE(0x1c4f, 0x3000) }, 6 }, /* WB Temperature */
{ { USB_DEVICE(0x5986, 0x0241) }, 2 }, /* Hue */ { { USB_DEVICE(0x5986, 0x0241) }, 2 }, /* Hue */
}; };
static const struct uvc_ctrl_blacklist camera_blacklist[] = {
{ { USB_DEVICE(0x06f8, 0x3005) }, 9 }, /* Zoom, Absolute */
};
u8 *controls; const struct uvc_ctrl_blacklist *blacklist;
unsigned int size; unsigned int size;
unsigned int count;
unsigned int i; unsigned int i;
u8 *controls;
if (UVC_ENTITY_TYPE(entity) != UVC_VC_PROCESSING_UNIT) switch (UVC_ENTITY_TYPE(entity)) {
case UVC_VC_PROCESSING_UNIT:
blacklist = processing_blacklist;
count = ARRAY_SIZE(processing_blacklist);
controls = entity->processing.bmControls;
size = entity->processing.bControlSize;
break;
case UVC_ITT_CAMERA:
blacklist = camera_blacklist;
count = ARRAY_SIZE(camera_blacklist);
controls = entity->camera.bmControls;
size = entity->camera.bControlSize;
break;
default:
return; return;
}
controls = entity->processing.bmControls; for (i = 0; i < count; ++i) {
size = entity->processing.bControlSize;
for (i = 0; i < ARRAY_SIZE(blacklist); ++i) {
if (!usb_match_one_id(dev->intf, &blacklist[i].id)) if (!usb_match_one_id(dev->intf, &blacklist[i].id))
continue; continue;