linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header
@ 2014-06-03  0:44 Laurent Pinchart
  2014-06-03  0:44 ` [PATCH 1/2] Use installed kernel headers instead of raw kernel headers Laurent Pinchart
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Laurent Pinchart @ 2014-06-03  0:44 UTC (permalink / raw)
  To: linux-media; +Cc: Hans Verkuil

Hello,

This patch set adds the missing v4l2-mediabus.h header, required by media-ctl.
Please see individual patches for details, they're pretty straightforward.

Laurent Pinchart (2):
  Use installed kernel headers instead of raw kernel headers
  Add the missing v4l2-mediabus.h kernel header

 include/linux/dvb/dmx.h       |   8 +--
 include/linux/dvb/frontend.h  |   4 --
 include/linux/dvb/video.h     |  12 ++--
 include/linux/fb.h            |   8 +--
 include/linux/ivtv.h          |   6 +-
 include/linux/v4l2-mediabus.h | 147 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/videodev2.h     |  16 ++---
 7 files changed, 168 insertions(+), 33 deletions(-)
 create mode 100644 include/linux/v4l2-mediabus.h

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] Use installed kernel headers instead of raw kernel headers
  2014-06-03  0:44 [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Laurent Pinchart
@ 2014-06-03  0:44 ` Laurent Pinchart
  2014-06-03  0:44 ` [PATCH 2/2] Add the missing v4l2-mediabus.h kernel header Laurent Pinchart
  2014-06-03  6:52 ` [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Hans Verkuil
  2 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2014-06-03  0:44 UTC (permalink / raw)
  To: linux-media; +Cc: Hans Verkuil

Kernel headers exported to userspace can contain kernel-specific
statements (such as __user annotations) that are removed when installing
the headers with 'make headers_install' in the kernel sources. Only the
installed headers must be used by userspace. Replace the private copy of
the raw headers with installed headers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/linux/dvb/dmx.h      |  8 +++-----
 include/linux/dvb/frontend.h |  4 ----
 include/linux/dvb/video.h    | 12 +++++-------
 include/linux/fb.h           |  8 +++-----
 include/linux/ivtv.h         |  6 +++---
 include/linux/videodev2.h    | 16 +++++++---------
 6 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index b4fb650..4ed210a 100644
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -21,13 +21,11 @@
  *
  */
 
-#ifndef _UAPI_DVBDMX_H_
-#define _UAPI_DVBDMX_H_
+#ifndef _DVBDMX_H_
+#define _DVBDMX_H_
 
 #include <linux/types.h>
-#ifndef __KERNEL__
 #include <time.h>
-#endif
 
 
 #define DMX_FILTER_SIZE 16
@@ -152,4 +150,4 @@ struct dmx_stc {
 #define DMX_ADD_PID              _IOW('o', 51, __u16)
 #define DMX_REMOVE_PID           _IOW('o', 52, __u16)
 
-#endif /* _UAPI_DVBDMX_H_ */
+#endif /* _DVBDMX_H_ */
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index c56d77c..5cb498d 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -197,7 +197,6 @@ typedef enum fe_transmit_mode {
 	TRANSMISSION_MODE_C3780,
 } fe_transmit_mode_t;
 
-#if defined(__DVB_CORE__) || !defined (__KERNEL__)
 typedef enum fe_bandwidth {
 	BANDWIDTH_8_MHZ,
 	BANDWIDTH_7_MHZ,
@@ -207,7 +206,6 @@ typedef enum fe_bandwidth {
 	BANDWIDTH_10_MHZ,
 	BANDWIDTH_1_712_MHZ,
 } fe_bandwidth_t;
-#endif
 
 typedef enum fe_guard_interval {
 	GUARD_INTERVAL_1_32,
@@ -239,7 +237,6 @@ enum fe_interleaving {
 	INTERLEAVING_720,
 };
 
-#if defined(__DVB_CORE__) || !defined (__KERNEL__)
 struct dvb_qpsk_parameters {
 	__u32		symbol_rate;  /* symbol rate in Symbols per second */
 	fe_code_rate_t	fec_inner;    /* forward error correction (see above) */
@@ -282,7 +279,6 @@ struct dvb_frontend_event {
 	fe_status_t status;
 	struct dvb_frontend_parameters parameters;
 };
-#endif
 
 /* S2API Commands */
 #define DTV_UNDEFINED		0
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index d3d14a5..4bb276c 100644
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
@@ -21,14 +21,12 @@
  *
  */
 
-#ifndef _UAPI_DVBVIDEO_H_
-#define _UAPI_DVBVIDEO_H_
+#ifndef _DVBVIDEO_H_
+#define _DVBVIDEO_H_
 
 #include <linux/types.h>
-#ifndef __KERNEL__
 #include <stdint.h>
 #include <time.h>
-#endif
 
 typedef enum {
 	VIDEO_FORMAT_4_3,     /* Select 4:3 format */
@@ -154,7 +152,7 @@ struct video_status {
 
 
 struct video_still_picture {
-	char __user *iFrame;        /* pointer to a single iframe in memory */
+	char *iFrame;        /* pointer to a single iframe in memory */
 	__s32 size;
 };
 
@@ -187,7 +185,7 @@ typedef struct video_spu {
 
 typedef struct video_spu_palette {      /* SPU Palette information */
 	int length;
-	__u8 __user *palette;
+	__u8 *palette;
 } video_spu_palette_t;
 
 
@@ -271,4 +269,4 @@ typedef __u16 video_attributes_t;
 #define VIDEO_COMMAND     	   _IOWR('o', 59, struct video_command)
 #define VIDEO_TRY_COMMAND 	   _IOWR('o', 60, struct video_command)
 
-#endif /* _UAPI_DVBVIDEO_H_ */
+#endif /* _DVBVIDEO_H_ */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index fb795c3..1b3b239 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -1,5 +1,5 @@
-#ifndef _UAPI_LINUX_FB_H
-#define _UAPI_LINUX_FB_H
+#ifndef _LINUX_FB_H
+#define _LINUX_FB_H
 
 #include <linux/types.h>
 #include <linux/i2c.h>
@@ -16,9 +16,7 @@
 #define FBIOGETCMAP		0x4604
 #define FBIOPUTCMAP		0x4605
 #define FBIOPAN_DISPLAY		0x4606
-#ifndef __KERNEL__
 #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor)
-#endif
 /* 0x4607-0x460B are defined below */
 /* #define FBIOGET_MONITORSPEC	0x460C */
 /* #define FBIOPUT_MONITORSPEC	0x460D */
@@ -399,4 +397,4 @@ struct fb_cursor {
 #endif
 
 
-#endif /* _UAPI_LINUX_FB_H */
+#endif /* _LINUX_FB_H */
diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h
index 42bf725..120e82c 100644
--- a/include/linux/ivtv.h
+++ b/include/linux/ivtv.h
@@ -21,7 +21,7 @@
 #ifndef __LINUX_IVTV_H__
 #define __LINUX_IVTV_H__
 
-#include <linux/compiler.h>
+
 #include <linux/types.h>
 #include <linux/videodev2.h>
 
@@ -49,9 +49,9 @@
 struct ivtv_dma_frame {
 	enum v4l2_buf_type type; /* V4L2_BUF_TYPE_VIDEO_OUTPUT */
 	__u32 pixelformat;	 /* 0 == same as destination */
-	void __user *y_source;   /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT,
+	void *y_source;   /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT,
 				    then just switch to user DMA YUV output mode */
-	void __user *uv_source;  /* Unused for RGB pixelformats */
+	void *uv_source;  /* Unused for RGB pixelformats */
 	struct v4l2_rect src;
 	struct v4l2_rect dst;
 	__u32 src_width;
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 168ff50..e9a5547 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -53,13 +53,11 @@
  *              Hans Verkuil <hverkuil@xs4all.nl>
  *		et al.
  */
-#ifndef _UAPI__LINUX_VIDEODEV2_H
-#define _UAPI__LINUX_VIDEODEV2_H
+#ifndef __LINUX_VIDEODEV2_H
+#define __LINUX_VIDEODEV2_H
 
-#ifndef __KERNEL__
 #include <sys/time.h>
-#endif
-#include <linux/compiler.h>
+
 #include <linux/ioctl.h>
 #include <linux/types.h>
 #include <linux/v4l2-common.h>
@@ -766,16 +764,16 @@ struct v4l2_framebuffer {
 
 struct v4l2_clip {
 	struct v4l2_rect        c;
-	struct v4l2_clip	__user *next;
+	struct v4l2_clip	*next;
 };
 
 struct v4l2_window {
 	struct v4l2_rect        w;
 	__u32			field;	 /* enum v4l2_field */
 	__u32			chromakey;
-	struct v4l2_clip	__user *clips;
+	struct v4l2_clip	*clips;
 	__u32			clipcount;
-	void			__user *bitmap;
+	void			*bitmap;
 	__u8                    global_alpha;
 };
 
@@ -2010,4 +2008,4 @@ struct v4l2_create_buffers {
 
 #define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
 
-#endif /* _UAPI__LINUX_VIDEODEV2_H */
+#endif /* __LINUX_VIDEODEV2_H */
-- 
1.8.5.5


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] Add the missing v4l2-mediabus.h kernel header
  2014-06-03  0:44 [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Laurent Pinchart
  2014-06-03  0:44 ` [PATCH 1/2] Use installed kernel headers instead of raw kernel headers Laurent Pinchart
@ 2014-06-03  0:44 ` Laurent Pinchart
  2014-06-03  6:52 ` [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Hans Verkuil
  2 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2014-06-03  0:44 UTC (permalink / raw)
  To: linux-media; +Cc: Hans Verkuil

media-ctl requires a recent v4l2-mediabus.h header. Add the latest
mainline kernel version of the header.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/linux/v4l2-mediabus.h | 147 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 include/linux/v4l2-mediabus.h

diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h
new file mode 100644
index 0000000..1445e85
--- /dev/null
+++ b/include/linux/v4l2-mediabus.h
@@ -0,0 +1,147 @@
+/*
+ * Media Bus API header
+ *
+ * Copyright (C) 2009, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_V4L2_MEDIABUS_H
+#define __LINUX_V4L2_MEDIABUS_H
+
+#include <linux/types.h>
+#include <linux/videodev2.h>
+
+/*
+ * These pixel codes uniquely identify data formats on the media bus. Mostly
+ * they correspond to similarly named V4L2_PIX_FMT_* formats, format 0 is
+ * reserved, V4L2_MBUS_FMT_FIXED shall be used by host-client pairs, where the
+ * data format is fixed. Additionally, "2X8" means that one pixel is transferred
+ * in two 8-bit samples, "BE" or "LE" specify in which order those samples are
+ * transferred over the bus: "LE" means that the least significant bits are
+ * transferred first, "BE" means that the most significant bits are transferred
+ * first, and "PADHI" and "PADLO" define which bits - low or high, in the
+ * incomplete high byte, are filled with padding bits.
+ *
+ * The pixel codes are grouped by type, bus_width, bits per component, samples
+ * per pixel and order of subsamples. Numerical values are sorted using generic
+ * numerical sort order (8 thus comes before 10).
+ *
+ * As their value can't change when a new pixel code is inserted in the
+ * enumeration, the pixel codes are explicitly given a numerical value. The next
+ * free values for each category are listed below, update them when inserting
+ * new pixel codes.
+ */
+enum v4l2_mbus_pixelcode {
+	V4L2_MBUS_FMT_FIXED = 0x0001,
+
+	/* RGB - next is 0x100e */
+	V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE = 0x1001,
+	V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE = 0x1002,
+	V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE = 0x1003,
+	V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE = 0x1004,
+	V4L2_MBUS_FMT_BGR565_2X8_BE = 0x1005,
+	V4L2_MBUS_FMT_BGR565_2X8_LE = 0x1006,
+	V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
+	V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
+	V4L2_MBUS_FMT_RGB666_1X18 = 0x1009,
+	V4L2_MBUS_FMT_RGB888_1X24 = 0x100a,
+	V4L2_MBUS_FMT_RGB888_2X12_BE = 0x100b,
+	V4L2_MBUS_FMT_RGB888_2X12_LE = 0x100c,
+	V4L2_MBUS_FMT_ARGB8888_1X32 = 0x100d,
+
+	/* YUV (including grey) - next is 0x2024 */
+	V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
+	V4L2_MBUS_FMT_UV8_1X8 = 0x2015,
+	V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
+	V4L2_MBUS_FMT_VYUY8_1_5X8 = 0x2003,
+	V4L2_MBUS_FMT_YUYV8_1_5X8 = 0x2004,
+	V4L2_MBUS_FMT_YVYU8_1_5X8 = 0x2005,
+	V4L2_MBUS_FMT_UYVY8_2X8 = 0x2006,
+	V4L2_MBUS_FMT_VYUY8_2X8 = 0x2007,
+	V4L2_MBUS_FMT_YUYV8_2X8 = 0x2008,
+	V4L2_MBUS_FMT_YVYU8_2X8 = 0x2009,
+	V4L2_MBUS_FMT_Y10_1X10 = 0x200a,
+	V4L2_MBUS_FMT_UYVY10_2X10 = 0x2018,
+	V4L2_MBUS_FMT_VYUY10_2X10 = 0x2019,
+	V4L2_MBUS_FMT_YUYV10_2X10 = 0x200b,
+	V4L2_MBUS_FMT_YVYU10_2X10 = 0x200c,
+	V4L2_MBUS_FMT_Y12_1X12 = 0x2013,
+	V4L2_MBUS_FMT_UYVY8_1X16 = 0x200f,
+	V4L2_MBUS_FMT_VYUY8_1X16 = 0x2010,
+	V4L2_MBUS_FMT_YUYV8_1X16 = 0x2011,
+	V4L2_MBUS_FMT_YVYU8_1X16 = 0x2012,
+	V4L2_MBUS_FMT_YDYUYDYV8_1X16 = 0x2014,
+	V4L2_MBUS_FMT_UYVY10_1X20 = 0x201a,
+	V4L2_MBUS_FMT_VYUY10_1X20 = 0x201b,
+	V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
+	V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
+	V4L2_MBUS_FMT_YUV10_1X30 = 0x2016,
+	V4L2_MBUS_FMT_AYUV8_1X32 = 0x2017,
+	V4L2_MBUS_FMT_UYVY12_2X12 = 0x201c,
+	V4L2_MBUS_FMT_VYUY12_2X12 = 0x201d,
+	V4L2_MBUS_FMT_YUYV12_2X12 = 0x201e,
+	V4L2_MBUS_FMT_YVYU12_2X12 = 0x201f,
+	V4L2_MBUS_FMT_UYVY12_1X24 = 0x2020,
+	V4L2_MBUS_FMT_VYUY12_1X24 = 0x2021,
+	V4L2_MBUS_FMT_YUYV12_1X24 = 0x2022,
+	V4L2_MBUS_FMT_YVYU12_1X24 = 0x2023,
+
+	/* Bayer - next is 0x3019 */
+	V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
+	V4L2_MBUS_FMT_SGBRG8_1X8 = 0x3013,
+	V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
+	V4L2_MBUS_FMT_SRGGB8_1X8 = 0x3014,
+	V4L2_MBUS_FMT_SBGGR10_ALAW8_1X8 = 0x3015,
+	V4L2_MBUS_FMT_SGBRG10_ALAW8_1X8 = 0x3016,
+	V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8 = 0x3017,
+	V4L2_MBUS_FMT_SRGGB10_ALAW8_1X8 = 0x3018,
+	V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
+	V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 = 0x300c,
+	V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 = 0x3009,
+	V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8 = 0x300d,
+	V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE = 0x3003,
+	V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE = 0x3004,
+	V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE = 0x3005,
+	V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE = 0x3006,
+	V4L2_MBUS_FMT_SBGGR10_1X10 = 0x3007,
+	V4L2_MBUS_FMT_SGBRG10_1X10 = 0x300e,
+	V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a,
+	V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f,
+	V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008,
+	V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010,
+	V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011,
+	V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012,
+
+	/* JPEG compressed formats - next is 0x4002 */
+	V4L2_MBUS_FMT_JPEG_1X8 = 0x4001,
+
+	/* Vendor specific formats - next is 0x5002 */
+
+	/* S5C73M3 sensor specific interleaved UYVY and JPEG */
+	V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 = 0x5001,
+
+	/* HSV - next is 0x6002 */
+	V4L2_MBUS_FMT_AHSV8888_1X32 = 0x6001,
+};
+
+/**
+ * struct v4l2_mbus_framefmt - frame format on the media bus
+ * @width:	frame width
+ * @height:	frame height
+ * @code:	data format code (from enum v4l2_mbus_pixelcode)
+ * @field:	used interlacing type (from enum v4l2_field)
+ * @colorspace:	colorspace of the data (from enum v4l2_colorspace)
+ */
+struct v4l2_mbus_framefmt {
+	__u32			width;
+	__u32			height;
+	__u32			code;
+	__u32			field;
+	__u32			colorspace;
+	__u32			reserved[7];
+};
+
+#endif
-- 
1.8.5.5


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header
  2014-06-03  0:44 [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Laurent Pinchart
  2014-06-03  0:44 ` [PATCH 1/2] Use installed kernel headers instead of raw kernel headers Laurent Pinchart
  2014-06-03  0:44 ` [PATCH 2/2] Add the missing v4l2-mediabus.h kernel header Laurent Pinchart
@ 2014-06-03  6:52 ` Hans Verkuil
  2014-06-03  9:46   ` Laurent Pinchart
  2 siblings, 1 reply; 7+ messages in thread
From: Hans Verkuil @ 2014-06-03  6:52 UTC (permalink / raw)
  To: Laurent Pinchart, linux-media; +Cc: Hans Verkuil

On 06/03/2014 02:44 AM, Laurent Pinchart wrote:
> Hello,
> 
> This patch set adds the missing v4l2-mediabus.h header, required by media-ctl.
> Please see individual patches for details, they're pretty straightforward.

Nack.

The kernel headers used in v4l-utils are installed via 'make sync-with-kernel'.
So these headers shouldn't be edited, instead Makefile.am should be updated.
In particular, that's where the missing header should be added.

Regards,

	Hans

> Laurent Pinchart (2):
>   Use installed kernel headers instead of raw kernel headers
>   Add the missing v4l2-mediabus.h kernel header
> 
>  include/linux/dvb/dmx.h       |   8 +--
>  include/linux/dvb/frontend.h  |   4 --
>  include/linux/dvb/video.h     |  12 ++--
>  include/linux/fb.h            |   8 +--
>  include/linux/ivtv.h          |   6 +-
>  include/linux/v4l2-mediabus.h | 147 ++++++++++++++++++++++++++++++++++++++++++
>  include/linux/videodev2.h     |  16 ++---
>  7 files changed, 168 insertions(+), 33 deletions(-)
>  create mode 100644 include/linux/v4l2-mediabus.h
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header
  2014-06-03  6:52 ` [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Hans Verkuil
@ 2014-06-03  9:46   ` Laurent Pinchart
  2014-06-03  9:48     ` Hans Verkuil
  0 siblings, 1 reply; 7+ messages in thread
From: Laurent Pinchart @ 2014-06-03  9:46 UTC (permalink / raw)
  To: Hans Verkuil; +Cc: linux-media, Hans Verkuil

Hi Hans,

On Tuesday 03 June 2014 08:52:29 Hans Verkuil wrote:
> On 06/03/2014 02:44 AM, Laurent Pinchart wrote:
> > Hello,
> > 
> > This patch set adds the missing v4l2-mediabus.h header, required by
> > media-ctl. Please see individual patches for details, they're pretty
> > straightforward.
>
> Nack.
> 
> The kernel headers used in v4l-utils are installed via 'make
> sync-with-kernel'. So these headers shouldn't be edited, instead
> Makefile.am should be updated. In particular, that's where the missing
> header should be added.

I had seen mentions of sync-with-kernel and for some reason thought it was a 
script. As I couldn't find it in the repository I decided to sync the headers 
manually :-/

Thanks for fixing the problem. By the way, what would you think about 
modifying sync-with-kernel to use installed kernel headers ?

> > Laurent Pinchart (2):
> >   Use installed kernel headers instead of raw kernel headers
> >   Add the missing v4l2-mediabus.h kernel header
> >  
> >  include/linux/dvb/dmx.h       |   8 +--
> >  include/linux/dvb/frontend.h  |   4 --
> >  include/linux/dvb/video.h     |  12 ++--
> >  include/linux/fb.h            |   8 +--
> >  include/linux/ivtv.h          |   6 +-
> >  include/linux/v4l2-mediabus.h | 147 +++++++++++++++++++++++++++++++++++++
> >  include/linux/videodev2.h     |  16 ++---
> >  7 files changed, 168 insertions(+), 33 deletions(-)
> >  create mode 100644 include/linux/v4l2-mediabus.h

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header
  2014-06-03  9:46   ` Laurent Pinchart
@ 2014-06-03  9:48     ` Hans Verkuil
  2014-06-03 10:40       ` Laurent Pinchart
  0 siblings, 1 reply; 7+ messages in thread
From: Hans Verkuil @ 2014-06-03  9:48 UTC (permalink / raw)
  To: Laurent Pinchart; +Cc: linux-media, Hans Verkuil

On 06/03/14 11:46, Laurent Pinchart wrote:
> Hi Hans,
> 
> On Tuesday 03 June 2014 08:52:29 Hans Verkuil wrote:
>> On 06/03/2014 02:44 AM, Laurent Pinchart wrote:
>>> Hello,
>>>
>>> This patch set adds the missing v4l2-mediabus.h header, required by
>>> media-ctl. Please see individual patches for details, they're pretty
>>> straightforward.
>>
>> Nack.
>>
>> The kernel headers used in v4l-utils are installed via 'make
>> sync-with-kernel'. So these headers shouldn't be edited, instead
>> Makefile.am should be updated. In particular, that's where the missing
>> header should be added.
> 
> I had seen mentions of sync-with-kernel and for some reason thought it was a 
> script. As I couldn't find it in the repository I decided to sync the headers 
> manually :-/
> 
> Thanks for fixing the problem. By the way, what would you think about 
> modifying sync-with-kernel to use installed kernel headers ?

Patches are welcome!

:-)

Regards,

	Hans

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header
  2014-06-03  9:48     ` Hans Verkuil
@ 2014-06-03 10:40       ` Laurent Pinchart
  0 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2014-06-03 10:40 UTC (permalink / raw)
  To: Hans Verkuil; +Cc: linux-media, Hans Verkuil

Hi Hans,

On Tuesday 03 June 2014 11:48:14 Hans Verkuil wrote:
> On 06/03/14 11:46, Laurent Pinchart wrote:
> > On Tuesday 03 June 2014 08:52:29 Hans Verkuil wrote:
> >> On 06/03/2014 02:44 AM, Laurent Pinchart wrote:
> >>> Hello,
> >>> 
> >>> This patch set adds the missing v4l2-mediabus.h header, required by
> >>> media-ctl. Please see individual patches for details, they're pretty
> >>> straightforward.
> >> 
> >> Nack.
> >> 
> >> The kernel headers used in v4l-utils are installed via 'make
> >> sync-with-kernel'. So these headers shouldn't be edited, instead
> >> Makefile.am should be updated. In particular, that's where the missing
> >> header should be added.
> > 
> > I had seen mentions of sync-with-kernel and for some reason thought it was
> > a script. As I couldn't find it in the repository I decided to sync the
> > headers manually :-/
> > 
> > Thanks for fixing the problem. By the way, what would you think about
> > modifying sync-with-kernel to use installed kernel headers ?
> 
> Patches are welcome!
> 
> :-)

Patch sent :-)

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-06-03 10:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-03  0:44 [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Laurent Pinchart
2014-06-03  0:44 ` [PATCH 1/2] Use installed kernel headers instead of raw kernel headers Laurent Pinchart
2014-06-03  0:44 ` [PATCH 2/2] Add the missing v4l2-mediabus.h kernel header Laurent Pinchart
2014-06-03  6:52 ` [PATCH 0/2] v4l-utils: Add missing v4l2-mediabus.h header Hans Verkuil
2014-06-03  9:46   ` Laurent Pinchart
2014-06-03  9:48     ` Hans Verkuil
2014-06-03 10:40       ` Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).