From patchwork Mon Jan 10 22:18:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roberto Rodriguez Alkala X-Patchwork-Id: 469811 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0AMJAwD031383 for ; Mon, 10 Jan 2011 22:19:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754734Ab1AJWSq (ORCPT ); Mon, 10 Jan 2011 17:18:46 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:38892 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754714Ab1AJWSo (ORCPT ); Mon, 10 Jan 2011 17:18:44 -0500 Received: by yxt3 with SMTP id 3so7707574yxt.19 for ; Mon, 10 Jan 2011 14:18:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=LhzTQgNtE6GxQtFz/Y0OioJJy/HT+myz5Wfvk2PJSX0=; b=WHlx25rbV8PgRFhH5URkgo1GCwi433GUF1xLZiOPB5FVbNFL26iQ/iTtmnK1oJ/CEx X+u1P0Qo64Sx9S/cmXK3/wtYThayenuzkszTuUiK8j9iVtSNsJNHCUtc3jC2wUZznbB8 wL+UJBX20ic0PVNcC/ggjuTZgJ3iRE3YA8gks= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=O1x7MrxokYaGXn4J+gX4KeZA+pWii2SuxrpPHJrEpGZhHbxbFcBYSJkCAPI/658kui WVj29uaYk6lDBoJS2GLqPKpLoyimpp/v8JII61AEqzTdQmDxcf022qQPpx1wysI/MmuF DXpPglYRNBbJPVYnsB+3bNEKrvBYdzoT+UjH8= Received: by 10.91.72.7 with SMTP id z7mr6861386agk.185.1294697924315; Mon, 10 Jan 2011 14:18:44 -0800 (PST) Received: from localhost.localdomain (host-2-229.a2.cvc.com.py [186.0.189.229]) by mx.google.com with ESMTPS id x31sm38063850ana.29.2011.01.10.14.18.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 10 Jan 2011 14:18:43 -0800 (PST) From: Roberto Rodriguez Alcala To: linux-media@vger.kernel.org, g.liakhovetski@gmx.de Cc: Roberto Rodriguez Alcala Subject: [PATCH 1/2] [media] v4l2-ctrls: Add V4L2_CID_NIGHT_MODE control to support night mode Date: Mon, 10 Jan 2011 19:18:26 -0300 Message-Id: <1294697907-1714-2-git-send-email-rralcala@gmail.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1294697907-1714-1-git-send-email-rralcala@gmail.com> References: <1294697907-1714-1-git-send-email-rralcala@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 10 Jan 2011 22:19:19 +0000 (UTC) diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index 8f81efc..7a8934e 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c @@ -365,6 +365,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_PRIVACY: return "Privacy"; case V4L2_CID_IRIS_ABSOLUTE: return "Iris, Absolute"; case V4L2_CID_IRIS_RELATIVE: return "Iris, Relative"; + case V4L2_CID_NIGHT_MODE: return "Night mode"; /* FM Radio Modulator control */ /* Keep the order of the 'case's the same as in videodev2.h! */ @@ -418,6 +419,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_EXPOSURE_AUTO_PRIORITY: case V4L2_CID_FOCUS_AUTO: case V4L2_CID_PRIVACY: + case V4L2_CID_NIGHT_MODE: case V4L2_CID_AUDIO_LIMITER_ENABLED: case V4L2_CID_AUDIO_COMPRESSION_ENABLED: case V4L2_CID_PILOT_TONE_ENABLED: diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 5f6f470..0df8a9f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -1300,6 +1300,8 @@ enum v4l2_exposure_auto_type { #define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17) #define V4L2_CID_IRIS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+18) +#define V4L2_CID_NIGHT_MODE (V4L2_CID_CAMERA_CLASS_BASE+19) + /* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) #define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1)