[media] media: videobuf2: Replace videobuf2-core with videobuf2-v4l2
Make videobuf2-v4l2 as a wrapper of videobuf2-core for v4l2-use. And replace videobuf2-core.h with videobuf2-v4l2.h. This renaming change should be accompanied by the modifications of all device drivers that include videobuf2-core.h. It can be done with just running this shell script. replace() { str1=$1 str2=$2 dir=$3 for file in $(find $dir -name *.h -o -name *.c -o -name Makefile) do echo $file sed "s/$str1/$str2/g" $file > $file.out mv $file.out $file done } replace "videobuf2-core" "videobuf2-v4l2" "include/media/" replace "videobuf2-core" "videobuf2-v4l2" "drivers/media/" replace "videobuf2-core" "videobuf2-v4l2" "drivers/usb/gadget/" replace "videobuf2-core" "videobuf2-v4l2" "drivers/staging/media/" Signed-off-by: Junghak Sung <jh1009.sung@samsung.com> Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com> Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com> Acked-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Родитель
a807773405
Коммит
c139990e84
|
@ -35,7 +35,7 @@
|
|||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include "solo6x10-regs.h"
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
#include <media/videobuf2-vmalloc.h>
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
#include <media/videobuf2-vmalloc.h>
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include "coda_regs.h"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#define __CODA_TRACE_H__
|
||||
|
||||
#include <linux/tracepoint.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include "coda.h"
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/videodev2.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "common.h"
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/clk.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "fimc-core.h"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <linux/sizes.h>
|
||||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <linux/sizes.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/types.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
|
||||
#include "fimc-isp.h"
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
#include <media/exynos-fimc.h>
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#ifndef FIMC_ISP_VIDEO__
|
||||
#define FIMC_ISP_VIDEO__
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include "fimc-isp.h"
|
||||
|
||||
#ifdef CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <linux/videodev2.h>
|
||||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-mediabus.h>
|
||||
#include <media/exynos-fimc.h>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
#include <media/exynos-fimc.h>
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/videodev2.h>
|
||||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-mediabus.h>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/clk.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "common.h"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
/*
|
||||
* Create our own symbols for the supported buffer modes, but, for now,
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <media/media-entity.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#define ISP_VIDEO_DRIVER_NAME "ispvideo"
|
||||
#define ISP_VIDEO_DRIVER_VERSION "0.0.2"
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "camif-core.h"
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <media/media-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "camif-core.h"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-mediabus.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/s3c_camif.h>
|
||||
|
||||
#define S3C_CAMIF_DRIVER_NAME "s3c-camif"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "g2d.h"
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <linux/string.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "jpeg-core.h"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <media/v4l2-event.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/of.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include "s5p_mfc_common.h"
|
||||
#include "s5p_mfc_ctrl.h"
|
||||
#include "s5p_mfc_debug.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include "regs-mfc.h"
|
||||
#include "regs-mfc-v8.h"
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <linux/workqueue.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include "s5p_mfc_common.h"
|
||||
#include "s5p_mfc_ctrl.h"
|
||||
#include "s5p_mfc_debug.h"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <media/v4l2-event.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include "s5p_mfc_common.h"
|
||||
#include "s5p_mfc_ctrl.h"
|
||||
#include "s5p_mfc_debug.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <linux/spinlock.h>
|
||||
#include <linux/wait.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include "regs-mixer.h"
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
#include <media/soc_camera.h>
|
||||
#include <media/soc_mediabus.h>
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-of.h>
|
||||
#include <media/videobuf-core.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
/* Default to VGA resolution */
|
||||
#define DEFAULT_WIDTH 640
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "vpdma.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#define _VIVID_CORE_H_
|
||||
|
||||
#include <linux/fb.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-subdev.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "vsp1.h"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <linux/wait.h>
|
||||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
struct vsp1_video;
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#include "xilinx-dma.h"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
struct dma_chan;
|
||||
struct xvip_composite_device;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
struct go7007;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <linux/i2c.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/ac97_codec.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include "usbtv.h"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
/* --------------------------------------------------------------------------
|
||||
* UVC constants
|
||||
|
|
|
@ -33,7 +33,7 @@ obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
|
|||
obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
|
||||
obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
|
||||
|
||||
obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o
|
||||
obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o videobuf2-v4l2.o
|
||||
obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
|
||||
obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
|
||||
obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include <trace/events/v4l2.h>
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/sched.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-mem2mem.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/v4l2.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* videobuf2-core.c - V4L2 driver helper framework
|
||||
* videobuf2-core.c - video buffer 2 core framework
|
||||
*
|
||||
* Copyright (C) 2010 Samsung Electronics
|
||||
*
|
||||
|
@ -28,7 +28,7 @@
|
|||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
#include <trace/events/v4l2.h>
|
||||
|
||||
|
@ -1818,7 +1818,7 @@ static int vb2_start_streaming(struct vb2_queue *q)
|
|||
/*
|
||||
* If you see this warning, then the driver isn't cleaning up properly
|
||||
* after a failed start_streaming(). See the start_streaming()
|
||||
* documentation in videobuf2-core.h for more information how buffers
|
||||
* documentation in videobuf2-v4l2.h for more information how buffers
|
||||
* should be returned to vb2 in start_streaming().
|
||||
*/
|
||||
if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
|
||||
|
@ -2205,7 +2205,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
|
|||
/*
|
||||
* If you see this warning, then the driver isn't cleaning up properly
|
||||
* in stop_streaming(). See the stop_streaming() documentation in
|
||||
* videobuf2-core.h for more information how buffers should be returned
|
||||
* videobuf2-v4l2.h for more information how buffers should be returned
|
||||
* to vb2 in stop_streaming().
|
||||
*/
|
||||
if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
|
||||
|
@ -2739,7 +2739,7 @@ EXPORT_SYMBOL_GPL(vb2_poll);
|
|||
* responsible of clearing it's content and setting initial values for some
|
||||
* required entries before calling this function.
|
||||
* q->ops, q->mem_ops, q->type and q->io_modes are mandatory. Please refer
|
||||
* to the struct vb2_queue description in include/media/videobuf2-core.h
|
||||
* to the struct vb2_queue description in include/media/videobuf2-v4l2.h
|
||||
* for more information.
|
||||
*/
|
||||
int vb2_queue_init(struct vb2_queue *q)
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
#include <media/videobuf2-memops.h>
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-memops.h>
|
||||
#include <media/videobuf2-dma-sg.h>
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/sched.h>
|
||||
#include <linux/file.h>
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-memops.h>
|
||||
|
||||
/**
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* videobuf2-v4l2.c - V4L2 driver helper framework
|
||||
*
|
||||
* Copyright (C) 2010 Samsung Electronics
|
||||
*
|
||||
* Author: Pawel Osciak <pawel@osciak.com>
|
||||
* Marek Szyprowski <m.szyprowski@samsung.com>
|
||||
*
|
||||
* The vb2_thread implementation was based on code from videobuf-dvb.c:
|
||||
* (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs]
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/freezer.h>
|
||||
#include <linux/kthread.h>
|
||||
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
MODULE_DESCRIPTION("Driver helper framework for Video for Linux 2");
|
||||
MODULE_AUTHOR("Pawel Osciak <pawel@osciak.com>, Marek Szyprowski");
|
||||
MODULE_LICENSE("GPL");
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-vmalloc.h>
|
||||
#include <media/videobuf2-memops.h>
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <media/media-entity.h>
|
||||
#include <media/v4l2-dev.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/videobuf2-dma-contig.h>
|
||||
|
||||
#define ISS_VIDEO_DRIVER_NAME "issvideo"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
/* Maximum frame size in bytes, for sanity checking. */
|
||||
#define UVC_MAX_FRAME_SIZE (16*1024*1024)
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <linux/pm.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <media/videobuf-core.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <media/v4l2-async.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef _MEDIA_V4L2_MEM2MEM_H
|
||||
#define _MEDIA_V4L2_MEM2MEM_H
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
/**
|
||||
* struct v4l2_m2m_ops - mem-to-mem device driver callbacks
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* videobuf2-core.h - V4L2 driver helper framework
|
||||
* videobuf2-core.h - Video Buffer 2 Core Framework
|
||||
*
|
||||
* Copyright (C) 2010 Samsung Electronics
|
||||
*
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#ifndef _MEDIA_VIDEOBUF2_DMA_CONTIG_H
|
||||
#define _MEDIA_VIDEOBUF2_DMA_CONTIG_H
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
static inline dma_addr_t
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#ifndef _MEDIA_VIDEOBUF2_DMA_SG_H
|
||||
#define _MEDIA_VIDEOBUF2_DMA_SG_H
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
static inline struct sg_table *vb2_dma_sg_plane_desc(
|
||||
struct vb2_buffer *vb, unsigned int plane_no)
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#ifndef _MEDIA_VIDEOBUF2_MEMOPS_H
|
||||
#define _MEDIA_VIDEOBUF2_MEMOPS_H
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
/**
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
/*
|
||||
* videobuf2-v4l2.h - V4L2 driver helper framework
|
||||
*
|
||||
* Copyright (C) 2010 Samsung Electronics
|
||||
*
|
||||
* Author: Pawel Osciak <pawel@osciak.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation.
|
||||
*/
|
||||
#ifndef _MEDIA_VIDEOBUF2_V4L2_H
|
||||
#define _MEDIA_VIDEOBUF2_V4L2_H
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
|
||||
#endif /* _MEDIA_VIDEOBUF2_V4L2_H */
|
|
@ -13,7 +13,7 @@
|
|||
#ifndef _MEDIA_VIDEOBUF2_VMALLOC_H
|
||||
#define _MEDIA_VIDEOBUF2_VMALLOC_H
|
||||
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/videobuf2-v4l2.h>
|
||||
|
||||
extern const struct vb2_mem_ops vb2_vmalloc_memops;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче