From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: Re: [PATCH 01/15] [media] Move mediabus format definition to a more standard place Date: Tue, 04 Nov 2014 11:22:47 +0100 Message-ID: <5458A8F7.2050803@cisco.com> References: <1415094910-15899-1-git-send-email-boris.brezillon@free-electrons.com> <1415094910-15899-2-git-send-email-boris.brezillon@free-electrons.com> <5458A878.3010809@cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5458A878.3010809@cisco.com> Sender: linux-media-owner@vger.kernel.org To: Boris Brezillon , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-api@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Guennadi Liakhovetski List-Id: linux-api@vger.kernel.org On 11/04/14 11:20, Hans Verkuil wrote: > Hi Boris, > > On 11/04/14 10:54, Boris Brezillon wrote: >> Rename mediabus formats and move the enum into a separate header file so >> that it can be used by DRM/KMS subsystem without any reference to the V4L2 >> subsystem. >> >> Old V4L2_MBUS_FMT_ definitions are now referencing MEDIA_BUS_FMT_ value. > > I missed earlier that v4l2-mediabus.h contained a struct as well, so it can't be > deprecated and neither can a #warning be added. > > The best approach, I think, is to use a macro in media-bus-format.h > that will either define just the MEDIA_BUS value when compiled in the kernel, or > define both MEDIA_BUS and V4L2_MBUS values when compiled for userspace. > > E.g. something like this: > > #ifdef __KERNEL__ > #define MEDIA_BUS_FMT_ENTRY(name, val) MEDIA_BUS_FMT_ # name = val > #else > /* Keep V4L2_MBUS_FMT for backwards compatibility */ > #define MEDIA_BUS_FMT_ENTRY(name, val) \ > MEDIA_BUS_FMT_ # name = val, \ > V4L2_MBUS_FMT_ # name = val > #endif And v4l2-mediabus.h needs this as well: #ifndef __KERNEL__ /* For backwards compatibility */ #define v4l2_mbus_pixelcode media_bus_format #endif Regards, Hans