From patchwork Tue Dec 8 15:15:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 7798681 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5C18BBEEE1 for ; Tue, 8 Dec 2015 15:18:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C80320527 for ; Tue, 8 Dec 2015 15:18:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 606BC20524 for ; Tue, 8 Dec 2015 15:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965180AbbLHPS3 (ORCPT ); Tue, 8 Dec 2015 10:18:29 -0500 Received: from mga03.intel.com ([134.134.136.65]:17116 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965175AbbLHPSZ (ORCPT ); Tue, 8 Dec 2015 10:18:25 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 08 Dec 2015 07:16:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,400,1444719600"; d="scan'208";a="867220867" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by orsmga002.jf.intel.com with ESMTP; 08 Dec 2015 07:16:22 -0800 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id C1FD4205C5; Tue, 8 Dec 2015 17:16:21 +0200 (EET) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id 037C12008A; Tue, 8 Dec 2015 17:15:17 +0200 (EET) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl Subject: [v4l-utils PATCH v2 1/3] libv4l2subdev: Use generated format definitions in libv4l2subdev Date: Tue, 8 Dec 2015 17:15:14 +0200 Message-Id: <1449587716-22954-2-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.1.0.231.g7484e3b In-Reply-To: <1449587716-22954-1-git-send-email-sakari.ailus@linux.intel.com> References: <1449587716-22954-1-git-send-email-sakari.ailus@linux.intel.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Instead of manually adding each and every new media bus pixel code to libv4l2subdev, generate the list automatically. The pre-existing formats that do not match the list are not modified so that existing users are unaffected by this change, with the exception of converting codes to strings, which will use the new definitions. Signed-off-by: Sakari Ailus Acked-by: Laurent Pinchart --- utils/media-ctl/.gitignore | 1 + utils/media-ctl/Makefile.am | 8 ++++++++ utils/media-ctl/libv4l2subdev.c | 1 + 3 files changed, 10 insertions(+) diff --git a/utils/media-ctl/.gitignore b/utils/media-ctl/.gitignore index 95b6a57..8c7d576 100644 --- a/utils/media-ctl/.gitignore +++ b/utils/media-ctl/.gitignore @@ -1 +1,2 @@ media-ctl +media-bus-formats.h diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am index a3931fb..a1a9225 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am @@ -4,6 +4,14 @@ libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) +media-bus-formats.h: ../../include/linux/media-bus-format.h + sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ + < $< > $@ + +BUILT_SOURCES = media-bus-formats.h +CLEANFILES = media-bus-formats.h + +nodist_libv4l2subdev_la_SOURCES = media-bus-formats.h libv4l2subdev_la_SOURCES = libv4l2subdev.c libv4l2subdev_la_LIBADD = libmediactl.la libv4l2subdev_la_CFLAGS = -static diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c index 33c1ee6..5bcfe34 100644 --- a/utils/media-ctl/libv4l2subdev.c +++ b/utils/media-ctl/libv4l2subdev.c @@ -719,6 +719,7 @@ static struct { const char *name; enum v4l2_mbus_pixelcode code; } mbus_formats[] = { +#include "media-bus-formats.h" { "Y8", MEDIA_BUS_FMT_Y8_1X8}, { "Y10", MEDIA_BUS_FMT_Y10_1X10 }, { "Y12", MEDIA_BUS_FMT_Y12_1X12 },