aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-19 15:31:17 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:59 -0400
commit7f6adeaf2d8800b66c5dd6c2cf2622dfdd68bd31 (patch)
tree23dc1f8ee0fef9132ee310cb8f30f5228b641988
parent0ab6e1c38d80ab586e3a1ca9e71844131d9f51dc (diff)
V4L/DVB (10730): v4l-dvb: cleanup obsolete references to v4l1 headers.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> [mchehab@redhat.com: fix compilation of tea575x-tuner.c] Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/common/tuners/mt20xx.c2
-rw-r--r--drivers/media/common/tuners/tda8290.c2
-rw-r--r--drivers/media/common/tuners/tea5761.c2
-rw-r--r--drivers/media/common/tuners/tea5767.c2
-rw-r--r--drivers/media/video/ks0127.h2
-rw-r--r--drivers/media/video/saa6588.c2
-rw-r--r--drivers/media/video/tvaudio.c2
-rw-r--r--drivers/media/video/zoran/videocodec.h9
-rw-r--r--drivers/media/video/zoran/zoran.h8
-rw-r--r--drivers/media/video/zoran/zoran_card.c43
-rw-r--r--drivers/media/video/zoran/zoran_device.c20
-rw-r--r--drivers/media/video/zoran/zoran_device.h2
-rw-r--r--drivers/media/video/zoran/zoran_driver.c40
-rw-r--r--drivers/media/video/zoran/zoran_procfs.c2
-rw-r--r--drivers/media/video/zoran/zr36016.c5
-rw-r--r--drivers/media/video/zoran/zr36050.c4
-rw-r--r--drivers/media/video/zoran/zr36060.c4
17 files changed, 56 insertions, 95 deletions
diff --git a/drivers/media/common/tuners/mt20xx.c b/drivers/media/common/tuners/mt20xx.c
index 35b763a16d5..44608ad4e2d 100644
--- a/drivers/media/common/tuners/mt20xx.c
+++ b/drivers/media/common/tuners/mt20xx.c
@@ -6,7 +6,7 @@
6 */ 6 */
7#include <linux/delay.h> 7#include <linux/delay.h>
8#include <linux/i2c.h> 8#include <linux/i2c.h>
9#include <linux/videodev.h> 9#include <linux/videodev2.h>
10#include "tuner-i2c.h" 10#include "tuner-i2c.h"
11#include "mt20xx.h" 11#include "mt20xx.h"
12 12
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index 39697fa5925..a88e67632c5 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -22,7 +22,7 @@
22 22
23#include <linux/i2c.h> 23#include <linux/i2c.h>
24#include <linux/delay.h> 24#include <linux/delay.h>
25#include <linux/videodev.h> 25#include <linux/videodev2.h>
26#include "tuner-i2c.h" 26#include "tuner-i2c.h"
27#include "tda8290.h" 27#include "tda8290.h"
28#include "tda827x.h" 28#include "tda827x.h"
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/common/tuners/tea5761.c
index b23dadeecd0..60ed872f3d4 100644
--- a/drivers/media/common/tuners/tea5761.c
+++ b/drivers/media/common/tuners/tea5761.c
@@ -9,7 +9,7 @@
9 9
10#include <linux/i2c.h> 10#include <linux/i2c.h>
11#include <linux/delay.h> 11#include <linux/delay.h>
12#include <linux/videodev.h> 12#include <linux/videodev2.h>
13#include <media/tuner.h> 13#include <media/tuner.h>
14#include "tuner-i2c.h" 14#include "tuner-i2c.h"
15#include "tea5761.h" 15#include "tea5761.h"
diff --git a/drivers/media/common/tuners/tea5767.c b/drivers/media/common/tuners/tea5767.c
index 1f5646334a8..223a226d20a 100644
--- a/drivers/media/common/tuners/tea5767.c
+++ b/drivers/media/common/tuners/tea5767.c
@@ -12,7 +12,7 @@
12 12
13#include <linux/i2c.h> 13#include <linux/i2c.h>
14#include <linux/delay.h> 14#include <linux/delay.h>
15#include <linux/videodev.h> 15#include <linux/videodev2.h>
16#include "tuner-i2c.h" 16#include "tuner-i2c.h"
17#include "tea5767.h" 17#include "tea5767.h"
18 18
diff --git a/drivers/media/video/ks0127.h b/drivers/media/video/ks0127.h
index 1ec578833ae..cb8abd5403b 100644
--- a/drivers/media/video/ks0127.h
+++ b/drivers/media/video/ks0127.h
@@ -24,8 +24,6 @@
24#ifndef KS0127_H 24#ifndef KS0127_H
25#define KS0127_H 25#define KS0127_H
26 26
27#include <linux/videodev.h>
28
29/* input channels */ 27/* input channels */
30#define KS_INPUT_COMPOSITE_1 0 28#define KS_INPUT_COMPOSITE_1 0
31#define KS_INPUT_COMPOSITE_2 1 29#define KS_INPUT_COMPOSITE_2 1
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 258b7b2a1e9..0067b281d50 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -23,7 +23,7 @@
23#include <linux/kernel.h> 23#include <linux/kernel.h>
24#include <linux/i2c.h> 24#include <linux/i2c.h>
25#include <linux/types.h> 25#include <linux/types.h>
26#include <linux/videodev.h> 26#include <linux/videodev2.h>
27#include <linux/init.h> 27#include <linux/init.h>
28#include <linux/errno.h> 28#include <linux/errno.h>
29#include <linux/slab.h> 29#include <linux/slab.h>
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 0eb3b169428..e8ab28532d9 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -26,7 +26,7 @@
26#include <linux/delay.h> 26#include <linux/delay.h>
27#include <linux/errno.h> 27#include <linux/errno.h>
28#include <linux/slab.h> 28#include <linux/slab.h>
29#include <linux/videodev.h> 29#include <linux/videodev2.h>
30#include <linux/i2c.h> 30#include <linux/i2c.h>
31#include <linux/init.h> 31#include <linux/init.h>
32#include <linux/kthread.h> 32#include <linux/kthread.h>
diff --git a/drivers/media/video/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h
index 97a3bbeda50..5c27b251354 100644
--- a/drivers/media/video/zoran/videocodec.h
+++ b/drivers/media/video/zoran/videocodec.h
@@ -97,7 +97,7 @@
97 available) - it returns 0 if the mode is possible 97 available) - it returns 0 if the mode is possible
98 set_size -> this fn-ref. sets the norm and image size for 98 set_size -> this fn-ref. sets the norm and image size for
99 compression/decompression (returns 0 on success) 99 compression/decompression (returns 0 on success)
100 the norm param is defined in videodev.h (VIDEO_MODE_*) 100 the norm param is defined in videodev2.h (V4L2_STD_*)
101 101
102 additional setup may be available, too - but the codec should work with 102 additional setup may be available, too - but the codec should work with
103 some default values even without this 103 some default values even without this
@@ -144,9 +144,8 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1])
144#ifndef __LINUX_VIDEOCODEC_H 144#ifndef __LINUX_VIDEOCODEC_H
145#define __LINUX_VIDEOCODEC_H 145#define __LINUX_VIDEOCODEC_H
146 146
147#include <linux/videodev.h> 147#include <linux/videodev2.h>
148 148
149//should be in videodev.h ??? (VID_DO_....)
150#define CODEC_DO_COMPRESSION 0 149#define CODEC_DO_COMPRESSION 0
151#define CODEC_DO_EXPANSION 1 150#define CODEC_DO_EXPANSION 1
152 151
@@ -237,10 +236,6 @@ struct vfe_settings {
237 __u32 width, height; /* Area to capture */ 236 __u32 width, height; /* Area to capture */
238 __u16 decimation; /* Decimation divider */ 237 __u16 decimation; /* Decimation divider */
239 __u16 flags; /* Flags for capture */ 238 __u16 flags; /* Flags for capture */
240/* flags are the same as in struct video_capture - see videodev.h:
241#define VIDEO_CAPTURE_ODD 0
242#define VIDEO_CAPTURE_EVEN 1
243*/
244 __u16 quality; /* quality of the video */ 239 __u16 quality; /* quality of the video */
245}; 240};
246 241
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index ab1ced26276..8beada9613f 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -408,7 +408,13 @@ struct zoran {
408 /* Video for Linux parameters */ 408 /* Video for Linux parameters */
409 int input; /* card's norm and input - norm=VIDEO_MODE_* */ 409 int input; /* card's norm and input - norm=VIDEO_MODE_* */
410 v4l2_std_id norm; 410 v4l2_std_id norm;
411 struct video_buffer buffer; /* Current buffer params */ 411
412 /* Current buffer params */
413 void *vbuf_base;
414 int vbuf_height, vbuf_width;
415 int vbuf_depth;
416 int vbuf_bytesperline;
417
412 struct zoran_overlay_settings overlay_settings; 418 struct zoran_overlay_settings overlay_settings;
413 u32 *overlay_mask; /* overlay mask */ 419 u32 *overlay_mask; /* overlay mask */
414 enum zoran_lock_activity overlay_active; /* feature currently in use? */ 420 enum zoran_lock_activity overlay_active; /* feature currently in use? */
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 0b64612e35b..665a5e370a8 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -38,7 +38,7 @@
38#include <linux/proc_fs.h> 38#include <linux/proc_fs.h>
39#include <linux/i2c.h> 39#include <linux/i2c.h>
40#include <linux/i2c-algo-bit.h> 40#include <linux/i2c-algo-bit.h>
41#include <linux/videodev.h> 41#include <linux/videodev2.h>
42#include <media/v4l2-common.h> 42#include <media/v4l2-common.h>
43#include <linux/spinlock.h> 43#include <linux/spinlock.h>
44#include <linux/sem.h> 44#include <linux/sem.h>
@@ -47,8 +47,6 @@
47 47
48#include <linux/pci.h> 48#include <linux/pci.h>
49#include <linux/interrupt.h> 49#include <linux/interrupt.h>
50#include <linux/video_decoder.h>
51#include <linux/video_encoder.h>
52#include <linux/mutex.h> 50#include <linux/mutex.h>
53 51
54#include <asm/io.h> 52#include <asm/io.h>
@@ -108,23 +106,6 @@ static int video_nr[BUZ_MAX] = { [0 ... (BUZ_MAX-1)] = -1 };
108module_param_array(video_nr, int, NULL, 0444); 106module_param_array(video_nr, int, NULL, 0444);
109MODULE_PARM_DESC(video_nr, "Video device number (-1=Auto)"); 107MODULE_PARM_DESC(video_nr, "Video device number (-1=Auto)");
110 108
111/*
112 Number and size of grab buffers for Video 4 Linux
113 The vast majority of applications should not need more than 2,
114 the very popular BTTV driver actually does ONLY have 2.
115 Time sensitive applications might need more, the maximum
116 is VIDEO_MAX_FRAME (defined in <linux/videodev.h>).
117
118 The size is set so that the maximum possible request
119 can be satisfied. Decrease it, if bigphys_area alloc'd
120 memory is low. If you don't have the bigphys_area patch,
121 set it to 128 KB. Will you allow only to grab small
122 images with V4L, but that's better than nothing.
123
124 v4l_bufsize has to be given in KB !
125
126*/
127
128int v4l_nbufs = 4; 109int v4l_nbufs = 4;
129int v4l_bufsize = 810; /* Everybody should be able to work with this setting */ 110int v4l_bufsize = 810; /* Everybody should be able to work with this setting */
130module_param(v4l_nbufs, int, 0644); 111module_param(v4l_nbufs, int, 0644);
@@ -1036,20 +1017,19 @@ zr36057_init (struct zoran *zr)
1036 zr->jpg_buffers.allocated = 0; 1017 zr->jpg_buffers.allocated = 0;
1037 zr->v4l_buffers.allocated = 0; 1018 zr->v4l_buffers.allocated = 0;
1038 1019
1039 zr->buffer.base = (void *) vidmem; 1020 zr->vbuf_base = (void *) vidmem;
1040 zr->buffer.width = 0; 1021 zr->vbuf_width = 0;
1041 zr->buffer.height = 0; 1022 zr->vbuf_height = 0;
1042 zr->buffer.depth = 0; 1023 zr->vbuf_depth = 0;
1043 zr->buffer.bytesperline = 0; 1024 zr->vbuf_bytesperline = 0;
1044 1025
1045 /* Avoid nonsense settings from user for default input/norm */ 1026 /* Avoid nonsense settings from user for default input/norm */
1046 if (default_norm < VIDEO_MODE_PAL && 1027 if (default_norm < 0 && default_norm > 2)
1047 default_norm > VIDEO_MODE_SECAM) 1028 default_norm = 0;
1048 default_norm = VIDEO_MODE_PAL; 1029 if (default_norm == 0) {
1049 if (default_norm == VIDEO_MODE_PAL) {
1050 zr->norm = V4L2_STD_PAL; 1030 zr->norm = V4L2_STD_PAL;
1051 zr->timing = zr->card.tvn[0]; 1031 zr->timing = zr->card.tvn[0];
1052 } else if (default_norm == VIDEO_MODE_NTSC) { 1032 } else if (default_norm == 1) {
1053 zr->norm = V4L2_STD_NTSC; 1033 zr->norm = V4L2_STD_NTSC;
1054 zr->timing = zr->card.tvn[1]; 1034 zr->timing = zr->card.tvn[1];
1055 } else { 1035 } else {
@@ -1547,9 +1527,6 @@ static int __init zoran_init(void)
1547 ZORAN_NAME, vidmem); 1527 ZORAN_NAME, vidmem);
1548 } 1528 }
1549 1529
1550 /* random nonsense */
1551 dprintk(6, KERN_DEBUG "Jotti is een held!\n");
1552
1553 /* some mainboards might not do PCI-PCI data transfer well */ 1530 /* some mainboards might not do PCI-PCI data transfer well */
1554 if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL|PCIPCI_ALIMAGIK)) { 1531 if (pci_pci_problems & (PCIPCI_FAIL|PCIAGP_FAIL|PCIPCI_ALIMAGIK)) {
1555 dprintk(1, 1532 dprintk(1,
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index 3336611c0cd..49e91b2ed55 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -488,11 +488,11 @@ zr36057_overlay (struct zoran *zr,
488 * All error messages are internal driver checking only! */ 488 * All error messages are internal driver checking only! */
489 489
490 /* video display top and bottom registers */ 490 /* video display top and bottom registers */
491 reg = (long) zr->buffer.base + 491 reg = (long) zr->vbuf_base +
492 zr->overlay_settings.x * 492 zr->overlay_settings.x *
493 ((zr->overlay_settings.format->depth + 7) / 8) + 493 ((zr->overlay_settings.format->depth + 7) / 8) +
494 zr->overlay_settings.y * 494 zr->overlay_settings.y *
495 zr->buffer.bytesperline; 495 zr->vbuf_bytesperline;
496 btwrite(reg, ZR36057_VDTR); 496 btwrite(reg, ZR36057_VDTR);
497 if (reg & 3) 497 if (reg & 3)
498 dprintk(1, 498 dprintk(1,
@@ -500,15 +500,15 @@ zr36057_overlay (struct zoran *zr,
500 "%s: zr36057_overlay() - video_address not aligned\n", 500 "%s: zr36057_overlay() - video_address not aligned\n",
501 ZR_DEVNAME(zr)); 501 ZR_DEVNAME(zr));
502 if (zr->overlay_settings.height > BUZ_MAX_HEIGHT / 2) 502 if (zr->overlay_settings.height > BUZ_MAX_HEIGHT / 2)
503 reg += zr->buffer.bytesperline; 503 reg += zr->vbuf_bytesperline;
504 btwrite(reg, ZR36057_VDBR); 504 btwrite(reg, ZR36057_VDBR);
505 505
506 /* video stride, status, and frame grab register */ 506 /* video stride, status, and frame grab register */
507 reg = zr->buffer.bytesperline - 507 reg = zr->vbuf_bytesperline -
508 zr->overlay_settings.width * 508 zr->overlay_settings.width *
509 ((zr->overlay_settings.format->depth + 7) / 8); 509 ((zr->overlay_settings.format->depth + 7) / 8);
510 if (zr->overlay_settings.height > BUZ_MAX_HEIGHT / 2) 510 if (zr->overlay_settings.height > BUZ_MAX_HEIGHT / 2)
511 reg += zr->buffer.bytesperline; 511 reg += zr->vbuf_bytesperline;
512 if (reg & 3) 512 if (reg & 3)
513 dprintk(1, 513 dprintk(1,
514 KERN_ERR 514 KERN_ERR
@@ -537,7 +537,7 @@ zr36057_overlay (struct zoran *zr,
537 537
538void 538void
539write_overlay_mask (struct file *file, 539write_overlay_mask (struct file *file,
540 struct video_clip *vp, 540 struct v4l2_clip *vp,
541 int count) 541 int count)
542{ 542{
543 struct zoran_fh *fh = file->private_data; 543 struct zoran_fh *fh = file->private_data;
@@ -554,10 +554,10 @@ write_overlay_mask (struct file *file,
554 554
555 for (i = 0; i < count; ++i) { 555 for (i = 0; i < count; ++i) {
556 /* pick up local copy of clip */ 556 /* pick up local copy of clip */
557 x = vp[i].x; 557 x = vp[i].c.left;
558 y = vp[i].y; 558 y = vp[i].c.top;
559 width = vp[i].width; 559 width = vp[i].c.width;
560 height = vp[i].height; 560 height = vp[i].c.height;
561 561
562 /* trim clips that extend beyond the window */ 562 /* trim clips that extend beyond the window */
563 if (x < 0) { 563 if (x < 0) {
diff --git a/drivers/media/video/zoran/zoran_device.h b/drivers/media/video/zoran/zoran_device.h
index 14d4e7aa6ce..3520bd54c8b 100644
--- a/drivers/media/video/zoran/zoran_device.h
+++ b/drivers/media/video/zoran/zoran_device.h
@@ -55,7 +55,7 @@ extern int jpeg_codec_reset(struct zoran *zr);
55extern void zr36057_overlay(struct zoran *zr, 55extern void zr36057_overlay(struct zoran *zr,
56 int on); 56 int on);
57extern void write_overlay_mask(struct file *file, 57extern void write_overlay_mask(struct file *file,
58 struct video_clip *vp, 58 struct v4l2_clip *vp,
59 int count); 59 int count);
60extern void zr36057_set_memgrab(struct zoran *zr, 60extern void zr36057_set_memgrab(struct zoran *zr,
61 int mode); 61 int mode);
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index b027a68e8c6..c6da45b4164 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -59,7 +59,7 @@
59 59
60#include <linux/spinlock.h> 60#include <linux/spinlock.h>
61 61
62#include <linux/videodev.h> 62#include <linux/videodev2.h>
63#include <media/v4l2-common.h> 63#include <media/v4l2-common.h>
64#include <media/v4l2-ioctl.h> 64#include <media/v4l2-ioctl.h>
65#include "videocodec.h" 65#include "videocodec.h"
@@ -69,8 +69,6 @@
69#include <asm/uaccess.h> 69#include <asm/uaccess.h>
70#include <linux/proc_fs.h> 70#include <linux/proc_fs.h>
71 71
72#include <linux/video_decoder.h>
73#include <linux/video_encoder.h>
74#include <linux/mutex.h> 72#include <linux/mutex.h>
75#include "zoran.h" 73#include "zoran.h"
76#include "zoran_device.h" 74#include "zoran_device.h"
@@ -1170,12 +1168,12 @@ setup_fbuffer (struct file *file,
1170 return -EINVAL; 1168 return -EINVAL;
1171 } 1169 }
1172 1170
1173 zr->buffer.base = (void *) ((unsigned long) base & ~3); 1171 zr->vbuf_base = (void *) ((unsigned long) base & ~3);
1174 zr->buffer.height = height; 1172 zr->vbuf_height = height;
1175 zr->buffer.width = width; 1173 zr->vbuf_width = width;
1176 zr->buffer.depth = fmt->depth; 1174 zr->vbuf_depth = fmt->depth;
1177 zr->overlay_settings.format = fmt; 1175 zr->overlay_settings.format = fmt;
1178 zr->buffer.bytesperline = bytesperline; 1176 zr->vbuf_bytesperline = bytesperline;
1179 1177
1180 /* The user should set new window parameters */ 1178 /* The user should set new window parameters */
1181 zr->overlay_settings.is_set = 0; 1179 zr->overlay_settings.is_set = 0;
@@ -1190,17 +1188,17 @@ setup_window (struct file *file,
1190 int y, 1188 int y,
1191 int width, 1189 int width,
1192 int height, 1190 int height,
1193 struct video_clip __user *clips, 1191 struct v4l2_clip __user *clips,
1194 int clipcount, 1192 int clipcount,
1195 void __user *bitmap) 1193 void __user *bitmap)
1196{ 1194{
1197 struct zoran_fh *fh = file->private_data; 1195 struct zoran_fh *fh = file->private_data;
1198 struct zoran *zr = fh->zr; 1196 struct zoran *zr = fh->zr;
1199 struct video_clip *vcp = NULL; 1197 struct v4l2_clip *vcp = NULL;
1200 int on, end; 1198 int on, end;
1201 1199
1202 1200
1203 if (!zr->buffer.base) { 1201 if (!zr->vbuf_base) {
1204 dprintk(1, 1202 dprintk(1,
1205 KERN_ERR 1203 KERN_ERR
1206 "%s: setup_window() - frame buffer has to be set first\n", 1204 "%s: setup_window() - frame buffer has to be set first\n",
@@ -1220,13 +1218,13 @@ setup_window (struct file *file,
1220 * The video front end needs 4-byte alinged line sizes, we correct that 1218 * The video front end needs 4-byte alinged line sizes, we correct that
1221 * silently here if necessary 1219 * silently here if necessary
1222 */ 1220 */
1223 if (zr->buffer.depth == 15 || zr->buffer.depth == 16) { 1221 if (zr->vbuf_depth == 15 || zr->vbuf_depth == 16) {
1224 end = (x + width) & ~1; /* round down */ 1222 end = (x + width) & ~1; /* round down */
1225 x = (x + 1) & ~1; /* round up */ 1223 x = (x + 1) & ~1; /* round up */
1226 width = end - x; 1224 width = end - x;
1227 } 1225 }
1228 1226
1229 if (zr->buffer.depth == 24) { 1227 if (zr->vbuf_depth == 24) {
1230 end = (x + width) & ~3; /* round down */ 1228 end = (x + width) & ~3; /* round down */
1231 x = (x + 3) & ~3; /* round up */ 1229 x = (x + 3) & ~3; /* round up */
1232 width = end - x; 1230 width = end - x;
@@ -1281,7 +1279,7 @@ setup_window (struct file *file,
1281 } 1279 }
1282 } else if (clipcount > 0) { 1280 } else if (clipcount > 0) {
1283 /* write our own bitmap from the clips */ 1281 /* write our own bitmap from the clips */
1284 vcp = vmalloc(sizeof(struct video_clip) * (clipcount + 4)); 1282 vcp = vmalloc(sizeof(struct v4l2_clip) * (clipcount + 4));
1285 if (vcp == NULL) { 1283 if (vcp == NULL) {
1286 dprintk(1, 1284 dprintk(1,
1287 KERN_ERR 1285 KERN_ERR
@@ -1290,7 +1288,7 @@ setup_window (struct file *file,
1290 return -ENOMEM; 1288 return -ENOMEM;
1291 } 1289 }
1292 if (copy_from_user 1290 if (copy_from_user
1293 (vcp, clips, sizeof(struct video_clip) * clipcount)) { 1291 (vcp, clips, sizeof(struct v4l2_clip) * clipcount)) {
1294 vfree(vcp); 1292 vfree(vcp);
1295 return -EFAULT; 1293 return -EFAULT;
1296 } 1294 }
@@ -1349,7 +1347,7 @@ setup_overlay (struct file *file,
1349 zr36057_overlay(zr, 0); 1347 zr36057_overlay(zr, 0);
1350 zr->overlay_mask = NULL; 1348 zr->overlay_mask = NULL;
1351 } else { 1349 } else {
1352 if (!zr->buffer.base || !fh->overlay_settings.is_set) { 1350 if (!zr->vbuf_base || !fh->overlay_settings.is_set) {
1353 dprintk(1, 1351 dprintk(1,
1354 KERN_ERR 1352 KERN_ERR
1355 "%s: setup_overlay() - buffer or window not set\n", 1353 "%s: setup_overlay() - buffer or window not set\n",
@@ -2200,7 +2198,7 @@ static int zoran_s_fmt_vid_overlay(struct file *file, void *__fh,
2200 fmt->fmt.win.w.top, 2198 fmt->fmt.win.w.top,
2201 fmt->fmt.win.w.width, 2199 fmt->fmt.win.w.width,
2202 fmt->fmt.win.w.height, 2200 fmt->fmt.win.w.height,
2203 (struct video_clip __user *) 2201 (struct v4l2_clip __user *)
2204 fmt->fmt.win.clips, 2202 fmt->fmt.win.clips,
2205 fmt->fmt.win.clipcount, 2203 fmt->fmt.win.clipcount,
2206 fmt->fmt.win.bitmap); 2204 fmt->fmt.win.bitmap);
@@ -2357,12 +2355,12 @@ static int zoran_g_fbuf(struct file *file, void *__fh,
2357 2355
2358 memset(fb, 0, sizeof(*fb)); 2356 memset(fb, 0, sizeof(*fb));
2359 mutex_lock(&zr->resource_lock); 2357 mutex_lock(&zr->resource_lock);
2360 fb->base = zr->buffer.base; 2358 fb->base = zr->vbuf_base;
2361 fb->fmt.width = zr->buffer.width; 2359 fb->fmt.width = zr->vbuf_width;
2362 fb->fmt.height = zr->buffer.height; 2360 fb->fmt.height = zr->vbuf_height;
2363 if (zr->overlay_settings.format) 2361 if (zr->overlay_settings.format)
2364 fb->fmt.pixelformat = fh->overlay_settings.format->fourcc; 2362 fb->fmt.pixelformat = fh->overlay_settings.format->fourcc;
2365 fb->fmt.bytesperline = zr->buffer.bytesperline; 2363 fb->fmt.bytesperline = zr->vbuf_bytesperline;
2366 mutex_unlock(&zr->resource_lock); 2364 mutex_unlock(&zr->resource_lock);
2367 fb->fmt.colorspace = V4L2_COLORSPACE_SRGB; 2365 fb->fmt.colorspace = V4L2_COLORSPACE_SRGB;
2368 fb->fmt.field = V4L2_FIELD_INTERLACED; 2366 fb->fmt.field = V4L2_FIELD_INTERLACED;
diff --git a/drivers/media/video/zoran/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c
index 870bc5a70e3..f1423b777db 100644
--- a/drivers/media/video/zoran/zoran_procfs.c
+++ b/drivers/media/video/zoran/zoran_procfs.c
@@ -36,7 +36,7 @@
36#include <linux/pci.h> 36#include <linux/pci.h>
37#include <linux/i2c.h> 37#include <linux/i2c.h>
38#include <linux/i2c-algo-bit.h> 38#include <linux/i2c-algo-bit.h>
39#include <linux/videodev.h> 39#include <linux/videodev2.h>
40#include <linux/spinlock.h> 40#include <linux/spinlock.h>
41#include <linux/sem.h> 41#include <linux/sem.h>
42#include <linux/seq_file.h> 42#include <linux/seq_file.h>
diff --git a/drivers/media/video/zoran/zr36016.c b/drivers/media/video/zoran/zr36016.c
index 00d132bcd1e..21c088ea904 100644
--- a/drivers/media/video/zoran/zr36016.c
+++ b/drivers/media/video/zoran/zr36016.c
@@ -34,15 +34,10 @@
34#include <linux/types.h> 34#include <linux/types.h>
35#include <linux/wait.h> 35#include <linux/wait.h>
36 36
37/* includes for structures and defines regarding video
38 #include<linux/videodev.h> */
39
40/* I/O commands, error codes */ 37/* I/O commands, error codes */
41#include <asm/io.h> 38#include <asm/io.h>
42//#include<errno.h>
43 39
44/* v4l API */ 40/* v4l API */
45#include <linux/videodev.h>
46 41
47/* headerfile of this module */ 42/* headerfile of this module */
48#include"zr36016.h" 43#include"zr36016.h"
diff --git a/drivers/media/video/zoran/zr36050.c b/drivers/media/video/zoran/zr36050.c
index cf8b271a1c8..639dd87c663 100644
--- a/drivers/media/video/zoran/zr36050.c
+++ b/drivers/media/video/zoran/zr36050.c
@@ -34,12 +34,8 @@
34#include <linux/types.h> 34#include <linux/types.h>
35#include <linux/wait.h> 35#include <linux/wait.h>
36 36
37/* includes for structures and defines regarding video
38 #include<linux/videodev.h> */
39
40/* I/O commands, error codes */ 37/* I/O commands, error codes */
41#include <asm/io.h> 38#include <asm/io.h>
42//#include<errno.h>
43 39
44/* headerfile of this module */ 40/* headerfile of this module */
45#include "zr36050.h" 41#include "zr36050.h"
diff --git a/drivers/media/video/zoran/zr36060.c b/drivers/media/video/zoran/zr36060.c
index 8e74054d5ef..008746ff774 100644
--- a/drivers/media/video/zoran/zr36060.c
+++ b/drivers/media/video/zoran/zr36060.c
@@ -34,12 +34,8 @@
34#include <linux/types.h> 34#include <linux/types.h>
35#include <linux/wait.h> 35#include <linux/wait.h>
36 36
37/* includes for structures and defines regarding video
38 #include<linux/videodev.h> */
39
40/* I/O commands, error codes */ 37/* I/O commands, error codes */
41#include <asm/io.h> 38#include <asm/io.h>
42//#include<errno.h>
43 39
44/* headerfile of this module */ 40/* headerfile of this module */
45#include "zr36060.h" 41#include "zr36060.h"