]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/media/video/em28xx/em28xx-core.c
Merge commit 'v2.6.26-rc9' into sched/devel
[linux-2.6-omap-h63xx.git] / drivers / media / video / em28xx / em28xx-core.c
index 7d1537cab8679f03d8fc4188fd1a2bfe9642e247..5d837c16ee22ad10908cce01c0ef0d89768f14ed 100644 (file)
 
 /* #define ENABLE_DEBUG_ISOC_FRAMES */
 
-static unsigned int core_debug = 0;
+static unsigned int core_debug;
 module_param(core_debug,int,0644);
 MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
 
 #define em28xx_coredbg(fmt, arg...) do {\
        if (core_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __func__ , ##arg); } while (0)
 
-static unsigned int reg_debug = 0;
+static unsigned int reg_debug;
 module_param(reg_debug,int,0644);
 MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
 
 #define em28xx_regdbg(fmt, arg...) do {\
        if (reg_debug) \
                printk(KERN_INFO "%s %s :"fmt, \
-                        dev->name, __FUNCTION__ , ##arg); } while (0)
-
-static unsigned int isoc_debug = 0;
-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, __FUNCTION__ , ##arg); } while (0)
+                        dev->name, __func__ , ##arg); } while (0)
 
 static int alt = EM28XX_PINOUT;
 module_param(alt, int, 0644);
 MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
 
-
-/*
- * em28xx_request_buffers()
- * allocate a number of buffers
- */
-u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
-{
-       const size_t imagesize = PAGE_ALIGN(dev->frame_size);   /*needs to be page aligned cause the buffers can be mapped individually! */
-       void *buff = NULL;
-       u32 i;
-       em28xx_coredbg("requested %i buffers with size %zi\n",
-                       count, imagesize);
-       if (count > EM28XX_NUM_FRAMES)
-               count = EM28XX_NUM_FRAMES;
-
-       dev->num_frames = count;
-       while (dev->num_frames > 0) {
-               if ((buff = vmalloc_32(dev->num_frames * imagesize))) {
-                       memset(buff, 0, dev->num_frames * imagesize);
-                       break;
-               }
-               dev->num_frames--;
-       }
-
-       for (i = 0; i < dev->num_frames; i++) {
-               dev->frame[i].bufmem = buff + i * imagesize;
-               dev->frame[i].buf.index = i;
-               dev->frame[i].buf.m.offset = i * imagesize;
-               dev->frame[i].buf.length = dev->frame_size;
-               dev->frame[i].buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               dev->frame[i].buf.sequence = 0;
-               dev->frame[i].buf.field = V4L2_FIELD_NONE;
-               dev->frame[i].buf.memory = V4L2_MEMORY_MMAP;
-               dev->frame[i].buf.flags = 0;
-       }
-       return dev->num_frames;
-}
-
-/*
- * em28xx_queue_unusedframes()
- * add all frames that are not currently in use to the inbuffer queue
- */
-void em28xx_queue_unusedframes(struct em28xx *dev)
-{
-       unsigned long lock_flags;
-       u32 i;
-
-       for (i = 0; i < dev->num_frames; i++)
-               if (dev->frame[i].state == F_UNUSED) {
-                       dev->frame[i].state = F_QUEUED;
-                       spin_lock_irqsave(&dev->queue_lock, lock_flags);
-                       list_add_tail(&dev->frame[i].frame, &dev->inqueue);
-                       spin_unlock_irqrestore(&dev->queue_lock, lock_flags);
-               }
-}
-
-/*
- * em28xx_release_buffers()
- * free frame buffers
- */
-void em28xx_release_buffers(struct em28xx *dev)
-{
-       if (dev->num_frames) {
-               vfree(dev->frame[0].bufmem);
-               dev->num_frames = 0;
-       }
-}
+/* FIXME */
+#define em28xx_isocdbg(fmt, arg...) do {\
+       if (core_debug) \
+               printk(KERN_INFO "%s %s :"fmt, \
+                        dev->name, __func__ , ##arg); } while (0)
 
 /*
  * em28xx_read_reg_req()
@@ -148,11 +77,11 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                              0x0000, reg, buf, len, HZ);
 
-       if (reg_debug){
+       if (reg_debug) {
                printk(ret < 0 ? " failed!\n" : "%02x values: ", ret);
-               for (byte = 0; byte < len; byte++) {
+               for (byte = 0; byte < len; byte++)
                        printk(" %02x", (unsigned char)buf[byte]);
-               }
+
                printk("\n");
        }
 
@@ -205,7 +134,10 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
        unsigned char *bufs;
 
        if (dev->state & DEV_DISCONNECTED)
-               return(-ENODEV);
+               return -ENODEV;
+
+       if (len < 1)
+               return -EINVAL;
 
        bufs = kmalloc(len, GFP_KERNEL);
 
@@ -214,8 +146,8 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
        if (reg_debug) {
                int i;
                for (i = 0; i < len; ++i)
-                       printk (" %02x", (unsigned char)buf[i]);
-               printk ("\n");
+                       printk(" %02x", (unsigned char)buf[i]);
+               printk("\n");
        }
 
        if (!bufs)
@@ -224,14 +156,32 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
        ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req,
                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                              0x0000, reg, bufs, len, HZ);
-       msleep(5);              /* FIXME: magic number */
+       if (dev->wait_after_write)
+               msleep(dev->wait_after_write);
+
        kfree(bufs);
        return ret;
 }
 
 int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len)
 {
-       return em28xx_write_regs_req(dev, USB_REQ_GET_STATUS, reg, buf, len);
+       int rc;
+
+       rc = em28xx_write_regs_req(dev, USB_REQ_GET_STATUS, reg, buf, len);
+
+       /* Stores GPO/GPIO values at the cache, if changed
+          Only write values should be stored, since input on a GPIO
+          register will return the input bits.
+          Not sure what happens on reading GPO register.
+        */
+       if (rc >= 0) {
+               if (reg == EM2880_R04_GPO)
+                       dev->reg_gpo = buf[0];
+               else if (reg == EM28XX_R08_GPIO)
+                       dev->reg_gpio = buf[0];
+       }
+
+       return rc;
 }
 
 /*
@@ -244,9 +194,20 @@ static int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
 {
        int oldval;
        u8 newval;
-       if ((oldval = em28xx_read_reg(dev, reg)) < 0)
+
+       /* Uses cache for gpo/gpio registers */
+       if (reg == EM2880_R04_GPO)
+               oldval = dev->reg_gpo;
+       else if (reg == EM28XX_R08_GPIO)
+               oldval = dev->reg_gpio;
+       else
+               oldval = em28xx_read_reg(dev, reg);
+
+       if (oldval < 0)
                return oldval;
+
        newval = (((u8) oldval) & ~bitmask) | (val & bitmask);
+
        return em28xx_write_regs(dev, reg, &newval, 1);
 }
 
@@ -258,20 +219,26 @@ static int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 *val)
 {
        int ret, i;
        u8 addr = reg & 0x7f;
-       if ((ret = em28xx_write_regs(dev, AC97LSB_REG, val, 2)) < 0)
+
+       ret = em28xx_write_regs(dev, EM28XX_R40_AC97LSB, val, 2);
+       if (ret < 0)
                return ret;
-       if ((ret = em28xx_write_regs(dev, AC97ADDR_REG, &addr, 1)) < 0)
+
+       ret = em28xx_write_regs(dev, EM28XX_R42_AC97ADDR, &addr, 1);
+       if (ret < 0)
                return ret;
 
        /* Wait up to 50 ms for AC97 command to complete */
        for (i = 0; i < 10; i++) {
-               if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
+               ret = em28xx_read_reg(dev, EM28XX_R43_AC97BUSY);
+               if (ret < 0)
                        return ret;
-               if (!((u8) ret) & 0x01)
+
+               if (!(ret & 0x01))
                        return 0;
                msleep(5);
        }
-       em28xx_warn ("AC97 command still being executed: not handled properly!\n");
+       em28xx_warn("AC97 command still being executed: not handled properly!\n");
        return 0;
 }
 
@@ -289,7 +256,7 @@ static int em28xx_set_audio_source(struct em28xx *dev)
                else
                        input = EM2800_AUDIO_SRC_TUNER;
 
-               ret = em28xx_write_regs(dev, EM2800_AUDIOSRC_REG, &input, 1);
+               ret = em28xx_write_regs(dev, EM2800_R08_AUDIOSRC, &input, 1);
                if (ret < 0)
                        return ret;
        }
@@ -315,7 +282,7 @@ static int em28xx_set_audio_source(struct em28xx *dev)
                }
        }
 
-       ret = em28xx_write_reg_bits(dev, AUDIOSRC_REG, input, 0xc0);
+       ret = em28xx_write_reg_bits(dev, EM28XX_R0E_AUDIOSRC, input, 0xc0);
        if (ret < 0)
                return ret;
        msleep(5);
@@ -323,11 +290,11 @@ static int em28xx_set_audio_source(struct em28xx *dev)
        /* Sets AC97 mixer registers
           This is seems to be needed, even for non-ac97 configs
         */
-       ret = em28xx_write_ac97(dev, VIDEO_AC97, video);
+       ret = em28xx_write_ac97(dev, EM28XX_R14_VIDEO_AC97, video);
        if (ret < 0)
                return ret;
 
-       ret = em28xx_write_ac97(dev, LINE_IN_AC97, line);
+       ret = em28xx_write_ac97(dev, EM28XX_R10_LINE_IN_AC97, line);
 
        return ret;
 }
@@ -343,7 +310,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
 
        /* Mute */
        s[1] |= 0x80;
-       ret = em28xx_write_ac97(dev, MASTER_AC97, s);
+       ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s);
 
        if (ret < 0)
                return ret;
@@ -354,7 +321,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
        if (!dev->mute)
                xclk |= 0x80;
 
-       ret = em28xx_write_reg_bits(dev, XCLK_REG, xclk, 0xa7);
+       ret = em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, xclk, 0xa7);
        if (ret < 0)
                return ret;
        msleep(10);
@@ -365,7 +332,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
        /* Unmute device */
        if (!dev->mute)
                s[1] &= ~0x80;
-       ret = em28xx_write_ac97(dev, MASTER_AC97, s);
+       ret = em28xx_write_ac97(dev, EM28XX_R02_MASTER_AC97, s);
 
        return ret;
 }
@@ -373,50 +340,68 @@ EXPORT_SYMBOL_GPL(em28xx_audio_analog_set);
 
 int em28xx_colorlevels_set_default(struct em28xx *dev)
 {
-       em28xx_write_regs(dev, YGAIN_REG, "\x10", 1);   /* contrast */
-       em28xx_write_regs(dev, YOFFSET_REG, "\x00", 1); /* brightness */
-       em28xx_write_regs(dev, UVGAIN_REG, "\x10", 1);  /* saturation */
-       em28xx_write_regs(dev, UOFFSET_REG, "\x00", 1);
-       em28xx_write_regs(dev, VOFFSET_REG, "\x00", 1);
-       em28xx_write_regs(dev, SHARPNESS_REG, "\x00", 1);
-
-       em28xx_write_regs(dev, GAMMA_REG, "\x20", 1);
-       em28xx_write_regs(dev, RGAIN_REG, "\x20", 1);
-       em28xx_write_regs(dev, GGAIN_REG, "\x20", 1);
-       em28xx_write_regs(dev, BGAIN_REG, "\x20", 1);
-       em28xx_write_regs(dev, ROFFSET_REG, "\x00", 1);
-       em28xx_write_regs(dev, GOFFSET_REG, "\x00", 1);
-       return em28xx_write_regs(dev, BOFFSET_REG, "\x00", 1);
+       em28xx_write_regs(dev, EM28XX_R20_YGAIN, "\x10", 1);    /* contrast */
+       em28xx_write_regs(dev, EM28XX_R21_YOFFSET, "\x00", 1);  /* brightness */
+       em28xx_write_regs(dev, EM28XX_R22_UVGAIN, "\x10", 1);   /* saturation */
+       em28xx_write_regs(dev, EM28XX_R23_UOFFSET, "\x00", 1);
+       em28xx_write_regs(dev, EM28XX_R24_VOFFSET, "\x00", 1);
+       em28xx_write_regs(dev, EM28XX_R25_SHARPNESS, "\x00", 1);
+
+       em28xx_write_regs(dev, EM28XX_R14_GAMMA, "\x20", 1);
+       em28xx_write_regs(dev, EM28XX_R15_RGAIN, "\x20", 1);
+       em28xx_write_regs(dev, EM28XX_R16_GGAIN, "\x20", 1);
+       em28xx_write_regs(dev, EM28XX_R17_BGAIN, "\x20", 1);
+       em28xx_write_regs(dev, EM28XX_R18_ROFFSET, "\x00", 1);
+       em28xx_write_regs(dev, EM28XX_R19_GOFFSET, "\x00", 1);
+       return em28xx_write_regs(dev, EM28XX_R1A_BOFFSET, "\x00", 1);
 }
 
 int em28xx_capture_start(struct em28xx *dev, int start)
 {
-       int ret;
+       int rc;
        /* FIXME: which is the best order? */
        /* video registers are sampled by VREF */
-       if ((ret = em28xx_write_reg_bits(dev, USBSUSP_REG, start ? 0x10 : 0x00,
-                                         0x10)) < 0)
-               return ret;
+       rc = em28xx_write_reg_bits(dev, EM28XX_R0C_USBSUSP,
+                                  start ? 0x10 : 0x00, 0x10);
+       if (rc < 0)
+               return rc;
+
+       if (!start) {
+               /* disable video capture */
+               rc = em28xx_write_regs(dev, EM28XX_R12_VINENABLE, "\x27", 1);
+               return rc;
+       }
+
        /* enable video capture */
-       return em28xx_write_regs(dev, VINENABLE_REG, start ? "\x67" : "\x27", 1);
+       rc = em28xx_write_regs_req(dev, 0x00, 0x48, "\x00", 1);
+
+       if (dev->mode == EM28XX_ANALOG_MODE)
+               rc = em28xx_write_regs(dev, EM28XX_R12_VINENABLE, "\x67", 1);
+       else
+               rc = em28xx_write_regs(dev, EM28XX_R12_VINENABLE, "\x37", 1);
+
+       msleep(6);
+
+       return rc;
 }
 
 int em28xx_outfmt_set_yuv422(struct em28xx *dev)
 {
-       em28xx_write_regs(dev, OUTFMT_REG, "\x34", 1);
-       em28xx_write_regs(dev, VINMODE_REG, "\x10", 1);
-       return em28xx_write_regs(dev, VINCTRL_REG, "\x11", 1);
+       em28xx_write_regs(dev, EM28XX_R27_OUTFMT, "\x34", 1);
+       em28xx_write_regs(dev, EM28XX_R10_VINMODE, "\x10", 1);
+       return em28xx_write_regs(dev, EM28XX_R11_VINCTRL, "\x11", 1);
 }
 
 static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax,
                                  u8 ymin, u8 ymax)
 {
-       em28xx_coredbg("em28xx Scale: (%d,%d)-(%d,%d)\n", xmin, ymin, xmax, ymax);
+       em28xx_coredbg("em28xx Scale: (%d,%d)-(%d,%d)\n",
+                       xmin, ymin, xmax, ymax);
 
-       em28xx_write_regs(dev, XMIN_REG, &xmin, 1);
-       em28xx_write_regs(dev, XMAX_REG, &xmax, 1);
-       em28xx_write_regs(dev, YMIN_REG, &ymin, 1);
-       return em28xx_write_regs(dev, YMAX_REG, &ymax, 1);
+       em28xx_write_regs(dev, EM28XX_R28_XMIN, &xmin, 1);
+       em28xx_write_regs(dev, EM28XX_R29_XMAX, &xmax, 1);
+       em28xx_write_regs(dev, EM28XX_R2A_YMIN, &ymin, 1);
+       return em28xx_write_regs(dev, EM28XX_R2B_YMAX, &ymax, 1);
 }
 
 static int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
@@ -426,34 +411,36 @@ static int em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
        u8 cheight = height;
        u8 overflow = (height >> 7 & 0x02) | (width >> 8 & 0x01);
 
-       em28xx_coredbg("em28xx Area Set: (%d,%d)\n", (width | (overflow & 2) << 7),
+       em28xx_coredbg("em28xx Area Set: (%d,%d)\n",
+                       (width | (overflow & 2) << 7),
                        (height | (overflow & 1) << 8));
 
-       em28xx_write_regs(dev, HSTART_REG, &hstart, 1);
-       em28xx_write_regs(dev, VSTART_REG, &vstart, 1);
-       em28xx_write_regs(dev, CWIDTH_REG, &cwidth, 1);
-       em28xx_write_regs(dev, CHEIGHT_REG, &cheight, 1);
-       return em28xx_write_regs(dev, OFLOW_REG, &overflow, 1);
+       em28xx_write_regs(dev, EM28XX_R1C_HSTART, &hstart, 1);
+       em28xx_write_regs(dev, EM28XX_R1D_VSTART, &vstart, 1);
+       em28xx_write_regs(dev, EM28XX_R1E_CWIDTH, &cwidth, 1);
+       em28xx_write_regs(dev, EM28XX_R1F_CHEIGHT, &cheight, 1);
+       return em28xx_write_regs(dev, EM28XX_R1B_OFLOW, &overflow, 1);
 }
 
 static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v)
 {
        u8 mode;
        /* the em2800 scaler only supports scaling down to 50% */
-       if(dev->is_em2800)
+       if (dev->is_em2800)
                mode = (v ? 0x20 : 0x00) | (h ? 0x10 : 0x00);
        else {
                u8 buf[2];
                buf[0] = h;
                buf[1] = h >> 8;
-               em28xx_write_regs(dev, HSCALELOW_REG, (char *)buf, 2);
+               em28xx_write_regs(dev, EM28XX_R30_HSCALELOW, (char *)buf, 2);
                buf[0] = v;
                buf[1] = v >> 8;
-               em28xx_write_regs(dev, VSCALELOW_REG, (char *)buf, 2);
-               /* it seems that both H and V scalers must be active to work correctly */
+               em28xx_write_regs(dev, EM28XX_R32_VSCALELOW, (char *)buf, 2);
+               /* it seems that both H and V scalers must be active
+                  to work correctly */
                mode = (h || v)? 0x30: 0x00;
        }
-       return em28xx_write_reg_bits(dev, COMPR_REG, mode, 0x30);
+       return em28xx_write_reg_bits(dev, EM28XX_R26_COMPR, mode, 0x30);
 }
 
 /* FIXME: this only function read values from dev */
@@ -469,376 +456,271 @@ int em28xx_resolution_set(struct em28xx *dev)
        return em28xx_scaler_set(dev, dev->hscale, dev->vscale);
 }
 
-
-/******************* isoc transfer handling ****************************/
-
-#ifdef ENABLE_DEBUG_ISOC_FRAMES
-static void em28xx_isoc_dump(struct urb *urb)
+int em28xx_set_alternate(struct em28xx *dev)
 {
-       int len = 0;
-       int ntrans = 0;
+       int errCode, prev_alt = dev->alt;
        int i;
+       unsigned int min_pkt_size = dev->width * 2 + 4;
 
-       printk(KERN_DEBUG "isocIrq: sf=%d np=%d ec=%x\n",
-              urb->start_frame, urb->number_of_packets,
-              urb->error_count);
-       for (i = 0; i < urb->number_of_packets; i++) {
-               unsigned char *buf =
-                               urb->transfer_buffer +
-                               urb->iso_frame_desc[i].offset;
-               int alen = urb->iso_frame_desc[i].actual_length;
-               if (alen > 0) {
-                       if (buf[0] == 0x88) {
-                               ntrans++;
-                               len += alen;
-                       } else if (buf[0] == 0x22) {
-                               printk(KERN_DEBUG
-                                               "= l=%d nt=%d bpp=%d\n",
-                               len - 4 * ntrans, ntrans,
-                               ntrans == 0 ? 0 : len / ntrans);
-                               ntrans = 1;
-                               len = alen;
-                       } else
-                               printk(KERN_DEBUG "!\n");
+       /* When image size is bigger than a certain value,
+          the frame size should be increased, otherwise, only
+          green screen will be received.
+        */
+       if (dev->width * 2 * dev->height > 720 * 240 * 2)
+               min_pkt_size *= 2;
+
+       for (i = 0; i < dev->num_alt; i++) {
+               /* stop when the selected alt setting offers enough bandwidth */
+               if (dev->alt_max_pkt_size[i] >= min_pkt_size) {
+                       dev->alt = i;
+                       break;
+               /* otherwise make sure that we end up with the maximum bandwidth
+                  because the min_pkt_size equation might be wrong...
+               */
+               } else if (dev->alt_max_pkt_size[i] >
+                          dev->alt_max_pkt_size[dev->alt])
+                       dev->alt = i;
+       }
+
+       if (dev->alt != prev_alt) {
+               em28xx_coredbg("minimum isoc packet size: %u (alt=%d)\n",
+                               min_pkt_size, dev->alt);
+               dev->max_pkt_size = dev->alt_max_pkt_size[dev->alt];
+               em28xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n",
+                              dev->alt, dev->max_pkt_size);
+               errCode = usb_set_interface(dev->udev, 0, dev->alt);
+               if (errCode < 0) {
+                       em28xx_errdev("cannot change alternate number to %d (error=%i)\n",
+                                       dev->alt, errCode);
+                       return errCode;
                }
-               printk(KERN_DEBUG "   n=%d s=%d al=%d %x\n", i,
-                      urb->iso_frame_desc[i].status,
-                      urb->iso_frame_desc[i].actual_length,
-                      (unsigned int)
-                                      *((unsigned char *)(urb->transfer_buffer +
-                                      urb->iso_frame_desc[i].
-                                      offset)));
        }
+       return 0;
 }
-#endif
 
-static inline int em28xx_isoc_video(struct em28xx *dev,struct em28xx_frame_t **f,
-                                   unsigned long *lock_flags, unsigned char buf)
+int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio)
 {
-       if (!(buf & 0x01)) {
-               if ((*f)->state == F_GRABBING) {
-                       /*previous frame is incomplete */
-                       if ((*f)->fieldbytesused < dev->field_size) {
-                               (*f)->state = F_ERROR;
-                               em28xx_isocdbg ("dropping incomplete bottom field (%i missing bytes)",
-                                        dev->field_size-(*f)->fieldbytesused);
-                       } else {
-                               (*f)->state = F_DONE;
-                               (*f)->buf.bytesused = dev->frame_size;
-                       }
-               }
-               if ((*f)->state == F_DONE || (*f)->state == F_ERROR) {
-                       /* move current frame to outqueue and get next free buffer from inqueue */
-                       spin_lock_irqsave(&dev-> queue_lock, *lock_flags);
-                       list_move_tail(&(*f)->frame, &dev->outqueue);
-                       if (!list_empty(&dev->inqueue))
-                               (*f) = list_entry(dev-> inqueue.next,
-                       struct em28xx_frame_t,frame);
-                       else
-                               (*f) = NULL;
-                       spin_unlock_irqrestore(&dev->queue_lock,*lock_flags);
-               }
-               if (!(*f)) {
-                       em28xx_isocdbg ("new frame but no buffer is free");
-                       return -1;
-               }
-               do_gettimeofday(&(*f)->buf.timestamp);
-               (*f)->buf.sequence = ++dev->frame_count;
-               (*f)->buf.field = V4L2_FIELD_INTERLACED;
-               (*f)->state = F_GRABBING;
-               (*f)->buf.bytesused = 0;
-               (*f)->top_field = 1;
-               (*f)->fieldbytesused = 0;
-       } else {
-                                       /* acquiring bottom field */
-               if ((*f)->state == F_GRABBING) {
-                       if (!(*f)->top_field) {
-                               (*f)->state = F_ERROR;
-                               em28xx_isocdbg ("unexpected begin of bottom field; discarding it");
-                       } else if ((*f)-> fieldbytesused < dev->field_size - 172) {
-                               (*f)->state = F_ERROR;
-                               em28xx_isocdbg ("dropping incomplete top field (%i missing bytes)",
-                                        dev->field_size-(*f)->fieldbytesused);
-                       } else {
-                               (*f)->top_field = 0;
-                               (*f)->fieldbytesused = 0;
-                       }
+       int rc = 0;
+
+       if (!gpio)
+               return rc;
+
+       dev->em28xx_write_regs_req(dev, 0x00, 0x48, "\x00", 1);
+       if (dev->mode == EM28XX_ANALOG_MODE)
+               dev->em28xx_write_regs_req(dev, 0x00, 0x12, "\x67", 1);
+       else
+               dev->em28xx_write_regs_req(dev, 0x00, 0x12, "\x37", 1);
+       msleep(6);
+
+       /* Send GPIO reset sequences specified at board entry */
+       while (gpio->sleep >= 0) {
+               if (gpio->reg >= 0) {
+                       rc = em28xx_write_reg_bits(dev,
+                                                  gpio->reg,
+                                                  gpio->val,
+                                                  gpio->mask);
+                       if (rc < 0)
+                               return rc;
                }
+               if (gpio->sleep > 0)
+                       msleep(gpio->sleep);
+
+               gpio++;
        }
-       return (0);
+       return rc;
 }
 
-static inline void em28xx_isoc_video_copy(struct em28xx *dev,
-                                         struct em28xx_frame_t **f, unsigned char *buf, int len)
+int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode)
 {
-       void *fieldstart, *startwrite, *startread;
-       int linesdone, currlinedone, offset, lencopy,remain;
+       if (dev->mode == set_mode)
+               return 0;
 
-       if(dev->frame_size != (*f)->buf.length){
-               em28xx_err("frame_size %i and buf.length %i are different!!!\n",dev->frame_size,(*f)->buf.length);
-               return;
+       if (set_mode == EM28XX_MODE_UNDEFINED) {
+               dev->mode = set_mode;
+               return 0;
        }
 
-       if ((*f)->fieldbytesused + len > dev->field_size)
-               len =dev->field_size - (*f)->fieldbytesused;
-
-       if (buf[0] != 0x88 && buf[0] != 0x22) {
-               em28xx_isocdbg("frame is not complete\n");
-               startread = buf;
-               len+=4;
-       } else
-               startread = buf + 4;
-
-       remain = len;
+       dev->mode = set_mode;
 
-       if ((*f)->top_field)
-               fieldstart = (*f)->bufmem;
+       if (dev->mode == EM28XX_DIGITAL_MODE)
+               return em28xx_gpio_set(dev, dev->digital_gpio);
        else
-               fieldstart = (*f)->bufmem + dev->bytesperline;
-
-       linesdone = (*f)->fieldbytesused / dev->bytesperline;
-       currlinedone = (*f)->fieldbytesused % dev->bytesperline;
-       offset = linesdone * dev->bytesperline * 2 + currlinedone;
-       startwrite = fieldstart + offset;
-       lencopy = dev->bytesperline - currlinedone;
-       lencopy = lencopy > remain ? remain : lencopy;
-
-       memcpy(startwrite, startread, lencopy);
-       remain -= lencopy;
-
-       while (remain > 0) {
-               startwrite += lencopy + dev->bytesperline;
-               startread += lencopy;
-               if (dev->bytesperline > remain)
-                       lencopy = remain;
-               else
-                       lencopy = dev->bytesperline;
-
-               memcpy(startwrite, startread, lencopy);
-               remain -= lencopy;
-       }
-
-       (*f)->fieldbytesused += len;
+               return em28xx_gpio_set(dev, dev->analog_gpio);
 }
+EXPORT_SYMBOL_GPL(em28xx_set_mode);
+
+/* ------------------------------------------------------------------
+       URB control
+   ------------------------------------------------------------------*/
 
 /*
- * em28xx_isoIrq()
- * handles the incoming isoc urbs and fills the frames from our inqueue
+ * IRQ callback, called by URB callback
  */
-static void em28xx_isocIrq(struct urb *urb)
+static void em28xx_irq_callback(struct urb *urb)
 {
-       struct em28xx *dev = urb->context;
-       int i, status;
-       struct em28xx_frame_t **f;
-       unsigned long lock_flags;
-
-       if (!dev)
-               return;
-#ifdef ENABLE_DEBUG_ISOC_FRAMES
-       if (isoc_debug>1)
-               em28xx_isoc_dump(urb);
-#endif
-
-       if (urb->status == -ENOENT)
-               return;
-
-       f = &dev->frame_current;
-
-       if (dev->stream == STREAM_INTERRUPT) {
-               dev->stream = STREAM_OFF;
-               if ((*f))
-                       (*f)->state = F_QUEUED;
-               em28xx_isocdbg("stream interrupted");
-               wake_up_interruptible(&dev->wait_stream);
-       }
-
-       if ((dev->state & DEV_DISCONNECTED) || (dev->state & DEV_MISCONFIGURED))
-               return;
-
-       if (dev->stream == STREAM_ON && !list_empty(&dev->inqueue)) {
-               if (!(*f))
-                       (*f) = list_entry(dev->inqueue.next,
-               struct em28xx_frame_t, frame);
-
-               for (i = 0; i < urb->number_of_packets; i++) {
-                       unsigned char *buf = urb->transfer_buffer +
-                                       urb->iso_frame_desc[i].offset;
-                       int len = urb->iso_frame_desc[i].actual_length - 4;
-
-                       if (urb->iso_frame_desc[i].status) {
-                               em28xx_isocdbg("data error: [%d] len=%d, status=%d", i,
-                                       urb->iso_frame_desc[i].actual_length,
-                                       urb->iso_frame_desc[i].status);
-                               if (urb->iso_frame_desc[i].status != -EPROTO)
-                                       continue;
-                       }
-                       if (urb->iso_frame_desc[i].actual_length <= 0) {
-                               em28xx_isocdbg("packet %d is empty",i);
-                               continue;
-                       }
-                       if (urb->iso_frame_desc[i].actual_length >
-                           urb->iso_frame_desc[i].length) {
-                               em28xx_isocdbg("packet bigger than packet size");
-                               continue;
-                       }
-                       /*new frame */
-                       if (buf[0] == 0x22 && buf[1] == 0x5a) {
-                               em28xx_isocdbg("Video frame, length=%i!",len);
-
-                               if (em28xx_isoc_video(dev,f,&lock_flags,buf[2]))
-                               break;
-                       } else if (buf[0]==0x33 && buf[1]==0x95 && buf[2]==0x00) {
-                               em28xx_isocdbg("VBI HEADER!!!");
-                       }
+       struct em28xx_dmaqueue  *dma_q = urb->context;
+       struct em28xx *dev = container_of(dma_q, struct em28xx, vidq);
+       int rc, i;
 
-                       /* actual copying */
-                       if ((*f)->state == F_GRABBING) {
-                               em28xx_isoc_video_copy(dev,f,buf, len);
-                       }
-               }
-       }
+       /* Copy data from URB */
+       spin_lock(&dev->slock);
+       rc = dev->isoc_ctl.isoc_copy(dev, urb);
+       spin_unlock(&dev->slock);
 
+       /* Reset urb buffers */
        for (i = 0; i < urb->number_of_packets; i++) {
                urb->iso_frame_desc[i].status = 0;
                urb->iso_frame_desc[i].actual_length = 0;
        }
-
        urb->status = 0;
-       if ((status = usb_submit_urb(urb, GFP_ATOMIC))) {
-               em28xx_errdev("resubmit of urb failed (error=%i)\n", status);
-               dev->state |= DEV_MISCONFIGURED;
+
+       urb->status = usb_submit_urb(urb, GFP_ATOMIC);
+       if (urb->status) {
+               em28xx_isocdbg("urb resubmit failed (error=%i)\n",
+                              urb->status);
        }
-       wake_up_interruptible(&dev->wait_frame);
-       return;
 }
 
 /*
- * em28xx_uninit_isoc()
- * deallocates the buffers and urbs allocated during em28xx_init_iosc()
+ * Stop and Deallocate URBs
  */
 void em28xx_uninit_isoc(struct em28xx *dev)
 {
+       struct urb *urb;
        int i;
 
-       for (i = 0; i < EM28XX_NUM_BUFS; i++) {
-               if (dev->urb[i]) {
-                       usb_kill_urb(dev->urb[i]);
-                       if (dev->transfer_buffer[i]) {
+       em28xx_isocdbg("em28xx: called em28xx_uninit_isoc\n");
+
+       dev->isoc_ctl.nfields = -1;
+       for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
+               urb = dev->isoc_ctl.urb[i];
+               if (urb) {
+                       usb_kill_urb(urb);
+                       usb_unlink_urb(urb);
+                       if (dev->isoc_ctl.transfer_buffer[i]) {
                                usb_buffer_free(dev->udev,
-                                               dev->urb[i]->transfer_buffer_length,
-                                               dev->transfer_buffer[i],
-                                               dev->urb[i]->transfer_dma);
+                                       urb->transfer_buffer_length,
+                                       dev->isoc_ctl.transfer_buffer[i],
+                                       urb->transfer_dma);
                        }
-                       usb_free_urb(dev->urb[i]);
+                       usb_free_urb(urb);
+                       dev->isoc_ctl.urb[i] = NULL;
                }
-               dev->urb[i] = NULL;
-               dev->transfer_buffer[i] = NULL;
+               dev->isoc_ctl.transfer_buffer[i] = NULL;
        }
+
+       kfree(dev->isoc_ctl.urb);
+       kfree(dev->isoc_ctl.transfer_buffer);
+
+       dev->isoc_ctl.urb = NULL;
+       dev->isoc_ctl.transfer_buffer = NULL;
+       dev->isoc_ctl.num_bufs = 0;
+
        em28xx_capture_start(dev, 0);
 }
+EXPORT_SYMBOL_GPL(em28xx_uninit_isoc);
 
 /*
- * em28xx_init_isoc()
- * allocates transfer buffers and submits the urbs for isoc transfer
+ * Allocate URBs and start IRQ
  */
-int em28xx_init_isoc(struct em28xx *dev)
+int em28xx_init_isoc(struct em28xx *dev, int max_packets,
+                    int num_bufs, int max_pkt_size,
+                    int (*isoc_copy) (struct em28xx *dev, struct urb *urb))
 {
-       /* change interface to 3 which allows the biggest packet sizes */
-       int i, errCode;
-       int sb_size;
-
-       em28xx_set_alternate(dev);
-       sb_size = EM28XX_NUM_PACKETS * dev->max_pkt_size;
-
-       /* reset streaming vars */
-       dev->frame_current = NULL;
-       dev->frame_count = 0;
-
-       /* allocate urbs */
-       for (i = 0; i < EM28XX_NUM_BUFS; i++) {
-               struct urb *urb;
-               int j;
-               /* allocate transfer buffer */
-               urb = usb_alloc_urb(EM28XX_NUM_PACKETS, GFP_KERNEL);
-               if (!urb){
-                       em28xx_errdev("cannot alloc urb %i\n", i);
+       struct em28xx_dmaqueue *dma_q = &dev->vidq;
+       int i;
+       int sb_size, pipe;
+       struct urb *urb;
+       int j, k;
+       int rc;
+
+       em28xx_isocdbg("em28xx: called em28xx_prepare_isoc\n");
+
+       /* De-allocates all pending stuff */
+       em28xx_uninit_isoc(dev);
+
+       dev->isoc_ctl.isoc_copy = isoc_copy;
+       dev->isoc_ctl.num_bufs = num_bufs;
+
+       dev->isoc_ctl.urb = kzalloc(sizeof(void *)*num_bufs,  GFP_KERNEL);
+       if (!dev->isoc_ctl.urb) {
+               em28xx_errdev("cannot alloc memory for usb buffers\n");
+               return -ENOMEM;
+       }
+
+       dev->isoc_ctl.transfer_buffer = kzalloc(sizeof(void *)*num_bufs,
+                                             GFP_KERNEL);
+       if (!dev->isoc_ctl.transfer_buffer) {
+               em28xx_errdev("cannot allocate memory for usbtransfer\n");
+               kfree(dev->isoc_ctl.urb);
+               return -ENOMEM;
+       }
+
+       dev->isoc_ctl.max_pkt_size = max_pkt_size;
+       dev->isoc_ctl.buf = NULL;
+
+       sb_size = max_packets * dev->isoc_ctl.max_pkt_size;
+
+       /* allocate urbs and transfer buffers */
+       for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
+               urb = usb_alloc_urb(max_packets, GFP_KERNEL);
+               if (!urb) {
+                       em28xx_err("cannot alloc isoc_ctl.urb %i\n", i);
                        em28xx_uninit_isoc(dev);
                        return -ENOMEM;
                }
-               dev->transfer_buffer[i] = usb_buffer_alloc(dev->udev, sb_size,
-                                                          GFP_KERNEL,
-                                                          &urb->transfer_dma);
-               if (!dev->transfer_buffer[i]) {
-                       em28xx_errdev
-                                       ("unable to allocate %i bytes for transfer buffer %i\n",
-                                        sb_size, i);
+               dev->isoc_ctl.urb[i] = urb;
+
+               dev->isoc_ctl.transfer_buffer[i] = usb_buffer_alloc(dev->udev,
+                       sb_size, GFP_KERNEL, &urb->transfer_dma);
+               if (!dev->isoc_ctl.transfer_buffer[i]) {
+                       em28xx_err("unable to allocate %i bytes for transfer"
+                                       " buffer %i%s\n",
+                                       sb_size, i,
+                                       in_interrupt()?" while in int":"");
                        em28xx_uninit_isoc(dev);
-                       usb_free_urb(urb);
                        return -ENOMEM;
                }
-               memset(dev->transfer_buffer[i], 0, sb_size);
-               urb->dev = dev->udev;
-               urb->context = dev;
-               urb->pipe = usb_rcvisocpipe(dev->udev, 0x82);
-               urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
-               urb->interval = 1;
-               urb->transfer_buffer = dev->transfer_buffer[i];
-               urb->complete = em28xx_isocIrq;
-               urb->number_of_packets = EM28XX_NUM_PACKETS;
-               urb->transfer_buffer_length = sb_size;
-               for (j = 0; j < EM28XX_NUM_PACKETS; j++) {
-                       urb->iso_frame_desc[j].offset = j * dev->max_pkt_size;
-                       urb->iso_frame_desc[j].length = dev->max_pkt_size;
+               memset(dev->isoc_ctl.transfer_buffer[i], 0, sb_size);
+
+               /* FIXME: this is a hack - should be
+                       'desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK'
+                       should also be using 'desc.bInterval'
+                */
+               pipe = usb_rcvisocpipe(dev->udev,
+                       dev->mode == EM28XX_ANALOG_MODE ? 0x82 : 0x84);
+
+               usb_fill_int_urb(urb, dev->udev, pipe,
+                                dev->isoc_ctl.transfer_buffer[i], sb_size,
+                                em28xx_irq_callback, dma_q, 1);
+
+               urb->number_of_packets = max_packets;
+               urb->transfer_flags = URB_ISO_ASAP;
+
+               k = 0;
+               for (j = 0; j < max_packets; j++) {
+                       urb->iso_frame_desc[j].offset = k;
+                       urb->iso_frame_desc[j].length =
+                                               dev->isoc_ctl.max_pkt_size;
+                       k += dev->isoc_ctl.max_pkt_size;
                }
-               dev->urb[i] = urb;
        }
 
-       /* submit urbs */
-       em28xx_coredbg("Submitting %d urbs of %d packets (%d each)\n",
-                      EM28XX_NUM_BUFS, EM28XX_NUM_PACKETS, dev->max_pkt_size);
-       for (i = 0; i < EM28XX_NUM_BUFS; i++) {
-               errCode = usb_submit_urb(dev->urb[i], GFP_KERNEL);
-               if (errCode) {
-                       em28xx_errdev("submit of urb %i failed (error=%i)\n", i,
-                                     errCode);
-                       em28xx_uninit_isoc(dev);
-                       return errCode;
-               }
-       }
-
-       return 0;
-}
-
-int em28xx_set_alternate(struct em28xx *dev)
-{
-       int errCode, prev_alt = dev->alt;
-       int i;
-       unsigned int min_pkt_size = dev->bytesperline+4;
-
-       /* When image size is bigger than a ceirtain value,
-          the frame size should be increased, otherwise, only
-          green screen will be received.
-        */
-       if (dev->frame_size > 720*240*2)
-               min_pkt_size *= 2;
+       init_waitqueue_head(&dma_q->wq);
 
-       for (i = 0; i < dev->num_alt; i++)
-               if (dev->alt_max_pkt_size[i] >= min_pkt_size)
-                       break;
-       dev->alt = i;
+       em28xx_capture_start(dev, 1);
 
-       if (dev->alt != prev_alt) {
-               em28xx_coredbg("minimum isoc packet size: %u (alt=%d)\n",
-                               min_pkt_size, dev->alt);
-               dev->max_pkt_size = dev->alt_max_pkt_size[dev->alt];
-               em28xx_coredbg("setting alternate %d with wMaxPacketSize=%u\n",
-                              dev->alt, dev->max_pkt_size);
-               errCode = usb_set_interface(dev->udev, 0, dev->alt);
-               if (errCode < 0) {
-                       em28xx_errdev ("cannot change alternate number to %d (error=%i)\n",
-                                       dev->alt, errCode);
-                       return errCode;
+       /* submit urbs and enables IRQ */
+       for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
+               rc = usb_submit_urb(dev->isoc_ctl.urb[i], GFP_ATOMIC);
+               if (rc) {
+                       em28xx_err("submit of urb %i failed (error=%i)\n", i,
+                                  rc);
+                       em28xx_uninit_isoc(dev);
+                       return rc;
                }
        }
+
        return 0;
 }
+EXPORT_SYMBOL_GPL(em28xx_init_isoc);