Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / media / video / cx231xx / cx231xx-vbi.h

diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.h b/drivers/media/video/cx231xx/cx231xx-vbi.h
index c0d89b1e27259e71635741145b2bacfd1b26e19e..16c7d20a22a4a79b6107f4e9245e3fb67b6fb5ed 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-vbi.h
+++ b/drivers/media/video/cx231xx/cx231xx-vbi.h
@@ -2,7 +2,7 @@
    cx231xx_vbi.h - driver for Conexant Cx23100/101/102 USB video capture devices
 
    Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
-       Based on cx88 driver
+               Based on cx88 driver
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,16 +24,16 @@
 
 extern struct videobuf_queue_ops cx231xx_vbi_qops;
 
-#define   NTSC_VBI_START_LINE           10     /* line 10 - 21 */
-#define   NTSC_VBI_END_LINE             21
-#define   NTSC_VBI_LINES                (NTSC_VBI_END_LINE - NTSC_VBI_START_LINE + 1)
+#define   NTSC_VBI_START_LINE 10       /* line 10 - 21 */
+#define   NTSC_VBI_END_LINE   21
+#define   NTSC_VBI_LINES         (NTSC_VBI_END_LINE-NTSC_VBI_START_LINE+1)
 
-#define   PAL_VBI_START_LINE            6
-#define   PAL_VBI_END_LINE              23
-#define   PAL_VBI_LINES                 (PAL_VBI_END_LINE - PAL_VBI_START_LINE + 1)
+#define   PAL_VBI_START_LINE  6
+#define   PAL_VBI_END_LINE    23
+#define   PAL_VBI_LINES       (PAL_VBI_END_LINE-PAL_VBI_START_LINE+1)
 
-#define   VBI_STRIDE                    1440
-#define   VBI_SAMPLES_PER_LINE          1440
+#define   VBI_STRIDE            1440
+#define   VBI_SAMPLES_PER_LINE  1440
 
 #define   CX231XX_NUM_VBI_PACKETS       4
 #define   CX231XX_NUM_VBI_BUFS          5
@@ -41,21 +41,23 @@ extern struct videobuf_queue_ops cx231xx_vbi_qops;
 /* stream functions */
 int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
                          int num_bufs, int max_pkt_size,
-                         int (*isoc_copy) (struct cx231xx * dev,
-                                           struct urb * urb));
+                         int (*bulk_copy) (struct cx231xx *dev,
+                                           struct urb *urb));
 
 void cx231xx_uninit_vbi_isoc(struct cx231xx *dev);
 
 /* vbi data copy functions */
 u32 cx231xx_get_vbi_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
-                        u8 sav_eav, u8 * p_buffer, u32 buffer_size);
+                        u8 sav_eav, u8 *p_buffer, u32 buffer_size);
+
 u32 cx231xx_copy_vbi_line(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
-                         u8 * p_line, u32 length, int field_number);
+                         u8 *p_line, u32 length, int field_number);
+
 void cx231xx_reset_vbi_buffer(struct cx231xx *dev,
                              struct cx231xx_dmaqueue *dma_q);
 
 int cx231xx_do_vbi_copy(struct cx231xx *dev, struct cx231xx_dmaqueue *dma_q,
-                       u8 * p_buffer, u32 bytes_to_copy);
+                       u8 *p_buffer, u32 bytes_to_copy);
 
 u8 cx231xx_is_vbi_buffer_done(struct cx231xx *dev,
                              struct cx231xx_dmaqueue *dma_q);