Well, I was going for lower "touch labor" in the future, but sure I can change it.
Do you want indices defined for all the controls, or just the illuminators?
Regards,
Andy
Hans de Goede <hdegoede@xxxxxxxxxx> wrote:
>Hi,
>
>On 09/12/2010 03:51 AM, Andy Walls wrote:
>> gspca_cpia1: Disable illuminator controls if not an Intel Play QX3
>>
>> The illuminator controls should only be available to the user for the Intel
>> Play QX3 microscope.
>>
>> Signed-off-by: Andy Walls<awalls@xxxxxxxxxxxxxxxx>
>>
>> diff -r d165649ca8a0 -r 32d5c323c541 linux/drivers/media/video/gspca/cpia1.c
>> --- a/linux/drivers/media/video/gspca/cpia1.c Sat Sep 11 14:15:26 2010 -0400
>> +++ b/linux/drivers/media/video/gspca/cpia1.c Sat Sep 11 21:15:03 2010 -0400
>> @@ -1743,6 +1743,22 @@
>> do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
>> }
>>
>> +static void sd_disable_qx3_ctrls(struct gspca_dev *gspca_dev)
>> +{
>> + int i, n;
>> + __u32 id;
>> +
>> + n = ARRAY_SIZE(sd_ctrls);
>> + for (i = 0; i< n; i++) {
>> + id = sd_ctrls[i].qctrl.id;
>> +
>> + if (id == V4L2_CID_ILLUMINATORS_1 ||
>> + id == V4L2_CID_ILLUMINATORS_2) {
>> + gspca_dev->ctrl_dis |= (1<< i);
>> + }
>> + }
>> +}
>> +
>> /* this function is called at probe and resume time */
>> static int sd_init(struct gspca_dev *gspca_dev)
>> {
>
>Hmm, this deviates from how all other gspca subdrivers do this, they
>define indexes for ctrls together with the sd_ctrls intializer and
>then use these, so instead of the above blurb there would be
>a
>
>#define ILLUMINATORS_1_IDX x
>#define ILLUMINATORS_2_IDX x
>
>Where these ctrls get "defined" (see for example ov519.c)
>
>And then:
>
>> + if (!sd->params.qx3.qx3_detected)
>> + sd_disable_qx3_ctrls(gspca_dev);
>> +
>
>Would become:
>
> if (!sd->params.qx3.qx3_detected)
> gspca_dev->ctrl_dis |= (1 << ILLUMINATORS_1_IDX) |
> (1 << ILLUMINATORS_2_IDX);
>
>I think it would be good to use the same construction in the cpia1
>driver for consistency between all the gspca subdrivers.
>
>Regards,
>
>Hans
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-media" in
>the body of a message to majordomo@xxxxxxxxxxxxxxx
>More majordomo info at http://vger.kernel.org/majordomo-info.html
��.n��������+%������w��{.n�����{��g����^n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�
