From patchwork Sat Apr 12 13:23:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 3972981 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 56A029F374 for ; Sat, 12 Apr 2014 13:24:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A1B620279 for ; Sat, 12 Apr 2014 13:24:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B1CC20274 for ; Sat, 12 Apr 2014 13:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754470AbaDLNYQ (ORCPT ); Sat, 12 Apr 2014 09:24:16 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:50683 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751605AbaDLNYP (ORCPT ); Sat, 12 Apr 2014 09:24:15 -0400 Received: from masiina.localdomain (masiina.retiisi.org.uk [IPv6:2001:1bc8:102:7fc9::c0:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hillosipuli.retiisi.org.uk (Postfix) with ESMTPS id 2A1BD600A1; Sat, 12 Apr 2014 16:24:12 +0300 (EEST) Received: from masiina.localdomain (localhost [127.0.0.1]) by masiina.localdomain (8.14.4/8.14.4/Debian-4) with ESMTP id s3CDODrh008410; Sat, 12 Apr 2014 16:24:13 +0300 Received: (from sakke@localhost) by masiina.localdomain (8.14.4/8.14.4/Submit) id s3CDODd8008409; Sat, 12 Apr 2014 16:24:13 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com Subject: [yavta PATCH v3 01/11] Separate device object initialisation and opening Date: Sat, 12 Apr 2014 16:23:53 +0300 Message-Id: <1397309043-8322-2-git-send-email-sakari.ailus@iki.fi> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397309043-8322-1-git-send-email-sakari.ailus@iki.fi> References: <1397309043-8322-1-git-send-email-sakari.ailus@iki.fi> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sakari Ailus --- yavta.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/yavta.c b/yavta.c index 739463d..c7ad7b4 100644 --- a/yavta.c +++ b/yavta.c @@ -220,17 +220,20 @@ static const char *v4l2_format_name(unsigned int fourcc) return name; } -static int video_open(struct device *dev, const char *devname, int no_query) +static void video_init(struct device *dev) { - struct v4l2_capability cap; - unsigned int capabilities; - int ret; - memset(dev, 0, sizeof *dev); dev->fd = -1; dev->memtype = V4L2_MEMORY_MMAP; dev->buffers = NULL; dev->type = (enum v4l2_buf_type)-1; +} + +static int video_open(struct device *dev, const char *devname, int no_query) +{ + struct v4l2_capability cap; + unsigned int capabilities; + int ret; dev->fd = open(devname, O_RDWR); if (dev->fd < 0) { @@ -1599,6 +1602,8 @@ int main(int argc, char *argv[]) unsigned int rt_priority = 1; + video_init(&dev); + opterr = 0; while ((c = getopt_long(argc, argv, "c::Cd:f:F::hi:Iln:pq:r:R::s:t:uw:", opts, NULL)) != -1) {