From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:51327 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752901Ab0IMHTb (ORCPT ); Mon, 13 Sep 2010 03:19:31 -0400 Message-ID: <4C8DD07A.5070308@redhat.com> Date: Mon, 13 Sep 2010 09:19:22 +0200 From: Hans de Goede MIME-Version: 1.0 To: Andy Walls CC: linux-media@vger.kernel.org, Jean-Francois Moine Subject: Re: [PATCH v2 3/3] gspca_cpia1: Disable illuminator controls if not an Intel Play QX3 References: <1284313521.2027.32.camel@morgan.silverblock.net> In-Reply-To: <1284313521.2027.32.camel@morgan.silverblock.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit List-ID: Sender: Ack, Acked-by: Hans de Goede p.s. Jean-Francois, since your tree also has the needed videodev2.h changes I assume you'll take these patches in your tree and thus I won't add them to mine. Regards, Hans On 09/12/2010 07:45 PM, Andy Walls wrote: > The illuminator controls should only be available to the user for the Intel > Play QX3 microscope. The implementation to inhibit the controls is intended to > be consistent with the other gspca driver implementations. > > Signed-off-by: Andy Walls > > diff -r 5e576066eeaf -r 8a9732bd1548 linux/drivers/media/video/gspca/cpia1.c > --- a/linux/drivers/media/video/gspca/cpia1.c Sun Sep 12 12:47:00 2010 -0400 > +++ b/linux/drivers/media/video/gspca/cpia1.c Sun Sep 12 13:13:33 2010 -0400 > @@ -380,6 +380,7 @@ > > static const struct ctrl sd_ctrls[] = { > { > +#define BRIGHTNESS_IDX 0 > { > .id = V4L2_CID_BRIGHTNESS, > .type = V4L2_CTRL_TYPE_INTEGER, > @@ -394,6 +395,7 @@ > .set = sd_setbrightness, > .get = sd_getbrightness, > }, > +#define CONTRAST_IDX 1 > { > { > .id = V4L2_CID_CONTRAST, > @@ -408,6 +410,7 @@ > .set = sd_setcontrast, > .get = sd_getcontrast, > }, > +#define SATURATION_IDX 2 > { > { > .id = V4L2_CID_SATURATION, > @@ -422,6 +425,7 @@ > .set = sd_setsaturation, > .get = sd_getsaturation, > }, > +#define POWER_LINE_FREQUENCY_IDX 3 > { > { > .id = V4L2_CID_POWER_LINE_FREQUENCY, > @@ -436,6 +440,7 @@ > .set = sd_setfreq, > .get = sd_getfreq, > }, > +#define ILLUMINATORS_1_IDX 4 > { > { > .id = V4L2_CID_ILLUMINATORS_1, > @@ -450,6 +455,7 @@ > .set = sd_setilluminator1, > .get = sd_getilluminator1, > }, > +#define ILLUMINATORS_2_IDX 5 > { > { > .id = V4L2_CID_ILLUMINATORS_2, > @@ -464,6 +470,7 @@ > .set = sd_setilluminator2, > .get = sd_getilluminator2, > }, > +#define COMP_TARGET_IDX 6 > { > { > #define V4L2_CID_COMP_TARGET V4L2_CID_PRIVATE_BASE > @@ -1756,9 +1763,13 @@ > if (ret) > return ret; > > - /* Ensure the QX3 illuminators' states are restored upon resume */ > + /* Ensure the QX3 illuminators' states are restored upon resume, > + or disable the illuminator controls, if this isn't a QX3 */ > if (sd->params.qx3.qx3_detected) > command_setlights(gspca_dev); > + else > + gspca_dev->ctrl_dis |= > + ((1<< ILLUMINATORS_1_IDX) | (1<< ILLUMINATORS_2_IDX)); > > sd_stopN(gspca_dev); > > > > > > > > >