V4L/DVB (7007): cx23885: Add basic video support for the HVR1800

This enabled basic preview NTSC and PAL support for the HVR1800.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 147 insertions, 4 deletions

diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index b957242dcd5e..390f9335bdc9 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -44,6 +44,10 @@
 
 /* Max number of inputs by card */
 #define MAX_CX23885_INPUT 8
+#define INPUT(nr) (&cx23885_boards[dev->board].input[nr])
+#define RESOURCE_OVERLAY       1
+#define RESOURCE_VIDEO         2
+#define RESOURCE_VBI           4
 
 #define BUFFER_TIMEOUT     (HZ)  /* 0.5 seconds */
 
@@ -56,6 +60,60 @@
 #define CX23885_BOARD_HAUPPAUGE_HVR1500Q       5
 #define CX23885_BOARD_HAUPPAUGE_HVR1500        6
 
+/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
+#define CX23885_NORMS (\
+        V4L2_STD_NTSC_M |  V4L2_STD_NTSC_M_JP |  V4L2_STD_NTSC_443 | \
+        V4L2_STD_PAL_BG |  V4L2_STD_PAL_DK    |  V4L2_STD_PAL_I    | \
+        V4L2_STD_PAL_M  |  V4L2_STD_PAL_N     |  V4L2_STD_PAL_Nc   | \
+        V4L2_STD_PAL_60 |  V4L2_STD_SECAM_L   |  V4L2_STD_SECAM_DK)
+
+struct cx23885_fmt {
+        char  *name;
+        u32   fourcc;          /* v4l2 format id */
+        int   depth;
+        int   flags;
+        u32   cxformat;
+};
+
+struct cx23885_ctrl {
+        struct v4l2_queryctrl v;
+        u32                   off;
+        u32                   reg;
+        u32                   mask;
+        u32                   shift;
+};
+
+struct cx23885_tvnorm {
+        char            *name;
+        v4l2_std_id     id;
+        u32             cxiformat;
+        u32             cxoformat;
+};
+
+struct cx23885_fh {
+        struct cx23885_dev         *dev;
+        enum v4l2_buf_type         type;
+        int                        radio;
+        u32                        resources;
+
+        /* video overlay */
+        struct v4l2_window         win;
+        struct v4l2_clip           *clips;
+        unsigned int               nclips;
+
+        /* video capture */
+        struct cx23885_fmt         *fmt;
+        unsigned int               width, height;
+
+        /* vbi capture */
+        struct videobuf_queue      vidq;
+        struct videobuf_queue      vbiq;
+
+        /* MPEG Encoder specifics ONLY */
+        struct videobuf_queue      mpegq;
+        atomic_t                   v4l_reading;
+};
+
 enum cx23885_itype {
         CX23885_VMUX_COMPOSITE1 = 1,
         CX23885_VMUX_COMPOSITE2,
@@ -94,12 +152,17 @@ struct cx23885_input {
 
 typedef enum {
         CX23885_MPEG_UNDEFINED = 0,
-        CX23885_MPEG_DVB
+        CX23885_MPEG_DVB,
+        CX23885_ANALOG_VIDEO,
 } port_t;
 
 struct cx23885_board {
         char                    *name;
-        port_t                  portb, portc;
+        port_t                  porta, portb, portc;
+        unsigned int            tuner_type;
+        unsigned int            radio_type;
+        unsigned char           tuner_addr;
+        unsigned char           radio_addr;
 
         /* Vendors can and do run the PCIe bridge at different
          * clock rates, driven physically by crystals on the PCBs.
@@ -228,8 +291,31 @@ struct cx23885_dev {
                 CX23885_BRIDGE_885 = 885,
                 CX23885_BRIDGE_887 = 887,
         } bridge;
+
+        /* Analog video */
+        u32                        resources;
+        unsigned int               input;
+        u32                        tvaudio;
+        v4l2_std_id                tvnorm;
+        unsigned int               tuner_type;
+        unsigned char              tuner_addr;
+        unsigned int               radio_type;
+        unsigned char              radio_addr;
+        unsigned int               has_radio;
+
+        /* V4l */
+        u32                        freq;
+        struct video_device        *video_dev;
+        struct video_device        *vbi_dev;
+        struct video_device        *radio_dev;
+
+        struct cx23885_dmaqueue    vidq;
+        struct cx23885_dmaqueue    vbiq;
+        spinlock_t                 slock;
 };
 
+extern struct list_head cx23885_devlist;
+
 #define SRAM_CH01  0 /* Video A */
 #define SRAM_CH02  1 /* VBI A */
 #define SRAM_CH03  2 /* Video B */
@@ -273,8 +359,34 @@ struct sram_channel {
 #define cx_clear(reg,bit)        cx_andor((reg),(bit),0)
 
 /* ----------------------------------------------------------- */
-/* cx23885-cards.c                                                */
+/* cx23885-core.c                                              */
+
+extern int cx23885_sram_channel_setup(struct cx23885_dev *dev,
+        struct sram_channel *ch,
+        unsigned int bpl, u32 risc);
+
+extern void cx23885_sram_channel_dump(struct cx23885_dev *dev,
+        struct sram_channel *ch);
 
+extern int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
+        u32 reg, u32 mask, u32 value);
+
+extern int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+        struct scatterlist *sglist,
+        unsigned int top_offset, unsigned int bottom_offset,
+        unsigned int bpl, unsigned int padding, unsigned int lines);
+
+void cx23885_cancel_buffers(struct cx23885_tsport *port);
+
+extern int cx23885_restart_queue(struct cx23885_tsport *port,
+                                struct cx23885_dmaqueue *q);
+
+extern void cx23885_wakeup(struct cx23885_tsport *port,
+                           struct cx23885_dmaqueue *q, u32 count);
+
+
+/* ----------------------------------------------------------- */
+/* cx23885-cards.c                                             */
 extern struct cx23885_board cx23885_boards[];
 extern const unsigned int cx23885_bcount;
 
@@ -294,19 +406,50 @@ extern int cx23885_buf_prepare(struct videobuf_queue *q,
                                struct cx23885_tsport *port,
                                struct cx23885_buffer *buf,
                                enum v4l2_field field);
-
 extern void cx23885_buf_queue(struct cx23885_tsport *port,
                               struct cx23885_buffer *buf);
 extern void cx23885_free_buffer(struct videobuf_queue *q,
                                 struct cx23885_buffer *buf);
 
 /* ----------------------------------------------------------- */
+/* cx23885-video.c                                             */
+/* Video */
+extern int cx23885_video_register(struct cx23885_dev *dev);
+extern void cx23885_video_unregister(struct cx23885_dev *dev);
+extern int cx23885_video_irq(struct cx23885_dev *dev, u32 status);
+
+/* ----------------------------------------------------------- */
+/* cx23885-vbi.c                                               */
+extern int cx23885_vbi_fmt(struct file *file, void *priv,
+        struct v4l2_format *f);
+extern void cx23885_vbi_timeout(unsigned long data);
+extern struct videobuf_queue_ops cx23885_vbi_qops;
+
 /* cx23885-i2c.c                                                */
 extern int cx23885_i2c_register(struct cx23885_i2c *bus);
 extern int cx23885_i2c_unregister(struct cx23885_i2c *bus);
 extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd,
                                      void *arg);
 
+/* ----------------------------------------------------------- */
+/* tv norms                                                    */
+
+static inline unsigned int norm_maxw(v4l2_std_id norm)
+{
+        return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;
+}
+
+static inline unsigned int norm_maxh(v4l2_std_id norm)
+{
+        return (norm & V4L2_STD_625_50) ? 576 : 480;
+}
+
+static inline unsigned int norm_swidth(v4l2_std_id norm)
+{
+        return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 754 : 922;
+}
+
+
 /*
  * Local variables:
  * c-basic-offset: 8