1 files changed, 180 insertions, 138 deletions

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 04e0e48ecabe..002f170b211a 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -26,11 +26,39 @@
 #define _EM28XX_H
 
 #include <linux/videodev2.h>
+#include <media/videobuf-vmalloc.h>
+
 #include <linux/i2c.h>
 #include <linux/mutex.h>
 #include <media/ir-kbd-i2c.h>
-
-#define UNSET -1
+#if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
+#include <media/videobuf-dvb.h>
+#endif
+#include "tuner-xc2028.h"
+#include "em28xx-reg.h"
+
+/* Boards supported by driver */
+#define EM2800_BOARD_UNKNOWN                    0
+#define EM2820_BOARD_UNKNOWN                    1
+#define EM2820_BOARD_TERRATEC_CINERGY_250       2
+#define EM2820_BOARD_PINNACLE_USB_2             3
+#define EM2820_BOARD_HAUPPAUGE_WINTV_USB_2      4
+#define EM2820_BOARD_MSI_VOX_USB_2              5
+#define EM2800_BOARD_TERRATEC_CINERGY_200       6
+#define EM2800_BOARD_LEADTEK_WINFAST_USBII      7
+#define EM2800_BOARD_KWORLD_USB2800             8
+#define EM2820_BOARD_PINNACLE_DVC_90            9
+#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900    10
+#define EM2880_BOARD_TERRATEC_HYBRID_XS         11
+#define EM2820_BOARD_KWORLD_PVRTV2800RF         12
+#define EM2880_BOARD_TERRATEC_PRODIGY_XS        13
+#define EM2820_BOARD_PROLINK_PLAYTV_USB2        14
+#define EM2800_BOARD_VGEAR_POCKETTV             15
+#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950    16
+
+/* Limits minimum and default number of buffers */
+#define EM28XX_MIN_BUF 4
+#define EM28XX_DEF_BUF 8
 
 /* maximum number of em28xx boards */
 #define EM28XX_MAXBOARDS 4 /*FIXME: should be bigger */
@@ -81,31 +109,78 @@
 /* time in msecs to wait for i2c writes to finish */
 #define EM2800_I2C_WRITE_TIMEOUT 20
 
-/* the various frame states */
-enum em28xx_frame_state {
-        F_UNUSED = 0,
-        F_QUEUED,
-        F_GRABBING,
-        F_DONE,
-        F_ERROR,
+enum em28xx_mode {
+        EM28XX_MODE_UNDEFINED,
+        EM28XX_ANALOG_MODE,
+        EM28XX_DIGITAL_MODE,
 };
 
-/* stream states */
 enum em28xx_stream_state {
         STREAM_OFF,
         STREAM_INTERRUPT,
         STREAM_ON,
 };
 
-/* frames */
-struct em28xx_frame_t {
-        void *bufmem;
-        struct v4l2_buffer buf;
-        enum em28xx_frame_state state;
+struct em28xx;
+
+struct em28xx_usb_isoc_ctl {
+                /* max packet size of isoc transaction */
+        int                             max_pkt_size;
+
+                /* number of allocated urbs */
+        int                             num_bufs;
+
+                /* urb for isoc transfers */
+        struct urb                      **urb;
+
+                /* transfer buffers for isoc transfer */
+        char                            **transfer_buffer;
+
+                /* Last buffer command and region */
+        u8                              cmd;
+        int                             pos, size, pktsize;
+
+                /* Last field: ODD or EVEN? */
+        int                             field;
+
+                /* Stores incomplete commands */
+        u32                             tmp_buf;
+        int                             tmp_buf_len;
+
+                /* Stores already requested buffers */
+        struct em28xx_buffer            *buf;
+
+                /* Stores the number of received fields */
+        int                             nfields;
+
+                /* isoc urb callback */
+        int (*isoc_copy) (struct em28xx *dev, struct urb *urb);
+
+};
+
+struct em28xx_fmt {
+        char  *name;
+        u32   fourcc;          /* v4l2 format id */
+};
+
+/* buffer for one video frame */
+struct em28xx_buffer {
+        /* common v4l buffer stuff -- must be first */
+        struct videobuf_buffer vb;
+
         struct list_head frame;
-        unsigned long vma_use_count;
         int top_field;
-        int fieldbytesused;
+        int receiving;
+};
+
+struct em28xx_dmaqueue {
+        struct list_head       active;
+        struct list_head       queued;
+
+        wait_queue_head_t          wq;
+
+        /* Counters to control buffer fill */
+        int                        pos;
 };
 
 /* io methods */
@@ -152,6 +227,12 @@ enum em28xx_decoder {
         EM28XX_SAA7114
 };
 
+struct em28xx_reg_seq {
+        int reg;
+        unsigned char val, mask;
+        int sleep;
+};
+
 struct em28xx_board {
         char *name;
         int vchannels;
@@ -165,8 +246,7 @@ struct em28xx_board {
         unsigned int mts_firmware:1;
         unsigned int has_12mhz_i2s:1;
         unsigned int max_range_640_480:1;
-
-        unsigned int analog_gpio;
+        unsigned int has_dvb:1;
 
         enum em28xx_decoder decoder;
 
@@ -199,7 +279,10 @@ enum em28xx_dev_state {
 #define EM28XX_NUM_AUDIO_PACKETS 64
 #define EM28XX_AUDIO_MAX_PACKET_SIZE 196 /* static value */
 #define EM28XX_CAPTURE_STREAM_EN 1
+
+/* em28xx extensions */
 #define EM28XX_AUDIO   0x10
+#define EM28XX_DVB     0x20
 
 struct em28xx_audio {
         char name[50];
@@ -217,13 +300,24 @@ struct em28xx_audio {
         spinlock_t slock;
 };
 
+struct em28xx;
+
+struct em28xx_fh {
+        struct em28xx *dev;
+        unsigned int  stream_on:1;      /* Locks streams */
+        int           radio;
+
+        struct videobuf_queue        vb_vidq;
+
+        enum v4l2_buf_type           type;
+};
+
 /* main device struct */
 struct em28xx {
         /* generic device properties */
         char name[30];          /* name (including minor) of the device */
         int model;              /* index in the device_data struct */
         int devno;              /* marks the number of this device */
-        unsigned int analog_gpio;
         unsigned int is_em2800:1;
         unsigned int has_msp34xx:1;
         unsigned int has_tda9887:1;
@@ -231,6 +325,16 @@ struct em28xx {
         unsigned int has_audio_class:1;
         unsigned int has_12mhz_i2s:1;
         unsigned int max_range_640_480:1;
+        unsigned int has_dvb:1;
+
+        /* Some older em28xx chips needs a waiting time after writing */
+        unsigned int wait_after_write;
+
+        /* GPIO sequences for analog and digital mode */
+        struct em28xx_reg_seq *analog_gpio, *digital_gpio;
+
+        /* GPIO sequences for tuner callbacks */
+        struct em28xx_reg_seq *tun_analog_gpio, *tun_digital_gpio;
 
         int video_inputs;       /* number of video inputs */
         struct list_head        devlist;
@@ -255,36 +359,28 @@ struct em28xx {
         int mute;
         int volume;
         /* frame properties */
-        struct em28xx_frame_t frame[EM28XX_NUM_FRAMES]; /* list of frames */
-        int num_frames;         /* number of frames currently in use */
-        unsigned int frame_count;       /* total number of transfered frames */
-        struct em28xx_frame_t *frame_current;   /* the frame that is being filled */
         int width;              /* current frame width */
         int height;             /* current frame height */
-        int frame_size;         /* current frame size */
-        int field_size;         /* current field size */
-        int bytesperline;
         int hscale;             /* horizontal scale factor (see datasheet) */
         int vscale;             /* vertical scale factor (see datasheet) */
         int interlaced;         /* 1=interlace fileds, 0=just top fileds */
-        int type;
         unsigned int video_bytesread;   /* Number of bytes read */
 
         unsigned long hash;     /* eeprom hash - for boards with generic ID */
-        unsigned long i2c_hash; /* i2c devicelist hash - for boards with generic ID */
+        unsigned long i2c_hash; /* i2c devicelist hash -
+                                   for boards with generic ID */
 
         struct em28xx_audio *adev;
 
         /* states */
         enum em28xx_dev_state state;
-        enum em28xx_stream_state stream;
         enum em28xx_io_method io;
 
         struct work_struct         request_module_wk;
 
         /* locks */
         struct mutex lock;
-        spinlock_t queue_lock;
+        /* spinlock_t queue_lock; */
         struct list_head inqueue, outqueue;
         wait_queue_head_t open, wait_frame, wait_stream;
         struct video_device *vbi_dev;
@@ -292,6 +388,11 @@ struct em28xx {
 
         unsigned char eedata[256];
 
+        /* Isoc control struct */
+        struct em28xx_dmaqueue vidq;
+        struct em28xx_usb_isoc_ctl isoc_ctl;
+        spinlock_t slock;
+
         /* usb transfer */
         struct usb_device *udev;        /* the usb device */
         int alt;                /* alternate */
@@ -301,20 +402,21 @@ struct em28xx {
         struct urb *urb[EM28XX_NUM_BUFS];       /* urb for isoc transfers */
         char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */
         /* helper funcs that call usb_control_msg */
-        int (*em28xx_write_regs) (struct em28xx * dev, u16 reg, char *buf,
-                                  int len);
-        int (*em28xx_read_reg) (struct em28xx * dev, u16 reg);
-        int (*em28xx_read_reg_req_len) (struct em28xx * dev, u8 req, u16 reg,
+        int (*em28xx_write_regs) (struct em28xx *dev, u16 reg,
                                         char *buf, int len);
-        int (*em28xx_write_regs_req) (struct em28xx * dev, u8 req, u16 reg,
+        int (*em28xx_read_reg) (struct em28xx *dev, u16 reg);
+        int (*em28xx_read_reg_req_len) (struct em28xx *dev, u8 req, u16 reg,
+                                        char *buf, int len);
+        int (*em28xx_write_regs_req) (struct em28xx *dev, u8 req, u16 reg,
                                       char *buf, int len);
-        int (*em28xx_read_reg_req) (struct em28xx * dev, u8 req, u16 reg);
-};
+        int (*em28xx_read_reg_req) (struct em28xx *dev, u8 req, u16 reg);
 
-struct em28xx_fh {
-        struct em28xx *dev;
-        unsigned int  stream_on:1;      /* Locks streams */
-        int           radio;
+        enum em28xx_mode mode;
+
+        /* Caches GPO and GPIO registers */
+        unsigned char   reg_gpo, reg_gpio;
+
+        struct em28xx_dvb *dvb;
 };
 
 struct em28xx_ops {
@@ -351,22 +453,27 @@ int em28xx_colorlevels_set_default(struct em28xx *dev);
 int em28xx_capture_start(struct em28xx *dev, int start);
 int em28xx_outfmt_set_yuv422(struct em28xx *dev);
 int em28xx_resolution_set(struct em28xx *dev);
-int em28xx_init_isoc(struct em28xx *dev);
-void em28xx_uninit_isoc(struct em28xx *dev);
 int em28xx_set_alternate(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));
+void em28xx_uninit_isoc(struct em28xx *dev);
+int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode);
+int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio);
 
 /* Provided by em28xx-video.c */
 int em28xx_register_extension(struct em28xx_ops *dev);
 void em28xx_unregister_extension(struct em28xx_ops *dev);
 
 /* Provided by em28xx-cards.c */
-extern int em2800_variant_detect(struct usb_device* udev,int model);
+extern int em2800_variant_detect(struct usb_device *udev, int model);
 extern void em28xx_pre_card_setup(struct em28xx *dev);
 extern void em28xx_card_setup(struct em28xx *dev);
 extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 extern const unsigned int em28xx_bcount;
 void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
+int em28xx_tuner_callback(void *ptr, int command, int arg);
 
 /* Provided by em28xx-input.c */
 /* TODO: Check if the standard get_key handlers on ir-common can be used */
@@ -375,71 +482,6 @@ int em28xx_get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw);
 int em28xx_get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key,
                                      u32 *ir_raw);
 
-/* em2800 registers */
-#define EM2800_AUDIOSRC_REG 0x08
-
-/* em28xx registers */
-#define I2C_CLK_REG     0x06
-#define CHIPID_REG      0x0a
-#define USBSUSP_REG     0x0c    /* */
-
-#define AUDIOSRC_REG    0x0e
-#define XCLK_REG        0x0f
-
-#define VINMODE_REG     0x10
-#define VINCTRL_REG     0x11
-#define VINENABLE_REG   0x12    /* */
-
-#define GAMMA_REG       0x14
-#define RGAIN_REG       0x15
-#define GGAIN_REG       0x16
-#define BGAIN_REG       0x17
-#define ROFFSET_REG     0x18
-#define GOFFSET_REG     0x19
-#define BOFFSET_REG     0x1a
-
-#define OFLOW_REG       0x1b
-#define HSTART_REG      0x1c
-#define VSTART_REG      0x1d
-#define CWIDTH_REG      0x1e
-#define CHEIGHT_REG     0x1f
-
-#define YGAIN_REG       0x20
-#define YOFFSET_REG     0x21
-#define UVGAIN_REG      0x22
-#define UOFFSET_REG     0x23
-#define VOFFSET_REG     0x24
-#define SHARPNESS_REG   0x25
-
-#define COMPR_REG       0x26
-#define OUTFMT_REG      0x27
-
-#define XMIN_REG        0x28
-#define XMAX_REG        0x29
-#define YMIN_REG        0x2a
-#define YMAX_REG        0x2b
-
-#define HSCALELOW_REG   0x30
-#define HSCALEHIGH_REG  0x31
-#define VSCALELOW_REG   0x32
-#define VSCALEHIGH_REG  0x33
-
-#define AC97LSB_REG     0x40
-#define AC97MSB_REG     0x41
-#define AC97ADDR_REG    0x42
-#define AC97BUSY_REG    0x43
-
-/* em202 registers */
-#define MASTER_AC97     0x02
-#define LINE_IN_AC97    0x10
-#define VIDEO_AC97      0x14
-
-/* register settings */
-#define EM2800_AUDIO_SRC_TUNER  0x0d
-#define EM2800_AUDIO_SRC_LINE   0x0c
-#define EM28XX_AUDIO_SRC_TUNER  0xc0
-#define EM28XX_AUDIO_SRC_LINE   0x80
-
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\
@@ -456,80 +498,80 @@ int em28xx_get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key,
         printk(KERN_WARNING "%s: "fmt,\
                         dev->name , ##arg); } while (0)
 
-inline static int em28xx_compression_disable(struct em28xx *dev)
+static inline int em28xx_compression_disable(struct em28xx *dev)
 {
         /* side effect of disabling scaler and mixer */
-        return em28xx_write_regs(dev, COMPR_REG, "\x00", 1);
+        return em28xx_write_regs(dev, EM28XX_R26_COMPR, "\x00", 1);
 }
 
-inline static int em28xx_contrast_get(struct em28xx *dev)
+static inline int em28xx_contrast_get(struct em28xx *dev)
 {
-        return em28xx_read_reg(dev, YGAIN_REG) & 0x1f;
+        return em28xx_read_reg(dev, EM28XX_R20_YGAIN) & 0x1f;
 }
 
-inline static int em28xx_brightness_get(struct em28xx *dev)
+static inline int em28xx_brightness_get(struct em28xx *dev)
 {
-        return em28xx_read_reg(dev, YOFFSET_REG);
+        return em28xx_read_reg(dev, EM28XX_R21_YOFFSET);
 }
 
-inline static int em28xx_saturation_get(struct em28xx *dev)
+static inline int em28xx_saturation_get(struct em28xx *dev)
 {
-        return em28xx_read_reg(dev, UVGAIN_REG) & 0x1f;
+        return em28xx_read_reg(dev, EM28XX_R22_UVGAIN) & 0x1f;
 }
 
-inline static int em28xx_u_balance_get(struct em28xx *dev)
+static inline int em28xx_u_balance_get(struct em28xx *dev)
 {
-        return em28xx_read_reg(dev, UOFFSET_REG);
+        return em28xx_read_reg(dev, EM28XX_R23_UOFFSET);
 }
 
-inline static int em28xx_v_balance_get(struct em28xx *dev)
+static inline int em28xx_v_balance_get(struct em28xx *dev)
 {
-        return em28xx_read_reg(dev, VOFFSET_REG);
+        return em28xx_read_reg(dev, EM28XX_R24_VOFFSET);
 }
 
-inline static int em28xx_gamma_get(struct em28xx *dev)
+static inline int em28xx_gamma_get(struct em28xx *dev)
 {
-        return em28xx_read_reg(dev, GAMMA_REG) & 0x3f;
+        return em28xx_read_reg(dev, EM28XX_R14_GAMMA) & 0x3f;
 }
 
-inline static int em28xx_contrast_set(struct em28xx *dev, s32 val)
+static inline int em28xx_contrast_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em28xx_write_regs(dev, YGAIN_REG, &tmp, 1);
+        return em28xx_write_regs(dev, EM28XX_R20_YGAIN, &tmp, 1);
 }
 
-inline static int em28xx_brightness_set(struct em28xx *dev, s32 val)
+static inline int em28xx_brightness_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em28xx_write_regs(dev, YOFFSET_REG, &tmp, 1);
+        return em28xx_write_regs(dev, EM28XX_R21_YOFFSET, &tmp, 1);
 }
 
-inline static int em28xx_saturation_set(struct em28xx *dev, s32 val)
+static inline int em28xx_saturation_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em28xx_write_regs(dev, UVGAIN_REG, &tmp, 1);
+        return em28xx_write_regs(dev, EM28XX_R22_UVGAIN, &tmp, 1);
 }
 
-inline static int em28xx_u_balance_set(struct em28xx *dev, s32 val)
+static inline int em28xx_u_balance_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em28xx_write_regs(dev, UOFFSET_REG, &tmp, 1);
+        return em28xx_write_regs(dev, EM28XX_R23_UOFFSET, &tmp, 1);
 }
 
-inline static int em28xx_v_balance_set(struct em28xx *dev, s32 val)
+static inline int em28xx_v_balance_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em28xx_write_regs(dev, VOFFSET_REG, &tmp, 1);
+        return em28xx_write_regs(dev, EM28XX_R24_VOFFSET, &tmp, 1);
 }
 
-inline static int em28xx_gamma_set(struct em28xx *dev, s32 val)
+static inline int em28xx_gamma_set(struct em28xx *dev, s32 val)
 {
         u8 tmp = (u8) val;
-        return em28xx_write_regs(dev, GAMMA_REG, &tmp, 1);
+        return em28xx_write_regs(dev, EM28XX_R14_GAMMA, &tmp, 1);
 }
 
 /*FIXME: maxw should be dependent of alt mode */
-inline static unsigned int norm_maxw(struct em28xx *dev)
+static inline unsigned int norm_maxw(struct em28xx *dev)
 {
         if (dev->max_range_640_480)
                 return 640;
@@ -537,7 +579,7 @@ inline static unsigned int norm_maxw(struct em28xx *dev)
                 return 720;
 }
 
-inline static unsigned int norm_maxh(struct em28xx *dev)
+static inline unsigned int norm_maxh(struct em28xx *dev)
 {
         if (dev->max_range_640_480)
                 return 480;