From a912de54f58be9801b6df1957a80970199f6c72b Mon Sep 17 00:00:00 2001 From: "yuyeon.oh" Date: Tue, 24 May 2011 15:45:10 +0900 Subject: [PATCH] remove svc.c and add svvd.c (copy from vivi.c) Change-Id: I3e380b10475694eb4328ac935d408d2fdfd31914 --- .config | 2 +- drivers/media/video/Kconfig | 6 +++--- drivers/media/video/Makefile | 2 +- drivers/media/video/{svc.c => svvd.c} | 13 +++++++------ 4 files changed, 12 insertions(+), 11 deletions(-) rename drivers/media/video/{svc.c => svvd.c} (99%) mode change 100644 => 100755 diff --git a/.config b/.config index d6f028d5d1d5..e93c164a9cc6 100644 --- a/.config +++ b/.config @@ -851,7 +851,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_VIDEO_VIVI is not set -CONFIG_VIDEO_SVC=y +CONFIG_VIDEO_SVVD=y # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_CPIA2 is not set # CONFIG_VIDEO_STRADIS is not set diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index b201c8528a9f..2db67fabec76 100755 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -547,13 +547,13 @@ config VIDEO_VIVI Say Y here if you want to test video apps or debug V4L devices. In doubt, say N. -config VIDEO_SVC - tristate "Samsung Virtual Video Driver" +config VIDEO_SVVD + tristate "S-core Virtual Video Driver" depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 select VIDEOBUF_VMALLOC default n ---help--- - Enables a Samsung Virtual Camera driver. This device shows a test + Enables a S-core Virtual Video driver. This device shows a test video(YUV420), as a real device would generate by using V4L2 api. And it supports overlay driver. Say Y here if you want to test video apps or debug V4L devices. diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index bad4a11eb6f6..1ae3fa778297 100755 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -144,7 +144,7 @@ obj-$(CONFIG_VIDEO_IVTV) += ivtv/ obj-$(CONFIG_VIDEO_CX18) += cx18/ obj-$(CONFIG_VIDEO_VIVI) += vivi.o -obj-$(CONFIG_VIDEO_SVC) += svc.o +obj-$(CONFIG_VIDEO_SVVD) += svvd.o obj-$(CONFIG_VIDEO_CX23885) += cx23885/ obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o diff --git a/drivers/media/video/svc.c b/drivers/media/video/svvd.c old mode 100644 new mode 100755 similarity index 99% rename from drivers/media/video/svc.c rename to drivers/media/video/svvd.c index 7705fc6baf00..1834e4720ec9 --- a/drivers/media/video/svc.c +++ b/drivers/media/video/svvd.c @@ -1,6 +1,7 @@ /* * Virtual Video driver - This code emulates a real video device with v4l2 api * + * Copyright (C) 2011 S-core * Copyright (c) 2006 by: * Mauro Carvalho Chehab * Ted Walther @@ -1327,7 +1328,7 @@ static int vivi_release(void) return 0; } -static int __init vivi_create_instance(int inst) +static int __init svvd_create_instance(int inst) { struct vivi_dev *dev; struct video_device *vfd; @@ -1398,7 +1399,7 @@ free_dev: will succeed. This is limited to the maximum number of devices that videodev supports, which is equal to VIDEO_NUM_DEVICES. */ -static int __init vivi_init(void) +static int __init svvd_init(void) { int ret = 0, i; @@ -1406,7 +1407,7 @@ static int __init vivi_init(void) n_devs = 1; for (i = 0; i < n_devs; i++) { - ret = vivi_create_instance(i); + ret = svvd_create_instance(i); if (ret) { /* If some instantiations succeeded, keep driver */ if (i) @@ -1431,10 +1432,10 @@ static int __init vivi_init(void) return ret; } -static void __exit vivi_exit(void) +static void __exit svvd_exit(void) { vivi_release(); } -module_init(vivi_init); -module_exit(vivi_exit); +module_init(svvd_init); +module_exit(svvd_exit); -- 2.34.1