V4L/DVB (8482): videodev: move all ioctl callbacks to a new v4l2_ioctl_ops struct
[safe/jmp/linux-2.6] / drivers / media / video / em28xx / em28xx-video.c
index e4e82ae..fcfc741 100644 (file)
@@ -1,9 +1,10 @@
 /*
-   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB video capture devices
+   em28xx-video.c - driver for Empia EM2800/EM2820/2840 USB
+                   video capture devices
 
    Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
                      Markus Rechberger <mrechberger@gmail.com>
-                     Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+                     Mauro Carvalho Chehab <mchehab@infradead.org>
                      Sascha Sommer <saschasommer@freenet.de>
 
        Some parts based on SN9C10x PC Camera Controllers GPL driver made
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/version.h>
-#include <linux/video_decoder.h>
+#include <linux/mm.h>
 #include <linux/mutex.h>
 
 #include "em28xx.h"
-#include <media/tuner.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
+#include <media/msp3400.h>
+#include <media/tuner.h>
 
 #define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
                      "Markus Rechberger <mrechberger@gmail.com>, " \
-                     "Mauro Carvalho Chehab <mchehab@brturbo.com.br>, " \
+                     "Mauro Carvalho Chehab <mchehab@infradead.org>, " \
                      "Sascha Sommer <saschasommer@freenet.de>"
 
 #define DRIVER_NAME         "em28xx"
 #define DRIVER_DESC         "Empia em28xx based USB video device driver"
-#define EM28XX_VERSION_CODE  KERNEL_VERSION(0, 0, 1)
+#define EM28XX_VERSION_CODE  KERNEL_VERSION(0, 1, 0)
 
 #define em28xx_videodbg(fmt, arg...) do {\
        if (video_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __func__ , ##arg); } while (0)
+
+static unsigned int isoc_debug;
+module_param(isoc_debug, int, 0644);
+MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]");
+
+#define em28xx_isocdbg(fmt, arg...) \
+do {\
+       if (isoc_debug) { \
+               printk(KERN_INFO "%s %s :"fmt, \
+                        dev->name, __func__ , ##arg); \
+       } \
+  } while (0)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -61,65 +76,25 @@ static LIST_HEAD(em28xx_devlist);
 
 static unsigned int card[]     = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
 static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
-static unsigned int vbi_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int vbi_nr[]   = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+static unsigned int radio_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET };
+
 module_param_array(card,  int, NULL, 0444);
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr, int, NULL, 0444);
-MODULE_PARM_DESC(card,"card type");
-MODULE_PARM_DESC(video_nr,"video device numbers");
-MODULE_PARM_DESC(vbi_nr,"vbi device numbers");
+module_param_array(radio_nr, int, NULL, 0444);
+MODULE_PARM_DESC(card,     "card type");
+MODULE_PARM_DESC(video_nr, "video device numbers");
+MODULE_PARM_DESC(vbi_nr,   "vbi device numbers");
+MODULE_PARM_DESC(radio_nr, "radio device numbers");
 
-static int tuner = -1;
-module_param(tuner, int, 0444);
-MODULE_PARM_DESC(tuner, "tuner type");
-
-static unsigned int video_debug = 0;
-module_param(video_debug,int,0644);
-MODULE_PARM_DESC(video_debug,"enable debug messages [video]");
+static unsigned int video_debug;
+module_param(video_debug, int, 0644);
+MODULE_PARM_DESC(video_debug, "enable debug messages [video]");
 
 /* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS */
 static unsigned long em28xx_devused;
 
-/* supported tv norms */
-static struct em28xx_tvnorm tvnorms[] = {
-       {
-               .name = "PAL",
-               .id = V4L2_STD_PAL,
-               .mode = VIDEO_MODE_PAL,
-        }, {
-               .name = "NTSC",
-               .id = V4L2_STD_NTSC,
-               .mode = VIDEO_MODE_NTSC,
-       }, {
-                .name = "SECAM",
-                .id = V4L2_STD_SECAM,
-                .mode = VIDEO_MODE_SECAM,
-       }, {
-               .name = "PAL-M",
-               .id = V4L2_STD_PAL_M,
-               .mode = VIDEO_MODE_PAL,
-       }
-};
-
-static const unsigned char saa7114_i2c_init[] = {
-       0x00,0x00,0x01,0x08,0x02,0xc4,0x03,0x30,0x04,0x90,0x05,0x90,0x06,0xeb,0x07,0xe0,
-       0x08,0x88,0x09,0x40,0x0a,0x80,0x0b,0x44,0x0c,0x40,0x0d,0x00,0x0e,0x81,0x0f,0x2a,
-       0x10,0x06,0x11,0x00,0x12,0xc8,0x13,0x80,0x14,0x00,0x15,0x11,0x16,0x01,0x17,0x42,
-       0x18,0x40,0x19,0x80,0x40,0x00,0x41,0xff,0x42,0xff,0x43,0xff,0x44,0xff,0x45,0xff,
-       0x46,0xff,0x47,0xff,0x48,0xff,0x49,0xff,0x4a,0xff,0x4b,0xff,0x4c,0xff,0x4d,0xff,
-       0x4e,0xff,0x4f,0xff,0x50,0xff,0x51,0xff,0x52,0xff,0x53,0xff,0x54,0x5f,0x55,0xff,
-       0x56,0xff,0x57,0xff,0x58,0x00,0x59,0x47,0x5a,0x03,0x5b,0x03,0x5d,0x3e,0x5e,0x00,
-       0x80,0x1c,0x83,0x01,0x84,0xa5,0x85,0x10,0x86,0x45,0x87,0x41,0x88,0xf0,0x88,0x00,
-       0x88,0xf0,0x90,0x00,0x91,0x08,0x92,0x00,0x93,0x80,0x94,0x08,0x95,0x00,0x96,0xc0,
-       0x97,0x02,0x98,0x13,0x99,0x00,0x9a,0x38,0x9b,0x01,0x9c,0x80,0x9d,0x02,0x9e,0x06,
-       0x9f,0x01,0xa0,0x01,0xa1,0x00,0xa2,0x00,0xa4,0x80,0xa5,0x36,0xa6,0x36,0xa8,0x67,
-       0xa9,0x04,0xaa,0x00,0xac,0x33,0xad,0x02,0xae,0x00,0xb0,0xcd,0xb1,0x04,0xb2,0xcd,
-       0xb3,0x04,0xb4,0x01,0xb8,0x00,0xb9,0x00,0xba,0x00,0xbb,0x00,0xbc,0x00,0xbd,0x00,
-       0xbe,0x00,0xbf,0x00
-};
-
-#define TVNORMS ARRAY_SIZE(tvnorms)
-
 /* supported controls */
 /* Common to all boards */
 static struct v4l2_queryctrl em28xx_qctrl[] = {
@@ -132,7 +107,7 @@ static struct v4l2_queryctrl em28xx_qctrl[] = {
                .step = 0x1,
                .default_value = 0x1f,
                .flags = 0,
-       },{
+       }, {
                .id = V4L2_CID_AUDIO_MUTE,
                .type = V4L2_CTRL_TYPE_BOOLEAN,
                .name = "Mute",
@@ -144,594 +119,502 @@ static struct v4l2_queryctrl em28xx_qctrl[] = {
        }
 };
 
-/* FIXME: These are specific to saa711x - should be moved to its code */
-static struct v4l2_queryctrl saa711x_qctrl[] = {
-       {
-               .id = V4L2_CID_BRIGHTNESS,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Brightness",
-               .minimum = -128,
-               .maximum = 127,
-               .step = 1,
-               .default_value = 0,
-               .flags = 0,
-       },{
-               .id = V4L2_CID_CONTRAST,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Contrast",
-               .minimum = 0x0,
-               .maximum = 0x1f,
-               .step = 0x1,
-               .default_value = 0x10,
-               .flags = 0,
-       },{
-               .id = V4L2_CID_SATURATION,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Saturation",
-               .minimum = 0x0,
-               .maximum = 0x1f,
-               .step = 0x1,
-               .default_value = 0x10,
-               .flags = 0,
-       },{
-               .id = V4L2_CID_RED_BALANCE,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Red chroma balance",
-               .minimum = -128,
-               .maximum = 127,
-               .step = 1,
-               .default_value = 0,
-               .flags = 0,
-       },{
-               .id = V4L2_CID_BLUE_BALANCE,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Blue chroma balance",
-               .minimum = -128,
-               .maximum = 127,
-               .step = 1,
-               .default_value = 0,
-               .flags = 0,
-       },{
-               .id = V4L2_CID_GAMMA,
-               .type = V4L2_CTRL_TYPE_INTEGER,
-               .name = "Gamma",
-               .minimum = 0x0,
-               .maximum = 0x3f,
-               .step = 0x1,
-               .default_value = 0x20,
-               .flags = 0,
-       }
-};
-
 static struct usb_driver em28xx_usb_driver;
 
-static DEFINE_MUTEX(em28xx_sysfs_lock);
-static DECLARE_RWSEM(em28xx_disconnect);
-
-/*********************  v4l2 interface  ******************************************/
+/* ------------------------------------------------------------------
+       DMA and thread functions
+   ------------------------------------------------------------------*/
 
 /*
- * em28xx_config()
- * inits registers with sane defaults
+ * Announces that a buffer were filled and request the next
  */
-static int em28xx_config(struct em28xx *dev)
+static inline void buffer_filled(struct em28xx *dev,
+                                 struct em28xx_dmaqueue *dma_q,
+                                 struct em28xx_buffer *buf)
 {
+       /* Advice that buffer was filled */
+       em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->vb.i);
+       buf->vb.state = VIDEOBUF_DONE;
+       buf->vb.field_count++;
+       do_gettimeofday(&buf->vb.ts);
 
-       /* Sets I2C speed to 100 KHz */
-       em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
-
-       /* enable vbi capturing */
-
-       em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1);
-       em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1);
-       em28xx_write_regs_req(dev,0x00,0x11,"\x51",1);
-
-       em28xx_audio_usb_mute(dev, 1);
-       dev->mute = 1;          /* maybe not the right place... */
-       dev->volume = 0x1f;
-       em28xx_audio_analog_set(dev);
-       em28xx_audio_analog_setup(dev);
-       em28xx_outfmt_set_yuv422(dev);
-       em28xx_colorlevels_set_default(dev);
-       em28xx_compression_disable(dev);
+       dev->isoc_ctl.buf = NULL;
 
-       return 0;
+       list_del(&buf->vb.queue);
+       wake_up(&buf->vb.done);
 }
 
 /*
- * em28xx_config_i2c()
- * configure i2c attached devices
+ * Identify the buffer header type and properly handles
  */
-static void em28xx_config_i2c(struct em28xx *dev)
+static void em28xx_copy_video(struct em28xx *dev,
+                             struct em28xx_dmaqueue  *dma_q,
+                             struct em28xx_buffer *buf,
+                             unsigned char *p,
+                             unsigned char *outp, unsigned long len)
 {
-       struct v4l2_frequency f;
-       struct video_decoder_init em28xx_vdi = {.data = NULL };
+       void *fieldstart, *startwrite, *startread;
+       int  linesdone, currlinedone, offset, lencopy, remain;
+       int bytesperline = dev->width << 1;
 
+       if (dma_q->pos + len > buf->vb.size)
+               len = buf->vb.size - dma_q->pos;
 
-       /* configure decoder */
-       if(dev->model == EM2820_BOARD_MSI_VOX_USB_2){
-               em28xx_vdi.data=saa7114_i2c_init;
-               em28xx_vdi.len=sizeof(saa7114_i2c_init);
-       }
-
+       if (p[0] != 0x88 && p[0] != 0x22) {
+               em28xx_isocdbg("frame is not complete\n");
+               len += 4;
+       } else
+               p += 4;
 
-       em28xx_i2c_call_clients(dev, DECODER_INIT, &em28xx_vdi);
-       em28xx_i2c_call_clients(dev, DECODER_SET_INPUT, &dev->ctl_input);
-/*     em28xx_i2c_call_clients(dev,DECODER_SET_PICTURE, &dev->vpic); */
-/*     em28xx_i2c_call_clients(dev,DECODER_SET_NORM,&dev->tvnorm->id); */
-/*     em28xx_i2c_call_clients(dev,DECODER_ENABLE_OUTPUT,&output); */
-/*     em28xx_i2c_call_clients(dev,DECODER_DUMP, NULL); */
+       startread = p;
+       remain = len;
 
-       /* configure tuner */
-       f.tuner = 0;
-       f.type = V4L2_TUNER_ANALOG_TV;
-       f.frequency = 9076;     /* FIXME:remove magic number */
-       dev->ctl_freq = f.frequency;
-       em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
+       /* Interlaces frame */
+       if (buf->top_field)
+               fieldstart = outp;
+       else
+               fieldstart = outp + bytesperline;
+
+       linesdone = dma_q->pos / bytesperline;
+       currlinedone = dma_q->pos % bytesperline;
+       offset = linesdone * bytesperline * 2 + currlinedone;
+       startwrite = fieldstart + offset;
+       lencopy = bytesperline - currlinedone;
+       lencopy = lencopy > remain ? remain : lencopy;
+
+       if ((char *)startwrite + lencopy > (char *)outp + buf->vb.size) {
+               em28xx_isocdbg("Overflow of %zi bytes past buffer end (1)\n",
+                              ((char *)startwrite + lencopy) -
+                              ((char *)outp + buf->vb.size));
+               lencopy = remain = (char *)outp + buf->vb.size - (char *)startwrite;
+       }
+       if (lencopy <= 0)
+               return;
+       memcpy(startwrite, startread, lencopy);
+
+       remain -= lencopy;
+
+       while (remain > 0) {
+               startwrite += lencopy + bytesperline;
+               startread += lencopy;
+               if (bytesperline > remain)
+                       lencopy = remain;
+               else
+                       lencopy = bytesperline;
+
+               if ((char *)startwrite + lencopy > (char *)outp + buf->vb.size) {
+                       em28xx_isocdbg("Overflow of %zi bytes past buffer end (2)\n",
+                                      ((char *)startwrite + lencopy) -
+                                      ((char *)outp + buf->vb.size));
+                       lencopy = remain = (char *)outp + buf->vb.size -
+                                          (char *)startwrite;
+               }
+               if (lencopy <= 0)
+                       break;
 
-       /* configure tda9887 */
+               memcpy(startwrite, startread, lencopy);
 
+               remain -= lencopy;
+       }
 
-/*     em28xx_i2c_call_clients(dev,VIDIOC_S_STD,&dev->tvnorm->id); */
+       dma_q->pos += len;
 }
 
-/*
- * em28xx_empty_framequeues()
- * prepare queues for incoming and outgoing frames
- */
-static void em28xx_empty_framequeues(struct em28xx *dev)
+static inline void print_err_status(struct em28xx *dev,
+                                    int packet, int status)
 {
-       u32 i;
-
-       INIT_LIST_HEAD(&dev->inqueue);
-       INIT_LIST_HEAD(&dev->outqueue);
-
-       for (i = 0; i < EM28XX_NUM_FRAMES; i++) {
-               dev->frame[i].state = F_UNUSED;
-               dev->frame[i].buf.bytesused = 0;
+       char *errmsg = "Unknown";
+
+       switch (status) {
+       case -ENOENT:
+               errmsg = "unlinked synchronuously";
+               break;
+       case -ECONNRESET:
+               errmsg = "unlinked asynchronuously";
+               break;
+       case -ENOSR:
+               errmsg = "Buffer error (overrun)";
+               break;
+       case -EPIPE:
+               errmsg = "Stalled (device not responding)";
+               break;
+       case -EOVERFLOW:
+               errmsg = "Babble (bad cable?)";
+               break;
+       case -EPROTO:
+               errmsg = "Bit-stuff error (bad cable?)";
+               break;
+       case -EILSEQ:
+               errmsg = "CRC/Timeout (could be anything)";
+               break;
+       case -ETIME:
+               errmsg = "Device does not respond";
+               break;
+       }
+       if (packet < 0) {
+               em28xx_isocdbg("URB status %d [%s].\n", status, errmsg);
+       } else {
+               em28xx_isocdbg("URB packet %d, status %d [%s].\n",
+                              packet, status, errmsg);
        }
 }
 
-static void video_mux(struct em28xx *dev, int index)
+/*
+ * video-buf generic routine to get the next available buffer
+ */
+static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
+                                         struct em28xx_buffer **buf)
 {
-       int input, ainput;
+       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
+       char *outp;
 
-       input = INPUT(index)->vmux;
-       dev->ctl_input = index;
-       dev->ctl_ainput = INPUT(index)->amux;
+       if (list_empty(&dma_q->active)) {
+               em28xx_isocdbg("No active queue to serve\n");
+               dev->isoc_ctl.buf = NULL;
+               *buf = NULL;
+               return;
+       }
 
-       em28xx_i2c_call_clients(dev, DECODER_SET_INPUT, &input);
+       /* Get the next buffer */
+       *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
 
+       /* Cleans up buffer - Usefull for testing for frame/URB loss */
+       outp = videobuf_to_vmalloc(&(*buf)->vb);
+       memset(outp, 0, (*buf)->vb.size);
 
-       em28xx_videodbg("Setting input index=%d, vmux=%d, amux=%d\n",index,input,dev->ctl_ainput);
+       dev->isoc_ctl.buf = *buf;
 
-       if (dev->has_msp34xx) {
-               if (dev->i2s_speed)
-                       em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
-               em28xx_i2c_call_clients(dev, VIDIOC_S_AUDIO, &dev->ctl_ainput);
-               ainput = EM28XX_AUDIO_SRC_TUNER;
-               em28xx_audio_source(dev, ainput);
-       } else {
-               switch (dev->ctl_ainput) {
-               case 0:
-                       ainput = EM28XX_AUDIO_SRC_TUNER;
-                       break;
-               default:
-                       ainput = EM28XX_AUDIO_SRC_LINE;
-               }
-               em28xx_audio_source(dev, ainput);
-       }
+       return;
 }
 
 /*
- * em28xx_v4l2_open()
- * inits the device and starts isoc transfer
+ * Controls the isoc copy of each urb packet
  */
-static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
+static inline int em28xx_isoc_copy(struct em28xx *dev, struct urb *urb)
 {
-       int minor = iminor(inode);
-       int errCode = 0;
-       struct em28xx *h,*dev = NULL;
-       struct list_head *list;
-
-       list_for_each(list,&em28xx_devlist) {
-               h = list_entry(list, struct em28xx, devlist);
-               if (h->vdev->minor == minor) {
-                       dev  = h;
-                       dev->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               }
-               if (h->vbi_dev->minor == minor) {
-                       dev  = h;
-                       dev->type = V4L2_BUF_TYPE_VBI_CAPTURE;
-               }
-       }
-       if (NULL == dev)
-               return -ENODEV;
-
-       filp->private_data=dev;
+       struct em28xx_buffer    *buf;
+       struct em28xx_dmaqueue  *dma_q = urb->context;
+       unsigned char *outp = NULL;
+       int i, len = 0, rc = 1;
+       unsigned char *p;
 
-       em28xx_videodbg("open minor=%d type=%s users=%d\n",
-                               minor,v4l2_type_names[dev->type],dev->users);
+       if (!dev)
+               return 0;
 
-       if (!down_read_trylock(&em28xx_disconnect))
-               return -ERESTARTSYS;
+       if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
+               return 0;
 
-       if (dev->users) {
-               em28xx_warn("this driver can be opened only once\n");
-               up_read(&em28xx_disconnect);
-               return -EBUSY;
+       if (urb->status < 0) {
+               print_err_status(dev, -1, urb->status);
+               if (urb->status == -ENOENT)
+                       return 0;
        }
 
-       init_MUTEX(&dev->fileop_lock);  /* to 1 == available */
-       spin_lock_init(&dev->queue_lock);
-       init_waitqueue_head(&dev->wait_frame);
-       init_waitqueue_head(&dev->wait_stream);
-
-       down(&dev->lock);
+       buf = dev->isoc_ctl.buf;
+       if (buf != NULL)
+               outp = videobuf_to_vmalloc(&buf->vb);
 
-       if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               em28xx_set_alternate(dev);
-
-               dev->width = norm_maxw(dev);
-               dev->height = norm_maxh(dev);
-               dev->frame_size = dev->width * dev->height * 2;
-               dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
-               dev->bytesperline = dev->width * 2;
-               dev->hscale = 0;
-               dev->vscale = 0;
+       for (i = 0; i < urb->number_of_packets; i++) {
+               int status = urb->iso_frame_desc[i].status;
 
-               em28xx_capture_start(dev, 1);
-               em28xx_resolution_set(dev);
+               if (status < 0) {
+                       print_err_status(dev, i, status);
+                       if (urb->iso_frame_desc[i].status != -EPROTO)
+                               continue;
+               }
 
-               /* start the transfer */
-               errCode = em28xx_init_isoc(dev);
-               if (errCode)
-                       goto err;
+               len = urb->iso_frame_desc[i].actual_length - 4;
 
-               video_mux(dev, 0);
-       }
+               if (urb->iso_frame_desc[i].actual_length <= 0) {
+                       /* em28xx_isocdbg("packet %d is empty",i); - spammy */
+                       continue;
+               }
+               if (urb->iso_frame_desc[i].actual_length >
+                                               dev->max_pkt_size) {
+                       em28xx_isocdbg("packet bigger than packet size");
+                       continue;
+               }
 
-       dev->users++;
-       filp->private_data = dev;
-       dev->io = IO_NONE;
-       dev->stream = STREAM_OFF;
-       dev->num_frames = 0;
+               p = urb->transfer_buffer + urb->iso_frame_desc[i].offset;
 
-       /* prepare queues */
-       em28xx_empty_framequeues(dev);
+               /* FIXME: incomplete buffer checks where removed to make
+                  logic simpler. Impacts of those changes should be evaluated
+                */
+               if (p[0] == 0x33 && p[1] == 0x95 && p[2] == 0x00) {
+                       em28xx_isocdbg("VBI HEADER!!!\n");
+                       /* FIXME: Should add vbi copy */
+                       continue;
+               }
+               if (p[0] == 0x22 && p[1] == 0x5a) {
+                       em28xx_isocdbg("Video frame %d, length=%i, %s\n", p[2],
+                                      len, (p[2] & 1)? "odd" : "even");
+
+                       if (!(p[2] & 1)) {
+                               if (buf != NULL)
+                                       buffer_filled(dev, dma_q, buf);
+                               get_next_buf(dma_q, &buf);
+                               if (buf == NULL)
+                                       outp = NULL;
+                               else
+                                       outp = videobuf_to_vmalloc(&buf->vb);
+                       }
 
-       dev->state |= DEV_INITIALIZED;
+                       if (buf != NULL) {
+                               if (p[2] & 1)
+                                       buf->top_field = 0;
+                               else
+                                       buf->top_field = 1;
+                       }
 
-      err:
-       up(&dev->lock);
-       up_read(&em28xx_disconnect);
-       return errCode;
+                       dma_q->pos = 0;
+               }
+               if (buf != NULL)
+                       em28xx_copy_video(dev, dma_q, buf, p, outp, len);
+       }
+       return rc;
 }
 
-/*
- * em28xx_realease_resources()
- * unregisters the v4l2,i2c and usb devices
- * called when the device gets disconected or at module unload
-*/
-static void em28xx_release_resources(struct em28xx *dev)
+/* ------------------------------------------------------------------
+       Videobuf operations
+   ------------------------------------------------------------------*/
+
+static int
+buffer_setup(struct videobuf_queue *vq, unsigned int *count, unsigned int *size)
 {
-       mutex_lock(&em28xx_sysfs_lock);
+       struct em28xx_fh *fh = vq->priv_data;
+       struct em28xx        *dev = fh->dev;
+       struct v4l2_frequency f;
 
-       /*FIXME: I2C IR should be disconnected */
+       *size = 16 * fh->dev->width * fh->dev->height >> 3;
+       if (0 == *count)
+               *count = EM28XX_DEF_BUF;
 
-       em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
-                               dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                               dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
-       list_del(&dev->devlist);
-       video_unregister_device(dev->vdev);
-       video_unregister_device(dev->vbi_dev);
-       em28xx_i2c_unregister(dev);
-       usb_put_dev(dev->udev);
-       mutex_unlock(&em28xx_sysfs_lock);
+       if (*count < EM28XX_MIN_BUF)
+               *count = EM28XX_MIN_BUF;
 
+       /* Ask tuner to go to analog mode */
+       memset(&f, 0, sizeof(f));
+       f.frequency = dev->ctl_freq;
 
-       /* Mark device as unused */
-       em28xx_devused&=~(1<<dev->devno);
+       em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, &f);
+
+       return 0;
 }
 
-/*
- * em28xx_v4l2_close()
- * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls
- */
-static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
+/* This is called *without* dev->slock held; please keep it that way */
+static void free_buffer(struct videobuf_queue *vq, struct em28xx_buffer *buf)
 {
-       int errCode;
-       struct em28xx *dev=filp->private_data;
+       struct em28xx_fh     *fh  = vq->priv_data;
+       struct em28xx        *dev = fh->dev;
+       unsigned long flags = 0;
+       if (in_interrupt())
+               BUG();
+
+       /* We used to wait for the buffer to finish here, but this didn't work
+          because, as we were keeping the state as VIDEOBUF_QUEUED,
+          videobuf_queue_cancel marked it as finished for us.
+          (Also, it could wedge forever if the hardware was misconfigured.)
+
+          This should be safe; by the time we get here, the buffer isn't
+          queued anymore. If we ever start marking the buffers as
+          VIDEOBUF_ACTIVE, it won't be, though.
+       */
+       spin_lock_irqsave(&dev->slock, flags);
+       if (dev->isoc_ctl.buf == buf)
+               dev->isoc_ctl.buf = NULL;
+       spin_unlock_irqrestore(&dev->slock, flags);
+
+       videobuf_vmalloc_free(&buf->vb);
+       buf->vb.state = VIDEOBUF_NEEDS_INIT;
+}
 
-       em28xx_videodbg("users=%d\n", dev->users);
+static int
+buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
+                                               enum v4l2_field field)
+{
+       struct em28xx_fh     *fh  = vq->priv_data;
+       struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
+       struct em28xx        *dev = fh->dev;
+       int                  rc = 0, urb_init = 0;
 
-       down(&dev->lock);
+       /* FIXME: It assumes depth = 16 */
+       /* The only currently supported format is 16 bits/pixel */
+       buf->vb.size = 16 * dev->width * dev->height >> 3;
 
-       em28xx_uninit_isoc(dev);
+       if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
+               return -EINVAL;
 
-       em28xx_release_buffers(dev);
+       buf->vb.width  = dev->width;
+       buf->vb.height = dev->height;
+       buf->vb.field  = field;
 
-       /* the device is already disconnect, free the remaining resources */
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_release_resources(dev);
-               up(&dev->lock);
-               kfree(dev);
-               return 0;
+       if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
+               rc = videobuf_iolock(vq, &buf->vb, NULL);
+               if (rc < 0)
+                       goto fail;
        }
 
-       /* set alternate 0 */
-       dev->alt = 0;
-       em28xx_videodbg("setting alternate 0\n");
-       errCode = usb_set_interface(dev->udev, 0, 0);
-       if (errCode < 0) {
-               em28xx_errdev ("cannot change alternate number to 0 (error=%i)\n",
-                    errCode);
+       if (!dev->isoc_ctl.num_bufs)
+               urb_init = 1;
+
+       if (urb_init) {
+               rc = em28xx_init_isoc(dev, EM28XX_NUM_PACKETS,
+                                     EM28XX_NUM_BUFS, dev->max_pkt_size,
+                                     em28xx_isoc_copy);
+               if (rc < 0)
+                       goto fail;
        }
 
-       dev->users--;
-       wake_up_interruptible_nr(&dev->open, 1);
-       up(&dev->lock);
+       buf->vb.state = VIDEOBUF_PREPARED;
        return 0;
+
+fail:
+       free_buffer(vq, buf);
+       return rc;
 }
 
-/*
- * em28xx_v4l2_read()
- * will allocate buffers when called for the first time
- */
-static ssize_t
-em28xx_v4l2_read(struct file *filp, char __user * buf, size_t count,
-                loff_t * f_pos)
+static void
+buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 {
-       struct em28xx_frame_t *f, *i;
-       unsigned long lock_flags;
-       int ret = 0;
-       struct em28xx *dev = filp->private_data;
-
-       if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               em28xx_videodbg("V4l2_Buf_type_videocapture is set\n");
-       }
-       if (dev->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-               em28xx_videodbg("V4L2_BUF_TYPE_VBI_CAPTURE is set\n");
-               em28xx_videodbg("not supported yet! ...\n");
-               if (copy_to_user(buf, "", 1)) {
-                       up(&dev->fileop_lock);
-                       return -EFAULT;
-               }
-               return (1);
-       }
-       if (dev->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) {
-               em28xx_videodbg("V4L2_BUF_TYPE_SLICED_VBI_CAPTURE is set\n");
-               em28xx_videodbg("not supported yet! ...\n");
-               if (copy_to_user(buf, "", 1)) {
-                       up(&dev->fileop_lock);
-                       return -EFAULT;
-               }
-               return (1);
-       }
+       struct em28xx_buffer    *buf     = container_of(vb, struct em28xx_buffer, vb);
+       struct em28xx_fh        *fh      = vq->priv_data;
+       struct em28xx           *dev     = fh->dev;
+       struct em28xx_dmaqueue  *vidq    = &dev->vidq;
 
-       if (down_interruptible(&dev->fileop_lock))
-               return -ERESTARTSYS;
+       buf->vb.state = VIDEOBUF_QUEUED;
+       list_add_tail(&buf->vb.queue, &vidq->active);
 
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_videodbg("device not present\n");
-               up(&dev->fileop_lock);
-               return -ENODEV;
-       }
+}
 
-       if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_videodbg("device misconfigured; close and open it again\n");
-               up(&dev->fileop_lock);
-               return -EIO;
-       }
+static void buffer_release(struct videobuf_queue *vq,
+                               struct videobuf_buffer *vb)
+{
+       struct em28xx_buffer   *buf  = container_of(vb, struct em28xx_buffer, vb);
+       struct em28xx_fh       *fh   = vq->priv_data;
+       struct em28xx          *dev  = (struct em28xx *)fh->dev;
 
-       if (dev->io == IO_MMAP) {
-               em28xx_videodbg ("IO method is set to mmap; close and open"
-                               " the device again to choose the read method\n");
-               up(&dev->fileop_lock);
-               return -EINVAL;
-       }
+       em28xx_isocdbg("em28xx: called buffer_release\n");
 
-       if (dev->io == IO_NONE) {
-               if (!em28xx_request_buffers(dev, EM28XX_NUM_READ_FRAMES)) {
-                       em28xx_errdev("read failed, not enough memory\n");
-                       up(&dev->fileop_lock);
-                       return -ENOMEM;
-               }
-               dev->io = IO_READ;
-               dev->stream = STREAM_ON;
-               em28xx_queue_unusedframes(dev);
-       }
+       free_buffer(vq, buf);
+}
 
-       if (!count) {
-               up(&dev->fileop_lock);
-               return 0;
-       }
+static struct videobuf_queue_ops em28xx_video_qops = {
+       .buf_setup      = buffer_setup,
+       .buf_prepare    = buffer_prepare,
+       .buf_queue      = buffer_queue,
+       .buf_release    = buffer_release,
+};
 
-       if (list_empty(&dev->outqueue)) {
-               if (filp->f_flags & O_NONBLOCK) {
-                       up(&dev->fileop_lock);
-                       return -EAGAIN;
-               }
-               ret = wait_event_interruptible
-                   (dev->wait_frame,
-                    (!list_empty(&dev->outqueue)) ||
-                    (dev->state & DEV_DISCONNECTED));
-               if (ret) {
-                       up(&dev->fileop_lock);
-                       return ret;
-               }
-               if (dev->state & DEV_DISCONNECTED) {
-                       up(&dev->fileop_lock);
-                       return -ENODEV;
-               }
-       }
+/*********************  v4l2 interface  **************************************/
 
-       f = list_entry(dev->outqueue.prev, struct em28xx_frame_t, frame);
+/*
+ * em28xx_config()
+ * inits registers with sane defaults
+ */
+static int em28xx_config(struct em28xx *dev)
+{
 
-       spin_lock_irqsave(&dev->queue_lock, lock_flags);
-       list_for_each_entry(i, &dev->outqueue, frame)
-           i->state = F_UNUSED;
-       INIT_LIST_HEAD(&dev->outqueue);
-       spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+       /* Sets I2C speed to 100 KHz */
+       if (!dev->is_em2800)
+               em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
 
-       em28xx_queue_unusedframes(dev);
+       /* enable vbi capturing */
 
-       if (count > f->buf.length)
-               count = f->buf.length;
+/*     em28xx_write_regs_req(dev, 0x00, 0x0e, "\xC0", 1); audio register */
+/*     em28xx_write_regs_req(dev, 0x00, 0x0f, "\x80", 1); clk register */
+       em28xx_write_regs_req(dev, 0x00, 0x11, "\x51", 1);
 
-       if (copy_to_user(buf, f->bufmem, count)) {
-               up(&dev->fileop_lock);
-               return -EFAULT;
-       }
-       *f_pos += count;
+       dev->mute = 1;          /* maybe not the right place... */
+       dev->volume = 0x1f;
 
-       up(&dev->fileop_lock);
+       em28xx_outfmt_set_yuv422(dev);
+       em28xx_colorlevels_set_default(dev);
+       em28xx_compression_disable(dev);
 
-       return count;
+       return 0;
 }
 
 /*
- * em28xx_v4l2_poll()
- * will allocate buffers when called for the first time
+ * em28xx_config_i2c()
+ * configure i2c attached devices
  */
-static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table * wait)
+static void em28xx_config_i2c(struct em28xx *dev)
 {
-       unsigned int mask = 0;
-       struct em28xx *dev = filp->private_data;
-
-       if (down_interruptible(&dev->fileop_lock))
-               return POLLERR;
+       struct v4l2_routing route;
 
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_videodbg("device not present\n");
-       } else if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_videodbg("device is misconfigured; close and open it again\n");
-       } else {
-               if (dev->io == IO_NONE) {
-                       if (!em28xx_request_buffers
-                           (dev, EM28XX_NUM_READ_FRAMES)) {
-                               em28xx_warn
-                                   ("poll() failed, not enough memory\n");
-                       } else {
-                               dev->io = IO_READ;
-                               dev->stream = STREAM_ON;
-                       }
-               }
+       route.input = INPUT(dev->ctl_input)->vmux;
+       route.output = 0;
+       em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL);
+       em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
+       em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL);
+}
 
-               if (dev->io == IO_READ) {
-                       em28xx_queue_unusedframes(dev);
-                       poll_wait(filp, &dev->wait_frame, wait);
+static void video_mux(struct em28xx *dev, int index)
+{
+       struct v4l2_routing route;
 
-                       if (!list_empty(&dev->outqueue))
-                               mask |= POLLIN | POLLRDNORM;
+       route.input = INPUT(index)->vmux;
+       route.output = 0;
+       dev->ctl_input = index;
+       dev->ctl_ainput = INPUT(index)->amux;
 
-                       up(&dev->fileop_lock);
+       em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
-                       return mask;
+       if (dev->has_msp34xx) {
+               if (dev->i2s_speed) {
+                       em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ,
+                               &dev->i2s_speed);
                }
+               route.input = dev->ctl_ainput;
+               route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
+               /* Note: this is msp3400 specific */
+               em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING,
+                       &route);
        }
 
-       up(&dev->fileop_lock);
-       return POLLERR;
+       em28xx_audio_analog_set(dev);
 }
 
-/*
- * em28xx_vm_open()
- */
-static void em28xx_vm_open(struct vm_area_struct *vma)
+/* Usage lock check functions */
+static int res_get(struct em28xx_fh *fh)
 {
-       struct em28xx_frame_t *f = vma->vm_private_data;
-       f->vma_use_count++;
+       struct em28xx    *dev = fh->dev;
+       int              rc   = 0;
+
+       /* This instance already has stream_on */
+       if (fh->stream_on)
+               return rc;
+
+       if (dev->stream_on)
+               return -EINVAL;
+
+       mutex_lock(&dev->lock);
+       dev->stream_on = 1;
+       fh->stream_on  = 1;
+       mutex_unlock(&dev->lock);
+       return rc;
 }
 
-/*
- * em28xx_vm_close()
- */
-static void em28xx_vm_close(struct vm_area_struct *vma)
+static int res_check(struct em28xx_fh *fh)
 {
-       /* NOTE: buffers are not freed here */
-       struct em28xx_frame_t *f = vma->vm_private_data;
-       f->vma_use_count--;
+       return (fh->stream_on);
 }
 
-static struct vm_operations_struct em28xx_vm_ops = {
-       .open = em28xx_vm_open,
-       .close = em28xx_vm_close,
-};
+static void res_free(struct em28xx_fh *fh)
+{
+       struct em28xx    *dev = fh->dev;
+
+       mutex_lock(&dev->lock);
+       fh->stream_on = 0;
+       dev->stream_on = 0;
+       mutex_unlock(&dev->lock);
+}
 
 /*
- * em28xx_v4l2_mmap()
+ * em28xx_get_ctrl()
+ * return the current saturation, brightness or contrast, mute state
  */
-static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
-{
-       unsigned long size = vma->vm_end - vma->vm_start,
-           start = vma->vm_start;
-       void *pos;
-       u32 i;
-
-       struct em28xx *dev = filp->private_data;
-
-       if (down_interruptible(&dev->fileop_lock))
-               return -ERESTARTSYS;
-
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_videodbg("mmap: device not present\n");
-               up(&dev->fileop_lock);
-               return -ENODEV;
-       }
-
-       if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_videodbg ("mmap: Device is misconfigured; close and "
-                                               "open it again\n");
-               up(&dev->fileop_lock);
-               return -EIO;
-       }
-
-       if (dev->io != IO_MMAP || !(vma->vm_flags & VM_WRITE) ||
-           size != PAGE_ALIGN(dev->frame[0].buf.length)) {
-               up(&dev->fileop_lock);
-               return -EINVAL;
-       }
-
-       for (i = 0; i < dev->num_frames; i++) {
-               if ((dev->frame[i].buf.m.offset >> PAGE_SHIFT) == vma->vm_pgoff)
-                       break;
-       }
-       if (i == dev->num_frames) {
-               em28xx_videodbg("mmap: user supplied mapping address is out of range\n");
-               up(&dev->fileop_lock);
-               return -EINVAL;
-       }
-
-       /* VM_IO is eventually going to replace PageReserved altogether */
-       vma->vm_flags |= VM_IO;
-       vma->vm_flags |= VM_RESERVED;   /* avoid to swap out this VMA */
-
-       pos = dev->frame[i].bufmem;
-       while (size > 0) {      /* size is page-aligned */
-               if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
-                       em28xx_videodbg("mmap: vm_insert_page failed\n");
-                       up(&dev->fileop_lock);
-                       return -EAGAIN;
-               }
-               start += PAGE_SIZE;
-               pos += PAGE_SIZE;
-               size -= PAGE_SIZE;
-       }
-
-       vma->vm_ops = &em28xx_vm_ops;
-       vma->vm_private_data = &dev->frame[i];
-
-       em28xx_vm_open(vma);
-       up(&dev->fileop_lock);
-       return 0;
-}
-
-/*
- * em28xx_get_ctrl()
- * return the current saturation, brightness or contrast, mute state
- */
-static int em28xx_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
+static int em28xx_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
 {
        switch (ctrl->id) {
        case V4L2_CID_AUDIO_MUTE:
@@ -745,43 +628,6 @@ static int em28xx_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
        }
 }
 
-/*FIXME: should be moved to saa711x */
-static int saa711x_get_ctrl(struct em28xx *dev, struct v4l2_control *ctrl)
-{
-       s32 tmp;
-       switch (ctrl->id) {
-       case V4L2_CID_BRIGHTNESS:
-               if ((tmp = em28xx_brightness_get(dev)) < 0)
-                       return -EIO;
-               ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
-               return 0;
-       case V4L2_CID_CONTRAST:
-               if ((ctrl->value = em28xx_contrast_get(dev)) < 0)
-                       return -EIO;
-               return 0;
-       case V4L2_CID_SATURATION:
-               if ((ctrl->value = em28xx_saturation_get(dev)) < 0)
-                       return -EIO;
-               return 0;
-       case V4L2_CID_RED_BALANCE:
-               if ((tmp = em28xx_v_balance_get(dev)) < 0)
-                       return -EIO;
-               ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
-               return 0;
-       case V4L2_CID_BLUE_BALANCE:
-               if ((tmp = em28xx_u_balance_get(dev)) < 0)
-                       return -EIO;
-               ctrl->value = (s32) ((s8) tmp); /* FIXME: clenaer way to extend sign? */
-               return 0;
-       case V4L2_CID_GAMMA:
-               if ((ctrl->value = em28xx_gamma_get(dev)) < 0)
-                       return -EIO;
-               return 0;
-       default:
-               return -EINVAL;
-       }
-}
-
 /*
  * em28xx_set_ctrl()
  * mute or set new saturation, brightness or contrast
@@ -792,7 +638,6 @@ static int em28xx_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
        case V4L2_CID_AUDIO_MUTE:
                if (ctrl->value != dev->mute) {
                        dev->mute = ctrl->value;
-                       em28xx_audio_usb_mute(dev, ctrl->value);
                        return em28xx_audio_analog_set(dev);
                }
                return 0;
@@ -804,65 +649,77 @@ static int em28xx_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
        }
 }
 
-/*FIXME: should be moved to saa711x */
-static int saa711x_set_ctrl(struct em28xx *dev, const struct v4l2_control *ctrl)
+static int check_dev(struct em28xx *dev)
 {
-       switch (ctrl->id) {
-       case V4L2_CID_BRIGHTNESS:
-               return em28xx_brightness_set(dev, ctrl->value);
-       case V4L2_CID_CONTRAST:
-               return em28xx_contrast_set(dev, ctrl->value);
-       case V4L2_CID_SATURATION:
-               return em28xx_saturation_set(dev, ctrl->value);
-       case V4L2_CID_RED_BALANCE:
-               return em28xx_v_balance_set(dev, ctrl->value);
-       case V4L2_CID_BLUE_BALANCE:
-               return em28xx_u_balance_set(dev, ctrl->value);
-       case V4L2_CID_GAMMA:
-               return em28xx_gamma_set(dev, ctrl->value);
-       default:
-               return -EINVAL;
+       if (dev->state & DEV_DISCONNECTED) {
+               em28xx_errdev("v4l2 ioctl: device not present\n");
+               return -ENODEV;
        }
+
+       if (dev->state & DEV_MISCONFIGURED) {
+               em28xx_errdev("v4l2 ioctl: device is misconfigured; "
+                             "close and open it again\n");
+               return -EIO;
+       }
+       return 0;
 }
 
-/*
- * em28xx_stream_interrupt()
- * stops streaming
- */
-static int em28xx_stream_interrupt(struct em28xx *dev)
+static void get_scale(struct em28xx *dev,
+                       unsigned int width, unsigned int height,
+                       unsigned int *hscale, unsigned int *vscale)
 {
-       int ret = 0;
-
-       /* stop reading from the device */
+       unsigned int          maxw   = norm_maxw(dev);
+       unsigned int          maxh   = norm_maxh(dev);
 
-       dev->stream = STREAM_INTERRUPT;
-       ret = wait_event_timeout(dev->wait_stream,
-                                (dev->stream == STREAM_OFF) ||
-                                (dev->state & DEV_DISCONNECTED),
-                                EM28XX_URB_TIMEOUT);
-       if (dev->state & DEV_DISCONNECTED)
-               return -ENODEV;
-       else if (ret) {
-               dev->state |= DEV_MISCONFIGURED;
-               em28xx_videodbg("device is misconfigured; close and "
-                       "open /dev/video%d again\n",
-                               dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN);
-               return ret;
-       }
+       *hscale = (((unsigned long)maxw) << 12) / width - 4096L;
+       if (*hscale >= 0x4000)
+               *hscale = 0x3fff;
 
-       return 0;
+       *vscale = (((unsigned long)maxh) << 12) / height - 4096L;
+       if (*vscale >= 0x4000)
+               *vscale = 0x3fff;
 }
 
-static int em28xx_set_norm(struct em28xx *dev, int width, int height)
+/* ------------------------------------------------------------------
+       IOCTL vidioc handling
+   ------------------------------------------------------------------*/
+
+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+                                       struct v4l2_format *f)
 {
-       unsigned int hscale, vscale;
-       unsigned int maxh, maxw;
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
 
-       maxw = norm_maxw(dev);
-       maxh = norm_maxh(dev);
+       mutex_lock(&dev->lock);
+
+       f->fmt.pix.width = dev->width;
+       f->fmt.pix.height = dev->height;
+       f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+       f->fmt.pix.bytesperline = dev->width * 2;
+       f->fmt.pix.sizeimage = f->fmt.pix.bytesperline  * dev->height;
+       f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+
+       /* FIXME: TOP? NONE? BOTTOM? ALTENATE? */
+       f->fmt.pix.field = dev->interlaced ?
+                          V4L2_FIELD_INTERLACED : V4L2_FIELD_TOP;
 
-       /* width must even because of the YUYV format */
-       /* height must be even because of interlacing */
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+                       struct v4l2_format *f)
+{
+       struct em28xx_fh      *fh    = priv;
+       struct em28xx         *dev   = fh->dev;
+       int                   width  = f->fmt.pix.width;
+       int                   height = f->fmt.pix.height;
+       unsigned int          maxw   = norm_maxw(dev);
+       unsigned int          maxh   = norm_maxh(dev);
+       unsigned int          hscale, vscale;
+
+       /* width must even because of the YUYV format
+          height must be even because of interlacing */
        height &= 0xfffe;
        width &= 0xfffe;
 
@@ -875,1035 +732,1361 @@ static int em28xx_set_norm(struct em28xx *dev, int width, int height)
        if (width > maxw)
                width = maxw;
 
-       if ((hscale = (((unsigned long)maxw) << 12) / width - 4096L) >= 0x4000)
-               hscale = 0x3fff;
-       width = (((unsigned long)maxw) << 12) / (hscale + 4096L);
+       mutex_lock(&dev->lock);
+
+       if (dev->is_em2800) {
+               /* the em2800 can only scale down to 50% */
+               if (height % (maxh / 2))
+                       height = maxh;
+               if (width % (maxw / 2))
+                       width = maxw;
+               /* according to empiatech support */
+               /* the MaxPacketSize is to small to support */
+               /* framesizes larger than 640x480 @ 30 fps */
+               /* or 640x576 @ 25 fps. As this would cut */
+               /* of a part of the image we prefer */
+               /* 360x576 or 360x480 for now */
+               if (width == maxw && height == maxh)
+                       width /= 2;
+       }
 
-       if ((vscale = (((unsigned long)maxh) << 12) / height - 4096L) >= 0x4000)
-               vscale = 0x3fff;
+       get_scale(dev, width, height, &hscale, &vscale);
+
+       width = (((unsigned long)maxw) << 12) / (hscale + 4096L);
        height = (((unsigned long)maxh) << 12) / (vscale + 4096L);
 
+       f->fmt.pix.width = width;
+       f->fmt.pix.height = height;
+       f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+       f->fmt.pix.bytesperline = width * 2;
+       f->fmt.pix.sizeimage = width * 2 * height;
+       f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+       f->fmt.pix.field = V4L2_FIELD_INTERLACED;
+
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+                       struct v4l2_format *f)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       vidioc_try_fmt_vid_cap(file, priv, f);
+
+       mutex_lock(&dev->lock);
+
+       if (videobuf_queue_is_busy(&fh->vb_vidq)) {
+               em28xx_errdev("%s queue busy\n", __func__);
+               rc = -EBUSY;
+               goto out;
+       }
+
+       if (dev->stream_on && !fh->stream_on) {
+               em28xx_errdev("%s device in use by another fh\n", __func__);
+               rc = -EBUSY;
+               goto out;
+       }
+
+       /* set new image size */
+       dev->width = f->fmt.pix.width;
+       dev->height = f->fmt.pix.height;
+       get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
+
+       em28xx_set_alternate(dev);
+       em28xx_resolution_set(dev);
+
+       rc = 0;
+
+out:
+       mutex_unlock(&dev->lock);
+       return rc;
+}
+
+static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id * norm)
+{
+       struct em28xx_fh   *fh  = priv;
+       struct em28xx      *dev = fh->dev;
+       struct v4l2_format f;
+       int                rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       mutex_lock(&dev->lock);
+       dev->norm = *norm;
+       mutex_unlock(&dev->lock);
+
+       /* Adjusts width/height, if needed */
+       f.fmt.pix.width = dev->width;
+       f.fmt.pix.height = dev->height;
+       vidioc_try_fmt_vid_cap(file, priv, &f);
+
+       mutex_lock(&dev->lock);
+
        /* set new image size */
-       dev->width = width;
-       dev->height = height;
-       dev->frame_size = dev->width * dev->height * 2;
-       dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
-       dev->bytesperline = dev->width * 2;
-       dev->hscale = hscale;
-       dev->vscale = vscale;
+       dev->width = f.fmt.pix.width;
+       dev->height = f.fmt.pix.height;
+       get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
        em28xx_resolution_set(dev);
+       em28xx_i2c_call_clients(dev, VIDIOC_S_STD, &dev->norm);
+
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+static const char *iname[] = {
+       [EM28XX_VMUX_COMPOSITE1] = "Composite1",
+       [EM28XX_VMUX_COMPOSITE2] = "Composite2",
+       [EM28XX_VMUX_COMPOSITE3] = "Composite3",
+       [EM28XX_VMUX_COMPOSITE4] = "Composite4",
+       [EM28XX_VMUX_SVIDEO]     = "S-Video",
+       [EM28XX_VMUX_TELEVISION] = "Television",
+       [EM28XX_VMUX_CABLE]      = "Cable TV",
+       [EM28XX_VMUX_DVB]        = "DVB",
+       [EM28XX_VMUX_DEBUG]      = "for debug only",
+};
+
+static int vidioc_enum_input(struct file *file, void *priv,
+                               struct v4l2_input *i)
+{
+       struct em28xx_fh   *fh  = priv;
+       struct em28xx      *dev = fh->dev;
+       unsigned int       n;
+
+       n = i->index;
+       if (n >= MAX_EM28XX_INPUT)
+               return -EINVAL;
+       if (0 == INPUT(n)->type)
+               return -EINVAL;
+
+       i->index = n;
+       i->type = V4L2_INPUT_TYPE_CAMERA;
+
+       strcpy(i->name, iname[INPUT(n)->type]);
+
+       if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type) ||
+               (EM28XX_VMUX_CABLE == INPUT(n)->type))
+               i->type = V4L2_INPUT_TYPE_TUNER;
+
+       i->std = dev->vdev->tvnorms;
 
        return 0;
 }
 
+static int vidioc_g_input(struct file *file, void *priv, unsigned int *i)
+{
+       struct em28xx_fh   *fh  = priv;
+       struct em28xx      *dev = fh->dev;
+
+       *i = dev->ctl_input;
+
+       return 0;
+}
+
+static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
+{
+       struct em28xx_fh   *fh  = priv;
+       struct em28xx      *dev = fh->dev;
+       int                rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       if (i >= MAX_EM28XX_INPUT)
+               return -EINVAL;
+       if (0 == INPUT(i)->type)
+               return -EINVAL;
+
+       mutex_lock(&dev->lock);
+
+       video_mux(dev, i);
+
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+       struct em28xx_fh   *fh    = priv;
+       struct em28xx      *dev   = fh->dev;
+       unsigned int        index = a->index;
+
+       if (a->index > 1)
+               return -EINVAL;
+
+       index = dev->ctl_ainput;
+
+       if (index == 0)
+               strcpy(a->name, "Television");
+       else
+               strcpy(a->name, "Line In");
+
+       a->capability = V4L2_AUDCAP_STEREO;
+       a->index = index;
+
+       return 0;
+}
+
+static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+       struct em28xx_fh   *fh  = priv;
+       struct em28xx      *dev = fh->dev;
+
+       if (a->index != dev->ctl_ainput)
+               return -EINVAL;
+
+       return 0;
+}
 
-static int em28xx_get_fmt(struct em28xx *dev, struct v4l2_format *format)
+static int vidioc_queryctrl(struct file *file, void *priv,
+                               struct v4l2_queryctrl *qc)
 {
-       em28xx_videodbg("VIDIOC_G_FMT: type=%s\n",
-               (format->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE) ?
-               "V4L2_BUF_TYPE_VIDEO_CAPTURE" :
-               (format->type ==V4L2_BUF_TYPE_VBI_CAPTURE) ?
-               "V4L2_BUF_TYPE_VBI_CAPTURE" :
-               (format->type ==V4L2_CAP_SLICED_VBI_CAPTURE) ?
-               "V4L2_BUF_TYPE_SLICED_VBI_CAPTURE " :
-               "not supported");
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   id  = qc->id;
+       int                   i;
+       int                   rc;
 
-       if (format->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               format->fmt.pix.width = dev->width;
-               format->fmt.pix.height = dev->height;
-               format->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
-               format->fmt.pix.bytesperline = dev->bytesperline;
-               format->fmt.pix.sizeimage = dev->frame_size;
-               format->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
-               format->fmt.pix.field = dev->interlaced ? V4L2_FIELD_INTERLACED : V4L2_FIELD_TOP;       /* FIXME: TOP? NONE? BOTTOM? ALTENATE? */
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
 
-               em28xx_videodbg("VIDIOC_G_FMT: %dx%d\n", dev->width,
-                       dev->height);
+       memset(qc, 0, sizeof(*qc));
+
+       qc->id = id;
+
+       if (!dev->has_msp34xx) {
+               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
+                       if (qc->id && qc->id == em28xx_qctrl[i].id) {
+                               memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
+                               return 0;
+                       }
+               }
+       }
+       mutex_lock(&dev->lock);
+       em28xx_i2c_call_clients(dev, VIDIOC_QUERYCTRL, qc);
+       mutex_unlock(&dev->lock);
+
+       if (qc->type)
                return 0;
+       else
+               return -EINVAL;
+}
+
+static int vidioc_g_ctrl(struct file *file, void *priv,
+                               struct v4l2_control *ctrl)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+       mutex_lock(&dev->lock);
+
+       if (!dev->has_msp34xx)
+               rc = em28xx_get_ctrl(dev, ctrl);
+       else
+               rc = -EINVAL;
+
+       if (rc == -EINVAL) {
+               em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+               rc = 0;
        }
 
-       return -EINVAL;
+       mutex_unlock(&dev->lock);
+       return rc;
 }
 
+static int vidioc_s_ctrl(struct file *file, void *priv,
+                               struct v4l2_control *ctrl)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       u8                    i;
+       int                   rc;
 
-/*
- * em28xx_v4l2_do_ioctl()
- * This function is _not_ called directly, but from
- * em28xx_v4l2_ioctl. Userspace
- * copying is done already, arg is a kernel pointer.
- */
-static int em28xx_do_ioctl(struct inode *inode, struct file *filp,
-                          struct em28xx *dev, unsigned int cmd, void *arg,
-                          v4l2_kioctl driver_ioctl)
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       mutex_lock(&dev->lock);
+
+       if (dev->has_msp34xx)
+               em28xx_i2c_call_clients(dev, VIDIOC_S_CTRL, ctrl);
+       else {
+               rc = 1;
+               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
+                       if (ctrl->id == em28xx_qctrl[i].id) {
+                               if (ctrl->value < em28xx_qctrl[i].minimum ||
+                                   ctrl->value > em28xx_qctrl[i].maximum) {
+                                       rc = -ERANGE;
+                                       break;
+                               }
+
+                               rc = em28xx_set_ctrl(dev, ctrl);
+                               break;
+                       }
+               }
+       }
+
+       /* Control not found - try to send it to the attached devices */
+       if (rc == 1) {
+               em28xx_i2c_call_clients(dev, VIDIOC_S_CTRL, ctrl);
+               rc = 0;
+       }
+
+       mutex_unlock(&dev->lock);
+       return rc;
+}
+
+static int vidioc_g_tuner(struct file *file, void *priv,
+                               struct v4l2_tuner *t)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       if (0 != t->index)
+               return -EINVAL;
+
+       strcpy(t->name, "Tuner");
+
+       mutex_lock(&dev->lock);
+
+       em28xx_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
+
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+static int vidioc_s_tuner(struct file *file, void *priv,
+                               struct v4l2_tuner *t)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       if (0 != t->index)
+               return -EINVAL;
+
+       mutex_lock(&dev->lock);
+
+       em28xx_i2c_call_clients(dev, VIDIOC_S_TUNER, t);
+
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+static int vidioc_g_frequency(struct file *file, void *priv,
+                               struct v4l2_frequency *f)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+
+       f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
+       f->frequency = dev->ctl_freq;
+
+       return 0;
+}
+
+static int vidioc_s_frequency(struct file *file, void *priv,
+                               struct v4l2_frequency *f)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       if (0 != f->tuner)
+               return -EINVAL;
+
+       if (unlikely(0 == fh->radio && f->type != V4L2_TUNER_ANALOG_TV))
+               return -EINVAL;
+       if (unlikely(1 == fh->radio && f->type != V4L2_TUNER_RADIO))
+               return -EINVAL;
+
+       mutex_lock(&dev->lock);
+
+       dev->ctl_freq = f->frequency;
+       em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, f);
+
+       mutex_unlock(&dev->lock);
+       return 0;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int em28xx_reg_len(int reg)
 {
+       switch (reg) {
+       case EM28XX_R40_AC97LSB:
+       case EM28XX_R30_HSCALELOW:
+       case EM28XX_R32_VSCALELOW:
+               return 2;
+       default:
+               return 1;
+       }
+}
+
+static int vidioc_g_register(struct file *file, void *priv,
+                            struct v4l2_register *reg)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
        int ret;
 
-       switch (cmd) {
-               /* ---------- tv norms ---------- */
-       case VIDIOC_ENUMSTD:
-               {
-                       struct v4l2_standard *e = arg;
-                       unsigned int i;
-
-                       i = e->index;
-                       if (i >= TVNORMS)
-                               return -EINVAL;
-                       ret = v4l2_video_std_construct(e, tvnorms[e->index].id,
-                                                      tvnorms[e->index].name);
-                       e->index = i;
-                       if (ret < 0)
-                               return ret;
-                       return 0;
-               }
-       case VIDIOC_G_STD:
-               {
-                       v4l2_std_id *id = arg;
+       if (!v4l2_chip_match_host(reg->match_type, reg->match_chip))
+               return -EINVAL;
 
-                       *id = dev->tvnorm->id;
-                       return 0;
-               }
-       case VIDIOC_S_STD:
-               {
-                       v4l2_std_id *id = arg;
-                       unsigned int i;
+       if (em28xx_reg_len(reg->reg) == 1) {
+               ret = em28xx_read_reg(dev, reg->reg);
+               if (ret < 0)
+                       return ret;
 
-                       for (i = 0; i < TVNORMS; i++)
-                               if (*id == tvnorms[i].id)
-                                       break;
-                       if (i == TVNORMS)
-                               for (i = 0; i < TVNORMS; i++)
-                                       if (*id & tvnorms[i].id)
-                                               break;
-                       if (i == TVNORMS)
-                               return -EINVAL;
+               reg->val = ret;
+       } else {
+               __le64 val = 0;
+               ret = em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS,
+                                                  reg->reg, (char *)&val, 2);
+               if (ret < 0)
+                       return ret;
 
-                       down(&dev->lock);
-                       dev->tvnorm = &tvnorms[i];
+               reg->val = le64_to_cpu(val);
+       }
 
-                       em28xx_set_norm(dev, dev->width, dev->height);
+       return 0;
+}
 
-/*
-               dev->width=norm_maxw(dev);
-               dev->height=norm_maxh(dev);
-               dev->frame_size=dev->width*dev->height*2;
-               dev->field_size=dev->frame_size>>1;
-               dev->bytesperline=dev->width*2;
-               dev->hscale=0;
-               dev->vscale=0;
+static int vidioc_s_register(struct file *file, void *priv,
+                            struct v4l2_register *reg)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       __le64 buf;
 
-               em28xx_resolution_set(dev);
-*/
-/*
-               em28xx_uninit_isoc(dev);
-               em28xx_set_alternate(dev);
-               em28xx_capture_start(dev, 1);
-               em28xx_resolution_set(dev);
-               em28xx_init_isoc(dev);
-*/
-                       em28xx_i2c_call_clients(dev, DECODER_SET_NORM,
-                                               &tvnorms[i].mode);
-                       em28xx_i2c_call_clients(dev, VIDIOC_S_STD,
-                                               &dev->tvnorm->id);
+       buf = cpu_to_le64(reg->val);
+
+       return em28xx_write_regs(dev, reg->reg, (char *)&buf,
+                                em28xx_reg_len(reg->reg));
+}
+#endif
 
-                       up(&dev->lock);
 
-                       return 0;
-               }
+static int vidioc_cropcap(struct file *file, void *priv,
+                                       struct v4l2_cropcap *cc)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+
+       if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+
+       cc->bounds.left = 0;
+       cc->bounds.top = 0;
+       cc->bounds.width = dev->width;
+       cc->bounds.height = dev->height;
+       cc->defrect = cc->bounds;
+       cc->pixelaspect.numerator = 54; /* 4:3 FIXME: remove magic numbers */
+       cc->pixelaspect.denominator = 59;
+
+       return 0;
+}
+
+static int vidioc_streamon(struct file *file, void *priv,
+                                       enum v4l2_buf_type type)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+
+       if (unlikely(res_get(fh) < 0))
+               return -EBUSY;
+
+       return (videobuf_streamon(&fh->vb_vidq));
+}
+
+static int vidioc_streamoff(struct file *file, void *priv,
+                                       enum v4l2_buf_type type)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+               return -EINVAL;
+       if (type != fh->type)
+               return -EINVAL;
+
+       videobuf_streamoff(&fh->vb_vidq);
+       res_free(fh);
+
+       return 0;
+}
+
+static int vidioc_querycap(struct file *file, void  *priv,
+                                       struct v4l2_capability *cap)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+
+       strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
+       strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
+       strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info));
+
+       cap->version = EM28XX_VERSION_CODE;
+
+       cap->capabilities =
+                       V4L2_CAP_SLICED_VBI_CAPTURE |
+                       V4L2_CAP_VIDEO_CAPTURE |
+                       V4L2_CAP_AUDIO |
+                       V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+
+       if (dev->tuner_type != TUNER_ABSENT)
+               cap->capabilities |= V4L2_CAP_TUNER;
+
+       return 0;
+}
+
+static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
+                                       struct v4l2_fmtdesc *fmtd)
+{
+       if (fmtd->index != 0)
+               return -EINVAL;
+
+       fmtd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       strcpy(fmtd->description, "Packed YUY2");
+       fmtd->pixelformat = V4L2_PIX_FMT_YUYV;
+       memset(fmtd->reserved, 0, sizeof(fmtd->reserved));
+
+       return 0;
+}
+
+/* Sliced VBI ioctls */
+static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
+                                       struct v4l2_format *f)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       mutex_lock(&dev->lock);
+
+       f->fmt.sliced.service_set = 0;
+
+       em28xx_i2c_call_clients(dev, VIDIOC_G_FMT, f);
+
+       if (f->fmt.sliced.service_set == 0)
+               rc = -EINVAL;
 
-               /* ------ input switching ---------- */
-       case VIDIOC_ENUMINPUT:
-               {
-                       struct v4l2_input *i = arg;
-                       unsigned int n;
-                       static const char *iname[] = {
-                               [EM28XX_VMUX_COMPOSITE1] = "Composite1",
-                               [EM28XX_VMUX_COMPOSITE2] = "Composite2",
-                               [EM28XX_VMUX_COMPOSITE3] = "Composite3",
-                               [EM28XX_VMUX_COMPOSITE4] = "Composite4",
-                               [EM28XX_VMUX_SVIDEO] = "S-Video",
-                               [EM28XX_VMUX_TELEVISION] = "Television",
-                               [EM28XX_VMUX_CABLE] = "Cable TV",
-                               [EM28XX_VMUX_DVB] = "DVB",
-                               [EM28XX_VMUX_DEBUG] = "for debug only",
-                       };
-
-                       n = i->index;
-                       if (n >= MAX_EM28XX_INPUT)
-                               return -EINVAL;
-                       if (0 == INPUT(n)->type)
-                               return -EINVAL;
-                       memset(i, 0, sizeof(*i));
-                       i->index = n;
-                       i->type = V4L2_INPUT_TYPE_CAMERA;
-                       strcpy(i->name, iname[INPUT(n)->type]);
-                       if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type) ||
-                           (EM28XX_VMUX_CABLE == INPUT(n)->type))
-                               i->type = V4L2_INPUT_TYPE_TUNER;
-                       for (n = 0; n < ARRAY_SIZE(tvnorms); n++)
-                               i->std |= tvnorms[n].id;
+       mutex_unlock(&dev->lock);
+       return rc;
+}
+
+static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
+                       struct v4l2_format *f)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       mutex_lock(&dev->lock);
+       em28xx_i2c_call_clients(dev, VIDIOC_G_FMT, f);
+       mutex_unlock(&dev->lock);
+
+       if (f->fmt.sliced.service_set == 0)
+               return -EINVAL;
+
+       return 0;
+}
+
+
+static int vidioc_reqbufs(struct file *file, void *priv,
+                         struct v4l2_requestbuffers *rb)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       return (videobuf_reqbufs(&fh->vb_vidq, rb));
+}
+
+static int vidioc_querybuf(struct file *file, void *priv,
+                          struct v4l2_buffer *b)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       return (videobuf_querybuf(&fh->vb_vidq, b));
+}
+
+static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *b)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       return (videobuf_qbuf(&fh->vb_vidq, b));
+}
+
+static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
+{
+       struct em28xx_fh      *fh  = priv;
+       struct em28xx         *dev = fh->dev;
+       int                   rc;
+
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       return (videobuf_dqbuf(&fh->vb_vidq, b,
+                               file->f_flags & O_NONBLOCK));
+}
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
+{
+       struct em28xx_fh  *fh = priv;
+
+       return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8);
+}
+#endif
+
+
+/* ----------------------------------------------------------- */
+/* RADIO ESPECIFIC IOCTLS                                      */
+/* ----------------------------------------------------------- */
+
+static int radio_querycap(struct file *file, void  *priv,
+                         struct v4l2_capability *cap)
+{
+       struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;
+
+       strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
+       strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));
+       strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info));
+
+       cap->version = EM28XX_VERSION_CODE;
+       cap->capabilities = V4L2_CAP_TUNER;
+       return 0;
+}
+
+static int radio_g_tuner(struct file *file, void *priv,
+                        struct v4l2_tuner *t)
+{
+       struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;
+
+       if (unlikely(t->index > 0))
+               return -EINVAL;
+
+       strcpy(t->name, "Radio");
+       t->type = V4L2_TUNER_RADIO;
+
+       em28xx_i2c_call_clients(dev, VIDIOC_G_TUNER, t);
+       return 0;
+}
+
+static int radio_enum_input(struct file *file, void *priv,
+                           struct v4l2_input *i)
+{
+       if (i->index != 0)
+               return -EINVAL;
+       strcpy(i->name, "Radio");
+       i->type = V4L2_INPUT_TYPE_TUNER;
+
+       return 0;
+}
+
+static int radio_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
+{
+       if (unlikely(a->index))
+               return -EINVAL;
+
+       strcpy(a->name, "Radio");
+       return 0;
+}
+
+static int radio_s_tuner(struct file *file, void *priv,
+                        struct v4l2_tuner *t)
+{
+       struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;
+
+       if (0 != t->index)
+               return -EINVAL;
+
+       em28xx_i2c_call_clients(dev, VIDIOC_S_TUNER, t);
+
+       return 0;
+}
+
+static int radio_s_audio(struct file *file, void *fh,
+                        struct v4l2_audio *a)
+{
+       return 0;
+}
+
+static int radio_s_input(struct file *file, void *fh, unsigned int i)
+{
+       return 0;
+}
+
+static int radio_queryctrl(struct file *file, void *priv,
+                          struct v4l2_queryctrl *qc)
+{
+       int i;
+
+       if (qc->id <  V4L2_CID_BASE ||
+               qc->id >= V4L2_CID_LASTP1)
+               return -EINVAL;
+
+       for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
+               if (qc->id && qc->id == em28xx_qctrl[i].id) {
+                       memcpy(qc, &(em28xx_qctrl[i]), sizeof(*qc));
                        return 0;
                }
+       }
 
-       case VIDIOC_G_INPUT:
-               {
-                       int *i = arg;
-                       *i = dev->ctl_input;
+       return -EINVAL;
+}
 
-                       return 0;
+/*
+ * em28xx_v4l2_open()
+ * inits the device and starts isoc transfer
+ */
+static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
+{
+       int minor = iminor(inode);
+       int errCode = 0, radio = 0;
+       struct em28xx *h, *dev = NULL;
+       struct em28xx_fh *fh;
+       enum v4l2_buf_type fh_type = 0;
+
+       list_for_each_entry(h, &em28xx_devlist, devlist) {
+               if (h->vdev->minor == minor) {
+                       dev  = h;
+                       fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+               }
+               if (h->vbi_dev->minor == minor) {
+                       dev  = h;
+                       fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
                }
-
-       case VIDIOC_S_INPUT:
-               {
-                       int *index = arg;
-
-                       if (*index >= MAX_EM28XX_INPUT)
-                               return -EINVAL;
-                       if (0 == INPUT(*index)->type)
-                               return -EINVAL;
-
-                       down(&dev->lock);
-                       video_mux(dev, *index);
-                       up(&dev->lock);
-
-                       return 0;
+               if (h->radio_dev &&
+                   h->radio_dev->minor == minor) {
+                       radio = 1;
+                       dev   = h;
                }
+       }
+       if (NULL == dev)
+               return -ENODEV;
 
-       case VIDIOC_G_AUDIO:
-               {
-                       struct v4l2_audio *a = arg;
-                       unsigned int index = a->index;
-
-                       if (a->index > 1)
-                               return -EINVAL;
-                       memset(a, 0, sizeof(*a));
-                       index = dev->ctl_ainput;
-
-                       if (index == 0) {
-                               strcpy(a->name, "Television");
-                       } else {
-                               strcpy(a->name, "Line In");
-                       }
-                       a->capability = V4L2_AUDCAP_STEREO;
-                       a->index = index;
-                       return 0;
-               }
+       em28xx_videodbg("open minor=%d type=%s users=%d\n",
+                               minor, v4l2_type_names[fh_type], dev->users);
 
-       case VIDIOC_S_AUDIO:
-               {
-                       struct v4l2_audio *a = arg;
-                       if (a->index != dev->ctl_ainput)
-                               return -EINVAL;
 
-                       return 0;
-               }
+       fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
+       if (!fh) {
+               em28xx_errdev("em28xx-video.c: Out of memory?!\n");
+               return -ENOMEM;
+       }
+       mutex_lock(&dev->lock);
+       fh->dev = dev;
+       fh->radio = radio;
+       fh->type = fh_type;
+       filp->private_data = fh;
 
-               /* --- controls ---------------------------------------------- */
-       case VIDIOC_QUERYCTRL:
-               {
-                       struct v4l2_queryctrl *qc = arg;
-                       int i, id=qc->id;
-
-                       memset(qc,0,sizeof(*qc));
-                       qc->id=id;
-
-                       if (!dev->has_msp34xx) {
-                               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-                                       if (qc->id && qc->id == em28xx_qctrl[i].id) {
-                                               memcpy(qc, &(em28xx_qctrl[i]),
-                                               sizeof(*qc));
-                                               return 0;
-                                       }
-                               }
-                       }
-                       if (dev->decoder == EM28XX_TVP5150) {
-                               em28xx_i2c_call_clients(dev,cmd,qc);
-                               if (qc->type)
-                                       return 0;
-                               else
-                                       return -EINVAL;
-                       }
-                       for (i = 0; i < ARRAY_SIZE(saa711x_qctrl); i++) {
-                               if (qc->id && qc->id == saa711x_qctrl[i].id) {
-                                       memcpy(qc, &(saa711x_qctrl[i]),
-                                              sizeof(*qc));
-                                       return 0;
-                               }
-                       }
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->users == 0) {
+               dev->width = norm_maxw(dev);
+               dev->height = norm_maxh(dev);
+               dev->hscale = 0;
+               dev->vscale = 0;
 
-                       return -EINVAL;
-               }
+               em28xx_set_mode(dev, EM28XX_ANALOG_MODE);
+               em28xx_set_alternate(dev);
+               em28xx_resolution_set(dev);
 
-       case VIDIOC_G_CTRL:
-               {
-                       struct v4l2_control *ctrl = arg;
-                       int retval=-EINVAL;
-
-                       if (!dev->has_msp34xx)
-                               retval=em28xx_get_ctrl(dev, ctrl);
-                       if (retval==-EINVAL) {
-                               if (dev->decoder == EM28XX_TVP5150) {
-                                       em28xx_i2c_call_clients(dev,cmd,arg);
-                                       return 0;
-                               }
+               /* Needed, since GPIO might have disabled power of
+                  some i2c device
+                */
+               em28xx_config_i2c(dev);
 
-                               return saa711x_get_ctrl(dev, ctrl);
-                       } else return retval;
-               }
+       }
+       if (fh->radio) {
+               em28xx_videodbg("video_open: setting radio device\n");
+               em28xx_i2c_call_clients(dev, AUDC_SET_RADIO, NULL);
+       }
 
-       case VIDIOC_S_CTRL:
-               {
-                       struct v4l2_control *ctrl = arg;
-                       u8 i;
-
-                       if (!dev->has_msp34xx){
-                               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-                                       if (ctrl->id == em28xx_qctrl[i].id) {
-                                               if (ctrl->value <
-                                               em28xx_qctrl[i].minimum
-                                               || ctrl->value >
-                                               em28xx_qctrl[i].maximum)
-                                                       return -ERANGE;
-                                               return em28xx_set_ctrl(dev, ctrl);
-                                       }
-                               }
-                       }
+       dev->users++;
 
-                       if (dev->decoder == EM28XX_TVP5150) {
-                               em28xx_i2c_call_clients(dev,cmd,arg);
-                               return 0;
-                       } else if (!dev->has_msp34xx) {
-                               for (i = 0; i < ARRAY_SIZE(em28xx_qctrl); i++) {
-                                       if (ctrl->id == em28xx_qctrl[i].id) {
-                                               if (ctrl->value <
-                                               em28xx_qctrl[i].minimum
-                                               || ctrl->value >
-                                               em28xx_qctrl[i].maximum)
-                                                       return -ERANGE;
-                                               return em28xx_set_ctrl(dev, ctrl);
-                                       }
-                               }
-                               for (i = 0; i < ARRAY_SIZE(saa711x_qctrl); i++) {
-                                       if (ctrl->id == saa711x_qctrl[i].id) {
-                                               if (ctrl->value <
-                                               saa711x_qctrl[i].minimum
-                                               || ctrl->value >
-                                               saa711x_qctrl[i].maximum)
-                                                       return -ERANGE;
-                                               return saa711x_set_ctrl(dev, ctrl);
-                                       }
-                               }
-                       }
+       videobuf_queue_vmalloc_init(&fh->vb_vidq, &em28xx_video_qops,
+                       NULL, &dev->slock, fh->type, V4L2_FIELD_INTERLACED,
+                       sizeof(struct em28xx_buffer), fh);
 
-                       return -EINVAL;
-               }
+       mutex_unlock(&dev->lock);
 
-               /* --- tuner ioctls ------------------------------------------ */
-       case VIDIOC_G_TUNER:
-               {
-                       struct v4l2_tuner *t = arg;
-                       int status = 0;
-
-                       if (0 != t->index)
-                               return -EINVAL;
-
-                       memset(t, 0, sizeof(*t));
-                       strcpy(t->name, "Tuner");
-                       t->type = V4L2_TUNER_ANALOG_TV;
-                       t->capability = V4L2_TUNER_CAP_NORM;
-                       t->rangehigh = 0xffffffffUL;    /* FIXME: set correct range */
-/*             t->signal = 0xffff;*/
-/*             em28xx_i2c_call_clients(dev,VIDIOC_G_TUNER,t);*/
-                       /* No way to get signal strength? */
-                       down(&dev->lock);
-                       em28xx_i2c_call_clients(dev, DECODER_GET_STATUS,
-                                               &status);
-                       up(&dev->lock);
-                       t->signal =
-                           (status & DECODER_STATUS_GOOD) != 0 ? 0xffff : 0;
-
-                       em28xx_videodbg("VIDIO_G_TUNER: signal=%x, afc=%x\n", t->signal,
-                                t->afc);
-                       return 0;
-               }
-       case VIDIOC_S_TUNER:
-               {
-                       struct v4l2_tuner *t = arg;
-                       int status = 0;
-
-                       if (0 != t->index)
-                               return -EINVAL;
-                       memset(t, 0, sizeof(*t));
-                       strcpy(t->name, "Tuner");
-                       t->type = V4L2_TUNER_ANALOG_TV;
-                       t->capability = V4L2_TUNER_CAP_NORM;
-                       t->rangehigh = 0xffffffffUL;    /* FIXME: set correct range */
-/*             t->signal = 0xffff; */
-                       /* No way to get signal strength? */
-                       down(&dev->lock);
-                       em28xx_i2c_call_clients(dev, DECODER_GET_STATUS,
-                                               &status);
-                       up(&dev->lock);
-                       t->signal =
-                           (status & DECODER_STATUS_GOOD) != 0 ? 0xffff : 0;
-
-                       em28xx_videodbg("VIDIO_S_TUNER: signal=%x, afc=%x\n",
-                                t->signal, t->afc);
-                       return 0;
-               }
-       case VIDIOC_G_FREQUENCY:
-               {
-                       struct v4l2_frequency *f = arg;
+       return errCode;
+}
 
-                       memset(f, 0, sizeof(*f));
-                       f->type = V4L2_TUNER_ANALOG_TV;
-                       f->frequency = dev->ctl_freq;
+/*
+ * em28xx_realease_resources()
+ * unregisters the v4l2,i2c and usb devices
+ * called when the device gets disconected or at module unload
+*/
+static void em28xx_release_resources(struct em28xx *dev)
+{
 
-                       return 0;
-               }
-       case VIDIOC_S_FREQUENCY:
-               {
-                       struct v4l2_frequency *f = arg;
+       /*FIXME: I2C IR should be disconnected */
 
-                       if (0 != f->tuner)
-                               return -EINVAL;
+       em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
+                               dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
+                               dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+       list_del(&dev->devlist);
+       if (dev->sbutton_input_dev)
+               em28xx_deregister_snapshot_button(dev);
+       if (dev->radio_dev) {
+               if (-1 != dev->radio_dev->minor)
+                       video_unregister_device(dev->radio_dev);
+               else
+                       video_device_release(dev->radio_dev);
+               dev->radio_dev = NULL;
+       }
+       if (dev->vbi_dev) {
+               if (-1 != dev->vbi_dev->minor)
+                       video_unregister_device(dev->vbi_dev);
+               else
+                       video_device_release(dev->vbi_dev);
+               dev->vbi_dev = NULL;
+       }
+       if (dev->vdev) {
+               if (-1 != dev->vdev->minor)
+                       video_unregister_device(dev->vdev);
+               else
+                       video_device_release(dev->vdev);
+               dev->vdev = NULL;
+       }
+       em28xx_i2c_unregister(dev);
+       usb_put_dev(dev->udev);
 
-                       if (V4L2_TUNER_ANALOG_TV != f->type)
-                               return -EINVAL;
+       /* Mark device as unused */
+       em28xx_devused &= ~(1<<dev->devno);
+}
 
-                       down(&dev->lock);
-                       dev->ctl_freq = f->frequency;
-                       em28xx_i2c_call_clients(dev, VIDIOC_S_FREQUENCY, f);
-                       up(&dev->lock);
-                       return 0;
-               }
+/*
+ * em28xx_v4l2_close()
+ * stops streaming and deallocates all resources allocated by the v4l2
+ * calls and ioctls
+ */
+static int em28xx_v4l2_close(struct inode *inode, struct file *filp)
+{
+       struct em28xx_fh *fh  = filp->private_data;
+       struct em28xx    *dev = fh->dev;
+       int              errCode;
 
-       case VIDIOC_CROPCAP:
-               {
-                       struct v4l2_cropcap *cc = arg;
-
-                       if (cc->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                               return -EINVAL;
-                       cc->bounds.left = 0;
-                       cc->bounds.top = 0;
-                       cc->bounds.width = dev->width;
-                       cc->bounds.height = dev->height;
-                       cc->defrect = cc->bounds;
-                       cc->pixelaspect.numerator = 54; /* 4:3 FIXME: remove magic numbers */
-                       cc->pixelaspect.denominator = 59;
-                       return 0;
-               }
-       case VIDIOC_STREAMON:
-               {
-                       int *type = arg;
+       em28xx_videodbg("users=%d\n", dev->users);
 
-                       if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE
-                           || dev->io != IO_MMAP)
-                               return -EINVAL;
 
-                       if (list_empty(&dev->inqueue))
-                               return -EINVAL;
+       if (res_check(fh))
+               res_free(fh);
 
-                       dev->stream = STREAM_ON;        /* FIXME: Start video capture here? */
+       mutex_lock(&dev->lock);
 
-                       em28xx_videodbg("VIDIOC_STREAMON: starting stream\n");
+       if (dev->users == 1) {
+               videobuf_stop(&fh->vb_vidq);
+               videobuf_mmap_free(&fh->vb_vidq);
 
+               /* the device is already disconnect,
+                  free the remaining resources */
+               if (dev->state & DEV_DISCONNECTED) {
+                       em28xx_release_resources(dev);
+                       mutex_unlock(&dev->lock);
+                       kfree(dev);
                        return 0;
                }
-       case VIDIOC_STREAMOFF:
-               {
-                       int *type = arg;
-                       int ret;
-
-                       if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE
-                           || dev->io != IO_MMAP)
-                               return -EINVAL;
-
-                       if (dev->stream == STREAM_ON) {
-                               em28xx_videodbg ("VIDIOC_STREAMOFF: interrupting stream\n");
-                               if ((ret = em28xx_stream_interrupt(dev)))
-                                       return ret;
-                       }
-                       em28xx_empty_framequeues(dev);
 
-                       return 0;
+               /* do this before setting alternate! */
+               em28xx_uninit_isoc(dev);
+               em28xx_set_mode(dev, EM28XX_MODE_UNDEFINED);
+
+               /* set alternate 0 */
+               dev->alt = 0;
+               em28xx_videodbg("setting alternate 0\n");
+               errCode = usb_set_interface(dev->udev, 0, 0);
+               if (errCode < 0) {
+                       em28xx_errdev("cannot change alternate number to "
+                                       "0 (error=%i)\n", errCode);
                }
-       default:
-               return v4l_compat_translate_ioctl(inode, filp, cmd, arg,
-                                                 driver_ioctl);
        }
+       kfree(fh);
+       dev->users--;
+       wake_up_interruptible_nr(&dev->open, 1);
+       mutex_unlock(&dev->lock);
        return 0;
 }
 
 /*
- * em28xx_v4l2_do_ioctl()
- * This function is _not_ called directly, but from
- * em28xx_v4l2_ioctl. Userspace
- * copying is done already, arg is a kernel pointer.
+ * em28xx_v4l2_read()
+ * will allocate buffers when called for the first time
  */
-static int em28xx_video_do_ioctl(struct inode *inode, struct file *filp,
-                                unsigned int cmd, void *arg)
+static ssize_t
+em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
+                loff_t *pos)
 {
-       struct em28xx *dev = filp->private_data;
+       struct em28xx_fh *fh = filp->private_data;
+       struct em28xx *dev = fh->dev;
+       int rc;
 
-       if (!dev)
-               return -ENODEV;
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
 
-       if (video_debug > 1)
-               v4l_print_ioctl(dev->name,cmd);
-
-       switch (cmd) {
-
-               /* --- capabilities ------------------------------------------ */
-       case VIDIOC_QUERYCAP:
-               {
-                       struct v4l2_capability *cap = arg;
-
-                       memset(cap, 0, sizeof(*cap));
-                       strlcpy(cap->driver, "em28xx", sizeof(cap->driver));
-                       strlcpy(cap->card, em28xx_boards[dev->model].name,
-                               sizeof(cap->card));
-                       strlcpy(cap->bus_info, dev->udev->dev.bus_id,
-                               sizeof(cap->bus_info));
-                       cap->version = EM28XX_VERSION_CODE;
-                       cap->capabilities =
-                           V4L2_CAP_SLICED_VBI_CAPTURE |
-                           V4L2_CAP_VIDEO_CAPTURE |
-                           V4L2_CAP_AUDIO |
-                           V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
-                       if (dev->has_tuner)
-                               cap->capabilities |= V4L2_CAP_TUNER;
-                       return 0;
-               }
+       /* FIXME: read() is not prepared to allow changing the video
+          resolution while streaming. Seems a bug at em28xx_set_fmt
+        */
 
-               /* --- capture ioctls ---------------------------------------- */
-       case VIDIOC_ENUM_FMT:
-               {
-                       struct v4l2_fmtdesc *fmtd = arg;
-
-                       if (fmtd->index != 0)
-                               return -EINVAL;
-                       memset(fmtd, 0, sizeof(*fmtd));
-                       fmtd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                       strcpy(fmtd->description, "Packed YUY2");
-                       fmtd->pixelformat = V4L2_PIX_FMT_YUYV;
-                       memset(fmtd->reserved, 0, sizeof(fmtd->reserved));
-                       return 0;
-               }
+       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               if (unlikely(res_get(fh)))
+                       return -EBUSY;
 
-       case VIDIOC_G_FMT:
-               return em28xx_get_fmt(dev, (struct v4l2_format *) arg);
-
-       case VIDIOC_TRY_FMT:
-       case VIDIOC_S_FMT:
-               {
-                       struct v4l2_format *format = arg;
-                       u32 i;
-                       int ret = 0;
-                       int width = format->fmt.pix.width;
-                       int height = format->fmt.pix.height;
-                       unsigned int hscale, vscale;
-                       unsigned int maxh, maxw;
-
-                       maxw = norm_maxw(dev);
-                       maxh = norm_maxh(dev);
-
-/*             int both_fields; */
-
-                       em28xx_videodbg("%s: type=%s\n",
-                                cmd ==
-                                VIDIOC_TRY_FMT ? "VIDIOC_TRY_FMT" :
-                                "VIDIOC_S_FMT",
-                                format->type ==
-                                V4L2_BUF_TYPE_VIDEO_CAPTURE ?
-                                "V4L2_BUF_TYPE_VIDEO_CAPTURE" : format->type ==
-                                V4L2_BUF_TYPE_VBI_CAPTURE ?
-                                "V4L2_BUF_TYPE_VBI_CAPTURE " :
-                                "not supported");
-
-                       if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                               return -EINVAL;
-
-                       em28xx_videodbg("%s: requested %dx%d\n",
-                                cmd ==
-                                VIDIOC_TRY_FMT ? "VIDIOC_TRY_FMT" :
-                                "VIDIOC_S_FMT", format->fmt.pix.width,
-                                format->fmt.pix.height);
-
-                       /* FIXME: Move some code away from here */
-                       /* width must even because of the YUYV format */
-                       /* height must be even because of interlacing */
-                       height &= 0xfffe;
-                       width &= 0xfffe;
-
-                       if (height < 32)
-                               height = 32;
-                       if (height > maxh)
-                               height = maxh;
-                       if (width < 48)
-                               width = 48;
-                       if (width > maxw)
-                               width = maxw;
-
-                       if(dev->is_em2800){
-                               /* the em2800 can only scale down to 50% */
-                               if(height % (maxh / 2))
-                                       height=maxh;
-                               if(width % (maxw / 2))
-                                       width=maxw;
-                               /* according to empiatech support */
-                               /* the MaxPacketSize is to small to support */
-                               /* framesizes larger than 640x480 @ 30 fps */
-                               /* or 640x576 @ 25 fps. As this would cut */
-                               /* of a part of the image we prefer */
-                               /* 360x576 or 360x480 for now */
-                               if(width == maxw && height == maxh)
-                                       width /= 2;
-                       }
+               return videobuf_read_stream(&fh->vb_vidq, buf, count, pos, 0,
+                                       filp->f_flags & O_NONBLOCK);
+       }
+       return 0;
+}
 
-                       if ((hscale =
-                            (((unsigned long)maxw) << 12) / width - 4096L) >=
-                           0x4000)
-                               hscale = 0x3fff;
-                       width =
-                           (((unsigned long)maxw) << 12) / (hscale + 4096L);
-
-                       if ((vscale =
-                            (((unsigned long)maxh) << 12) / height - 4096L) >=
-                           0x4000)
-                               vscale = 0x3fff;
-                       height =
-                           (((unsigned long)maxh) << 12) / (vscale + 4096L);
-
-                       format->fmt.pix.width = width;
-                       format->fmt.pix.height = height;
-                       format->fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
-                       format->fmt.pix.bytesperline = width * 2;
-                       format->fmt.pix.sizeimage = width * 2 * height;
-                       format->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
-                       format->fmt.pix.field = V4L2_FIELD_INTERLACED;
-
-                       em28xx_videodbg("%s: returned %dx%d (%d, %d)\n",
-                                cmd ==
-                                VIDIOC_TRY_FMT ? "VIDIOC_TRY_FMT" :
-                                "VIDIOC_S_FMT", format->fmt.pix.width,
-                                format->fmt.pix.height, hscale, vscale);
-
-                       if (cmd == VIDIOC_TRY_FMT)
-                               return 0;
+/*
+ * em28xx_v4l2_poll()
+ * will allocate buffers when called for the first time
+ */
+static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table * wait)
+{
+       struct em28xx_fh *fh = filp->private_data;
+       struct em28xx *dev = fh->dev;
+       int rc;
 
-                       for (i = 0; i < dev->num_frames; i++)
-                               if (dev->frame[i].vma_use_count) {
-                                       em28xx_videodbg("VIDIOC_S_FMT failed. "
-                                               "Unmap the buffers first.\n");
-                                       return -EINVAL;
-                               }
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
 
-                       /* stop io in case it is already in progress */
-                       if (dev->stream == STREAM_ON) {
-                               em28xx_videodbg("VIDIOC_SET_FMT: interupting stream\n");
-                               if ((ret = em28xx_stream_interrupt(dev)))
-                                       return ret;
-                       }
+       if (unlikely(res_get(fh) < 0))
+               return POLLERR;
 
-                       em28xx_release_buffers(dev);
-                       dev->io = IO_NONE;
-
-                       /* set new image size */
-                       dev->width = width;
-                       dev->height = height;
-                       dev->frame_size = dev->width * dev->height * 2;
-                       dev->field_size = dev->frame_size >> 1; /*both_fileds ? dev->frame_size>>1 : dev->frame_size; */
-                       dev->bytesperline = dev->width * 2;
-                       dev->hscale = hscale;
-                       dev->vscale = vscale;
-/*                     dev->both_fileds = both_fileds; */
-                       em28xx_uninit_isoc(dev);
-                       em28xx_set_alternate(dev);
-                       em28xx_capture_start(dev, 1);
-                       em28xx_resolution_set(dev);
-                       em28xx_init_isoc(dev);
+       if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
+               return POLLERR;
 
-                       return 0;
-               }
+       return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
+}
 
-               /* --- streaming capture ------------------------------------- */
-       case VIDIOC_REQBUFS:
-               {
-                       struct v4l2_requestbuffers *rb = arg;
-                       u32 i;
-                       int ret;
-
-                       if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                           rb->memory != V4L2_MEMORY_MMAP)
-                               return -EINVAL;
-
-                       if (dev->io == IO_READ) {
-                               em28xx_videodbg ("method is set to read;"
-                                       " close and open the device again to"
-                                       " choose the mmap I/O method\n");
-                               return -EINVAL;
-                       }
+/*
+ * em28xx_v4l2_mmap()
+ */
+static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+       struct em28xx_fh *fh    = filp->private_data;
+       struct em28xx    *dev   = fh->dev;
+       int              rc;
 
-                       for (i = 0; i < dev->num_frames; i++)
-                               if (dev->frame[i].vma_use_count) {
-                                       em28xx_videodbg ("VIDIOC_REQBUFS failed; previous buffers are still mapped\n");
-                                       return -EINVAL;
-                               }
+       if (unlikely(res_get(fh) < 0))
+               return -EBUSY;
 
-                       if (dev->stream == STREAM_ON) {
-                               em28xx_videodbg("VIDIOC_REQBUFS: interrupting stream\n");
-                               if ((ret = em28xx_stream_interrupt(dev)))
-                                       return ret;
-                       }
+       rc = check_dev(dev);
+       if (rc < 0)
+               return rc;
+
+       rc = videobuf_mmap_mapper(&fh->vb_vidq, vma);
 
-                       em28xx_empty_framequeues(dev);
+       em28xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n",
+               (unsigned long)vma->vm_start,
+               (unsigned long)vma->vm_end-(unsigned long)vma->vm_start,
+               rc);
 
-                       em28xx_release_buffers(dev);
-                       if (rb->count)
-                               rb->count =
-                                   em28xx_request_buffers(dev, rb->count);
+       return rc;
+}
 
-                       dev->frame_current = NULL;
+static const struct file_operations em28xx_v4l_fops = {
+       .owner         = THIS_MODULE,
+       .open          = em28xx_v4l2_open,
+       .release       = em28xx_v4l2_close,
+       .read          = em28xx_v4l2_read,
+       .poll          = em28xx_v4l2_poll,
+       .mmap          = em28xx_v4l2_mmap,
+       .ioctl         = video_ioctl2,
+       .llseek        = no_llseek,
+       .compat_ioctl  = v4l_compat_ioctl32,
+};
 
-                       em28xx_videodbg ("VIDIOC_REQBUFS: setting io method to mmap: num bufs %i\n",
-                                                    rb->count);
-                       dev->io = rb->count ? IO_MMAP : IO_NONE;
-                       return 0;
-               }
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
+       .vidioc_querycap            = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap    = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap       = vidioc_g_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap     = vidioc_try_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap       = vidioc_s_fmt_vid_cap,
+       .vidioc_g_audio             = vidioc_g_audio,
+       .vidioc_s_audio             = vidioc_s_audio,
+       .vidioc_cropcap             = vidioc_cropcap,
+
+       .vidioc_g_fmt_sliced_vbi_cap   = vidioc_g_fmt_sliced_vbi_cap,
+       .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,
+       .vidioc_s_fmt_sliced_vbi_cap   = vidioc_try_set_sliced_vbi_cap,
+
+       .vidioc_reqbufs             = vidioc_reqbufs,
+       .vidioc_querybuf            = vidioc_querybuf,
+       .vidioc_qbuf                = vidioc_qbuf,
+       .vidioc_dqbuf               = vidioc_dqbuf,
+       .vidioc_s_std               = vidioc_s_std,
+       .vidioc_enum_input          = vidioc_enum_input,
+       .vidioc_g_input             = vidioc_g_input,
+       .vidioc_s_input             = vidioc_s_input,
+       .vidioc_queryctrl           = vidioc_queryctrl,
+       .vidioc_g_ctrl              = vidioc_g_ctrl,
+       .vidioc_s_ctrl              = vidioc_s_ctrl,
+       .vidioc_streamon            = vidioc_streamon,
+       .vidioc_streamoff           = vidioc_streamoff,
+       .vidioc_g_tuner             = vidioc_g_tuner,
+       .vidioc_s_tuner             = vidioc_s_tuner,
+       .vidioc_g_frequency         = vidioc_g_frequency,
+       .vidioc_s_frequency         = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register          = vidioc_g_register,
+       .vidioc_s_register          = vidioc_s_register,
+#endif
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+       .vidiocgmbuf                = vidiocgmbuf,
+#endif
+};
 
-       case VIDIOC_QUERYBUF:
-               {
-                       struct v4l2_buffer *b = arg;
+static const struct video_device em28xx_video_template = {
+       .fops                       = &em28xx_v4l_fops,
+       .release                    = video_device_release,
+       .ioctl_ops                  = &video_ioctl_ops,
 
-                       if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                           b->index >= dev->num_frames || dev->io != IO_MMAP)
-                               return -EINVAL;
+       .minor                      = -1,
 
-                       memcpy(b, &dev->frame[b->index].buf, sizeof(*b));
+       .tvnorms                    = V4L2_STD_ALL,
+       .current_norm               = V4L2_STD_PAL,
+};
 
-                       if (dev->frame[b->index].vma_use_count) {
-                               b->flags |= V4L2_BUF_FLAG_MAPPED;
-                       }
-                       if (dev->frame[b->index].state == F_DONE)
-                               b->flags |= V4L2_BUF_FLAG_DONE;
-                       else if (dev->frame[b->index].state != F_UNUSED)
-                               b->flags |= V4L2_BUF_FLAG_QUEUED;
-                       return 0;
-               }
-       case VIDIOC_QBUF:
-               {
-                       struct v4l2_buffer *b = arg;
-                       unsigned long lock_flags;
-
-                       if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
-                           b->index >= dev->num_frames || dev->io != IO_MMAP) {
-                               return -EINVAL;
-                       }
+static const struct file_operations radio_fops = {
+       .owner         = THIS_MODULE,
+       .open          = em28xx_v4l2_open,
+       .release       = em28xx_v4l2_close,
+       .ioctl         = video_ioctl2,
+       .compat_ioctl  = v4l_compat_ioctl32,
+       .llseek        = no_llseek,
+};
 
-                       if (dev->frame[b->index].state != F_UNUSED) {
-                               return -EAGAIN;
-                       }
-                       dev->frame[b->index].state = F_QUEUED;
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
+       .vidioc_querycap      = radio_querycap,
+       .vidioc_g_tuner       = radio_g_tuner,
+       .vidioc_enum_input    = radio_enum_input,
+       .vidioc_g_audio       = radio_g_audio,
+       .vidioc_s_tuner       = radio_s_tuner,
+       .vidioc_s_audio       = radio_s_audio,
+       .vidioc_s_input       = radio_s_input,
+       .vidioc_queryctrl     = radio_queryctrl,
+       .vidioc_g_ctrl        = vidioc_g_ctrl,
+       .vidioc_s_ctrl        = vidioc_s_ctrl,
+       .vidioc_g_frequency   = vidioc_g_frequency,
+       .vidioc_s_frequency   = vidioc_s_frequency,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+       .vidioc_g_register    = vidioc_g_register,
+       .vidioc_s_register    = vidioc_s_register,
+#endif
+};
 
-                       /* add frame to fifo */
-                       spin_lock_irqsave(&dev->queue_lock, lock_flags);
-                       list_add_tail(&dev->frame[b->index].frame,
-                                     &dev->inqueue);
-                       spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
+static struct video_device em28xx_radio_template = {
+       .name                 = "em28xx-radio",
+       .type                 = VID_TYPE_TUNER,
+       .fops                 = &radio_fops,
+       .ioctl_ops            = &radio_ioctl_ops,
+       .minor                = -1,
+};
 
-                       return 0;
-               }
-       case VIDIOC_DQBUF:
-               {
-                       struct v4l2_buffer *b = arg;
-                       struct em28xx_frame_t *f;
-                       unsigned long lock_flags;
-                       int ret = 0;
-
-                       if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE
-                           || dev->io != IO_MMAP)
-                               return -EINVAL;
-
-                       if (list_empty(&dev->outqueue)) {
-                               if (dev->stream == STREAM_OFF)
-                                       return -EINVAL;
-                               if (filp->f_flags & O_NONBLOCK)
-                                       return -EAGAIN;
-                               ret = wait_event_interruptible
-                                   (dev->wait_frame,
-                                    (!list_empty(&dev->outqueue)) ||
-                                    (dev->state & DEV_DISCONNECTED));
-                               if (ret)
-                                       return ret;
-                               if (dev->state & DEV_DISCONNECTED)
-                                       return -ENODEV;
-                       }
+/******************************** usb interface ******************************/
 
-                       spin_lock_irqsave(&dev->queue_lock, lock_flags);
-                       f = list_entry(dev->outqueue.next,
-                                      struct em28xx_frame_t, frame);
-                       list_del(dev->outqueue.next);
-                       spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
 
-                       f->state = F_UNUSED;
-                       memcpy(b, &f->buf, sizeof(*b));
+static LIST_HEAD(em28xx_extension_devlist);
+static DEFINE_MUTEX(em28xx_extension_devlist_lock);
 
-                       if (f->vma_use_count)
-                               b->flags |= V4L2_BUF_FLAG_MAPPED;
+int em28xx_register_extension(struct em28xx_ops *ops)
+{
+       struct em28xx *dev = NULL;
 
-                       return 0;
-               }
-       default:
-               return em28xx_do_ioctl(inode, filp, dev, cmd, arg,
-                                      em28xx_video_do_ioctl);
+       mutex_lock(&em28xx_extension_devlist_lock);
+       list_add_tail(&ops->next, &em28xx_extension_devlist);
+       list_for_each_entry(dev, &em28xx_devlist, devlist) {
+               if (dev)
+                       ops->init(dev);
        }
+       printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name);
+       mutex_unlock(&em28xx_extension_devlist_lock);
        return 0;
 }
+EXPORT_SYMBOL(em28xx_register_extension);
 
-/*
- * em28xx_v4l2_ioctl()
- * handle v4l2 ioctl the main action happens in em28xx_v4l2_do_ioctl()
- */
-static int em28xx_v4l2_ioctl(struct inode *inode, struct file *filp,
-                            unsigned int cmd, unsigned long arg)
+void em28xx_unregister_extension(struct em28xx_ops *ops)
 {
-       int ret = 0;
-       struct em28xx *dev = filp->private_data;
-
-       if (down_interruptible(&dev->fileop_lock))
-               return -ERESTARTSYS;
-
-       if (dev->state & DEV_DISCONNECTED) {
-               em28xx_errdev("v4l2 ioctl: device not present\n");
-               up(&dev->fileop_lock);
-               return -ENODEV;
-       }
+       struct em28xx *dev = NULL;
 
-       if (dev->state & DEV_MISCONFIGURED) {
-               em28xx_errdev
-                   ("v4l2 ioctl: device is misconfigured; close and open it again\n");
-               up(&dev->fileop_lock);
-               return -EIO;
+       list_for_each_entry(dev, &em28xx_devlist, devlist) {
+               if (dev)
+                       ops->fini(dev);
        }
 
-       ret = video_usercopy(inode, filp, cmd, arg, em28xx_video_do_ioctl);
-
-       up(&dev->fileop_lock);
-
-       return ret;
+       mutex_lock(&em28xx_extension_devlist_lock);
+       printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name);
+       list_del(&ops->next);
+       mutex_unlock(&em28xx_extension_devlist_lock);
 }
+EXPORT_SYMBOL(em28xx_unregister_extension);
 
-static struct file_operations em28xx_v4l_fops = {
-       .owner = THIS_MODULE,
-       .open = em28xx_v4l2_open,
-       .release = em28xx_v4l2_close,
-       .ioctl = em28xx_v4l2_ioctl,
-       .read = em28xx_v4l2_read,
-       .poll = em28xx_v4l2_poll,
-       .mmap = em28xx_v4l2_mmap,
-       .llseek = no_llseek,
-       .compat_ioctl   = v4l_compat_ioctl32,
-
-};
+static struct video_device *em28xx_vdev_init(struct em28xx *dev,
+                                            const struct video_device *template,
+                                            const int type,
+                                            const char *type_name)
+{
+       struct video_device *vfd;
+
+       vfd = video_device_alloc();
+       if (NULL == vfd)
+               return NULL;
+       *vfd = *template;
+       vfd->minor   = -1;
+       vfd->parent = &dev->udev->dev;
+       vfd->release = video_device_release;
+       vfd->type = type;
+       vfd->debug = video_debug;
+
+       snprintf(vfd->name, sizeof(vfd->name), "%s %s",
+                dev->name, type_name);
+
+       return vfd;
+}
 
-/******************************** usb interface *****************************************/
 
 /*
  * em28xx_init_dev()
  * allocates and inits the device structs, registers i2c bus and v4l device
  */
 static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
-                          int minor, int model)
+                          int minor)
 {
+       struct em28xx_ops *ops = NULL;
        struct em28xx *dev = *devhandle;
        int retval = -ENOMEM;
-       int errCode, i;
+       int errCode;
        unsigned int maxh, maxw;
 
        dev->udev = udev;
-       dev->model = model;
-       init_MUTEX(&dev->lock);
+       mutex_init(&dev->lock);
+       spin_lock_init(&dev->slock);
        init_waitqueue_head(&dev->open);
+       init_waitqueue_head(&dev->wait_frame);
+       init_waitqueue_head(&dev->wait_stream);
 
        dev->em28xx_write_regs = em28xx_write_regs;
        dev->em28xx_read_reg = em28xx_read_reg;
        dev->em28xx_read_reg_req_len = em28xx_read_reg_req_len;
        dev->em28xx_write_regs_req = em28xx_write_regs_req;
        dev->em28xx_read_reg_req = em28xx_read_reg_req;
-       dev->is_em2800 = em28xx_boards[model].is_em2800;
-       dev->has_tuner = em28xx_boards[model].has_tuner;
-       dev->has_msp34xx = em28xx_boards[model].has_msp34xx;
-       dev->tda9887_conf = em28xx_boards[model].tda9887_conf;
-       dev->decoder = em28xx_boards[model].decoder;
-
-       if (tuner >= 0)
-               dev->tuner_type = tuner;
-       else
-               dev->tuner_type = em28xx_boards[model].tuner_type;
-
-       dev->video_inputs = em28xx_boards[model].vchannels;
-
-       for (i = 0; i < TVNORMS; i++)
-               if (em28xx_boards[model].norm == tvnorms[i].mode)
-                       break;
-       if (i == TVNORMS)
-               i = 0;
-
-       dev->tvnorm = &tvnorms[i];      /* set default norm */
-
-       em28xx_videodbg("tvnorm=%s\n", dev->tvnorm->name);
-
-       maxw = norm_maxw(dev);
-       maxh = norm_maxh(dev);
+       dev->is_em2800 = em28xx_boards[dev->model].is_em2800;
 
-       /* set default image size */
-       dev->width = maxw;
-       dev->height = maxh;
-       dev->interlaced = EM28XX_INTERLACED_DEFAULT;
-       dev->field_size = dev->width * dev->height;
-       dev->frame_size =
-           dev->interlaced ? dev->field_size << 1 : dev->field_size;
-       dev->bytesperline = dev->width * 2;
-       dev->hscale = 0;
-       dev->vscale = 0;
-       dev->ctl_input = 2;
+       em28xx_pre_card_setup(dev);
 
-       /* setup video picture settings for saa7113h */
-       memset(&dev->vpic, 0, sizeof(dev->vpic));
-       dev->vpic.colour = 128 << 8;
-       dev->vpic.hue = 128 << 8;
-       dev->vpic.brightness = 128 << 8;
-       dev->vpic.contrast = 192 << 8;
-       dev->vpic.whiteness = 128 << 8; /* This one isn't used */
-       dev->vpic.depth = 16;
-       dev->vpic.palette = VIDEO_PALETTE_YUV422;
-
-#ifdef CONFIG_MODULES
-       /* request some modules */
-       if (dev->decoder == EM28XX_SAA7113 || dev->decoder == EM28XX_SAA7114)
-               request_module("saa711x");
-       if (dev->decoder == EM28XX_TVP5150)
-               request_module("tvp5150");
-       if (dev->has_tuner)
-               request_module("tuner");
-       if (dev->tda9887_conf)
-               request_module("tda9887");
-#endif
        errCode = em28xx_config(dev);
        if (errCode) {
                em28xx_errdev("error configuring device\n");
+               em28xx_devused &= ~(1<<dev->devno);
                kfree(dev);
-               em28xx_devused&=~(1<<dev->devno);
                return -ENOMEM;
        }
 
-       down(&dev->lock);
        /* register i2c bus */
        em28xx_i2c_register(dev);
 
        /* Do board specific init and eeprom reading */
        em28xx_card_setup(dev);
 
+       /* Configure audio */
+       em28xx_audio_analog_set(dev);
+
        /* configure the device */
        em28xx_config_i2c(dev);
 
-       up(&dev->lock);
+       /* set default norm */
+       dev->norm = em28xx_video_template.current_norm;
+
+       maxw = norm_maxw(dev);
+       maxh = norm_maxh(dev);
+
+       /* set default image size */
+       dev->width = maxw;
+       dev->height = maxh;
+       dev->interlaced = EM28XX_INTERLACED_DEFAULT;
+       dev->hscale = 0;
+       dev->vscale = 0;
+       dev->ctl_input = 2;
 
        errCode = em28xx_config(dev);
 
-#ifdef CONFIG_MODULES
-       if (dev->has_msp34xx)
-               request_module("msp3400");
-#endif
-       /* allocate and fill v4l2 device struct */
-       dev->vdev = video_device_alloc();
-       if (NULL == dev->vdev) {
-               em28xx_errdev("cannot allocate video_device.\n");
-               kfree(dev);
-               em28xx_devused&=~(1<<dev->devno);
-               return -ENOMEM;
-       }
+       list_add_tail(&dev->devlist, &em28xx_devlist);
 
-       dev->vbi_dev = video_device_alloc();
-       if (NULL == dev->vbi_dev) {
+       /* allocate and fill video video_device struct */
+       dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template,
+                                         VID_TYPE_CAPTURE, "video");
+       if (NULL == dev->vdev) {
                em28xx_errdev("cannot allocate video_device.\n");
-               kfree(dev->vdev);
-               kfree(dev);
-               em28xx_devused&=~(1<<dev->devno);
-               return -ENOMEM;
+               goto fail_unreg;
        }
-
-       /* Fills VBI device info */
-       dev->vbi_dev->type = VFL_TYPE_VBI;
-       dev->vbi_dev->hardware = 0;
-       dev->vbi_dev->fops = &em28xx_v4l_fops;
-       dev->vbi_dev->minor = -1;
-       dev->vbi_dev->dev = &dev->udev->dev;
-       dev->vbi_dev->release = video_device_release;
-       snprintf(dev->vbi_dev->name, sizeof(dev->vbi_dev->name), "%s#%d %s",
-                                                        "em28xx",dev->devno,"vbi");
-
-       /* Fills CAPTURE device info */
-       dev->vdev->type = VID_TYPE_CAPTURE;
-       if (dev->has_tuner)
+       if (dev->tuner_type != TUNER_ABSENT)
                dev->vdev->type |= VID_TYPE_TUNER;
-       dev->vdev->hardware = 0;
-       dev->vdev->fops = &em28xx_v4l_fops;
-       dev->vdev->minor = -1;
-       dev->vdev->dev = &dev->udev->dev;
-       dev->vdev->release = video_device_release;
-       snprintf(dev->vdev->name, sizeof(dev->vbi_dev->name), "%s#%d %s",
-                                                        "em28xx",dev->devno,"video");
-
-       list_add_tail(&dev->devlist,&em28xx_devlist);
-
-       /* register v4l2 device */
-       down(&dev->lock);
-       if ((retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
-                                        video_nr[dev->devno]))) {
+
+       /* register v4l2 video video_device */
+       retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
+                                      video_nr[dev->devno]);
+       if (retval) {
                em28xx_errdev("unable to register video device (error=%i).\n",
                              retval);
-               up(&dev->lock);
-               list_del(&dev->devlist);
-               video_device_release(dev->vdev);
-               kfree(dev);
-               em28xx_devused&=~(1<<dev->devno);
-               return -ENODEV;
+               goto fail_unreg;
        }
 
+       /* Allocate and fill vbi video_device struct */
+       dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template,
+                                         VFL_TYPE_VBI, "vbi");
+       /* register v4l2 vbi video_device */
        if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
                                        vbi_nr[dev->devno]) < 0) {
-               printk("unable to register vbi device\n");
-               up(&dev->lock);
-               list_del(&dev->devlist);
-               video_device_release(dev->vbi_dev);
-               video_device_release(dev->vdev);
-               kfree(dev);
-               em28xx_devused&=~(1<<dev->devno);
-               return -ENODEV;
-       } else {
-               printk("registered VBI\n");
+               em28xx_errdev("unable to register vbi device\n");
+               retval = -ENODEV;
+               goto fail_unreg;
        }
 
+       if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) {
+               dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template,
+                                       VFL_TYPE_RADIO, "radio");
+               if (NULL == dev->radio_dev) {
+                       em28xx_errdev("cannot allocate video_device.\n");
+                       goto fail_unreg;
+               }
+               retval = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
+                                           radio_nr[dev->devno]);
+               if (retval < 0) {
+                       em28xx_errdev("can't register radio device\n");
+                       goto fail_unreg;
+               }
+               em28xx_info("Registered radio device as /dev/radio%d\n",
+                           dev->radio_dev->minor & 0x1f);
+       }
+
+       /* init video dma queues */
+       INIT_LIST_HEAD(&dev->vidq.active);
+       INIT_LIST_HEAD(&dev->vidq.queued);
+
+
        if (dev->has_msp34xx) {
                /* Send a reset to other chips via gpio */
                em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
-               udelay(2500);
+               msleep(3);
                em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
-               udelay(2500);
-
+               msleep(3);
        }
-       video_mux(dev, 0);
 
-       up(&dev->lock);
+       video_mux(dev, 0);
 
        em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
 
+       mutex_lock(&em28xx_extension_devlist_lock);
+       if (!list_empty(&em28xx_extension_devlist)) {
+               list_for_each_entry(ops, &em28xx_extension_devlist, next) {
+                       if (ops->id)
+                               ops->init(dev);
+               }
+       }
+       mutex_unlock(&em28xx_extension_devlist_lock);
+
        return 0;
+
+fail_unreg:
+       em28xx_release_resources(dev);
+       mutex_unlock(&dev->lock);
+       kfree(dev);
+       return retval;
+}
+
+#if defined(CONFIG_MODULES) && defined(MODULE)
+static void request_module_async(struct work_struct *work)
+{
+       struct em28xx *dev = container_of(work,
+                            struct em28xx, request_module_wk);
+
+       if (dev->has_audio_class)
+               request_module("snd-usb-audio");
+       else
+               request_module("em28xx-alsa");
+
+       if (dev->has_dvb)
+               request_module("em28xx-dvb");
+}
+
+static void request_modules(struct em28xx *dev)
+{
+       INIT_WORK(&dev->request_module_wk, request_module_async);
+       schedule_work(&dev->request_module_wk);
 }
+#else
+#define request_modules(dev)
+#endif /* CONFIG_MODULES */
 
 /*
  * em28xx_usb_probe()
@@ -1917,51 +2100,52 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        struct usb_interface *uif;
        struct em28xx *dev = NULL;
        int retval = -ENODEV;
-       int model,i,nr,ifnum;
+       int i, nr, ifnum;
 
        udev = usb_get_dev(interface_to_usbdev(interface));
        ifnum = interface->altsetting[0].desc.bInterfaceNumber;
 
        /* Check to see next free device and mark as used */
-       nr=find_first_zero_bit(&em28xx_devused,EM28XX_MAXBOARDS);
-       em28xx_devused|=1<<nr;
+       nr = find_first_zero_bit(&em28xx_devused, EM28XX_MAXBOARDS);
+       em28xx_devused |= 1<<nr;
 
        /* Don't register audio interfaces */
        if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
                em28xx_err(DRIVER_NAME " audio device (%04x:%04x): interface %i, class %i\n",
-                               udev->descriptor.idVendor,udev->descriptor.idProduct,
+                               udev->descriptor.idVendor,
+                               udev->descriptor.idProduct,
                                ifnum,
                                interface->altsetting[0].desc.bInterfaceClass);
 
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
 
        em28xx_err(DRIVER_NAME " new video device (%04x:%04x): interface %i, class %i\n",
-                       udev->descriptor.idVendor,udev->descriptor.idProduct,
+                       udev->descriptor.idVendor,
+                       udev->descriptor.idProduct,
                        ifnum,
                        interface->altsetting[0].desc.bInterfaceClass);
 
        endpoint = &interface->cur_altsetting->endpoint[1].desc;
 
-       /* check if the the device has the iso in endpoint at the correct place */
+       /* check if the device has the iso in endpoint at the correct place */
        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
            USB_ENDPOINT_XFER_ISOC) {
                em28xx_err(DRIVER_NAME " probing error: endpoint is non-ISO endpoint!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
                em28xx_err(DRIVER_NAME " probing error: endpoint is ISO OUT endpoint!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENODEV;
        }
 
-       model=id->driver_info;
-
-       if (nr > EM28XX_MAXBOARDS) {
-               printk (DRIVER_NAME ": Supports only %i em28xx boards.\n",EM28XX_MAXBOARDS);
-               em28xx_devused&=~(1<<nr);
+       if (nr >= EM28XX_MAXBOARDS) {
+               printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
+                               EM28XX_MAXBOARDS);
+               em28xx_devused &= ~(1<<nr);
                return -ENOMEM;
        }
 
@@ -1969,24 +2153,39 @@ static int em28xx_usb_probe(struct usb_interface *interface,
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {
                em28xx_err(DRIVER_NAME ": out of memory!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
                return -ENOMEM;
        }
 
        snprintf(dev->name, 29, "em28xx #%d", nr);
-       dev->devno=nr;
+       dev->devno = nr;
+       dev->model = id->driver_info;
+       dev->alt   = -1;
+
+       /* Checks if audio is provided by some interface */
+       for (i = 0; i < udev->config->desc.bNumInterfaces; i++) {
+               uif = udev->config->interface[i];
+               if (uif->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
+                       dev->has_audio_class = 1;
+                       break;
+               }
+       }
+
+       printk(KERN_INFO DRIVER_NAME " %s usb audio class\n",
+                  dev->has_audio_class ? "Has" : "Doesn't have");
 
        /* compute alternate max packet sizes */
        uif = udev->actconfig->interface[0];
 
-       dev->num_alt=uif->num_altsetting;
-       em28xx_info("Alternate settings: %i\n",dev->num_alt);
-//     dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)*
-       dev->alt_max_pkt_size = kmalloc(32*
-                                               dev->num_alt,GFP_KERNEL);
+       dev->num_alt = uif->num_altsetting;
+       em28xx_info("Alternate settings: %i\n", dev->num_alt);
+/*     dev->alt_max_pkt_size = kmalloc(sizeof(*dev->alt_max_pkt_size)* */
+       dev->alt_max_pkt_size = kmalloc(32 * dev->num_alt, GFP_KERNEL);
+
        if (dev->alt_max_pkt_size == NULL) {
                em28xx_errdev("out of memory!\n");
-               em28xx_devused&=~(1<<nr);
+               em28xx_devused &= ~(1<<nr);
+               kfree(dev);
                return -ENOMEM;
        }
 
@@ -1995,38 +2194,25 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                                                        wMaxPacketSize);
                dev->alt_max_pkt_size[i] =
                    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-               em28xx_info("Alternate setting %i, max size= %i\n",i,
-                                                       dev->alt_max_pkt_size[i]);
+               em28xx_info("Alternate setting %i, max size= %i\n", i,
+                                               dev->alt_max_pkt_size[i]);
        }
 
-       if ((card[nr]>=0)&&(card[nr]<em28xx_bcount))
-               model=card[nr];
-
-       if ((model==EM2800_BOARD_UNKNOWN)||(model==EM2820_BOARD_UNKNOWN)) {
-               em28xx_errdev( "Your board has no eeprom inside it and thus can't\n"
-                       "%s: be autodetected.  Please pass card=<n> insmod option to\n"
-                       "%s: workaround that.  Redirect complaints to the vendor of\n"
-                       "%s: the TV card. Generic type will be used."
-                       "%s: Best regards,\n"
-                       "%s:         -- tux\n",
-                       dev->name,dev->name,dev->name,dev->name,dev->name);
-               em28xx_errdev("%s: Here is a list of valid choices for the card=<n> insmod option:\n",
-                       dev->name);
-               for (i = 0; i < em28xx_bcount; i++) {
-                       em28xx_errdev("    card=%d -> %s\n", i,
-                                                       em28xx_boards[i].name);
-               }
-       }
+       if ((card[nr] >= 0) && (card[nr] < em28xx_bcount))
+               dev->model = card[nr];
 
        /* allocate device struct */
-       retval = em28xx_init_dev(&dev, udev, nr, model);
+       retval = em28xx_init_dev(&dev, udev, nr);
        if (retval)
                return retval;
 
-       em28xx_info("Found %s\n", em28xx_boards[model].name);
+       em28xx_info("Found %s\n", em28xx_boards[dev->model].name);
 
        /* save our data pointer in this interface device */
        usb_set_intfdata(interface, dev);
+
+       request_modules(dev);
+
        return 0;
 }
 
@@ -2037,18 +2223,21 @@ static int em28xx_usb_probe(struct usb_interface *interface,
  */
 static void em28xx_usb_disconnect(struct usb_interface *interface)
 {
-       struct em28xx *dev = usb_get_intfdata(interface);
+       struct em28xx *dev;
+       struct em28xx_ops *ops = NULL;
+
+       dev = usb_get_intfdata(interface);
        usb_set_intfdata(interface, NULL);
 
        if (!dev)
                return;
 
-       down_write(&em28xx_disconnect);
-
-       down(&dev->lock);
-
        em28xx_info("disconnecting %s\n", dev->vdev->name);
 
+       /* wait until all current v4l2 io is finished then deallocate
+          resources */
+       mutex_lock(&dev->lock);
+
        wake_up_interruptible_all(&dev->open);
 
        if (dev->users) {
@@ -2066,15 +2255,20 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                dev->state |= DEV_DISCONNECTED;
                em28xx_release_resources(dev);
        }
+       mutex_unlock(&dev->lock);
 
-       up(&dev->lock);
+       mutex_lock(&em28xx_extension_devlist_lock);
+       if (!list_empty(&em28xx_extension_devlist)) {
+               list_for_each_entry(ops, &em28xx_extension_devlist, next) {
+                       ops->fini(dev);
+               }
+       }
+       mutex_unlock(&em28xx_extension_devlist_lock);
 
        if (!dev->users) {
                kfree(dev->alt_max_pkt_size);
                kfree(dev);
        }
-
-       up_write(&em28xx_disconnect);
 }
 
 static struct usb_driver em28xx_usb_driver = {