aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/ov519.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-05 10:49:20 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:17:15 -0400
commitc2446b3eba97243acbe2ad0939a28b5edb97eae7 (patch)
treef7ff764cf48062c4ef7c243205b85ae73d69763e /drivers/media/video/gspca/ov519.c
parentefab8211db79d20032fa7d09b8a3671e68a9c5b9 (diff)
V4L/DVB (8201): gspca: v4l2_pix_format in each subdriver.
main: Parameter comp_fac removed. main, pac207: get_buff_size op removed. (all) v4l2_pix_format in each subdriver. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/ov519.c')
-rw-r--r--drivers/media/video/gspca/ov519.c32
1 files changed, 24 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index d92729ac41f0..70b4cac37a50 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -24,8 +24,8 @@
24 24
25#include "gspca.h" 25#include "gspca.h"
26 26
27#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 4) 27#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 5)
28static const char version[] = "2.1.4"; 28static const char version[] = "2.1.5";
29 29
30MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>"); 30MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");
31MODULE_DESCRIPTION("OV519 USB Camera Driver"); 31MODULE_DESCRIPTION("OV519 USB Camera Driver");
@@ -126,13 +126,29 @@ static struct ctrl sd_ctrls[] = {
126 }, 126 },
127}; 127};
128 128
129static struct cam_mode vga_mode[] = { 129static struct v4l2_pix_format vga_mode[] = {
130 {V4L2_PIX_FMT_JPEG, 320, 240}, 130 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
131 {V4L2_PIX_FMT_JPEG, 640, 480}, 131 .bytesperline = 320,
132 .sizeimage = 320 * 240 * 3 / 8 + 589,
133 .colorspace = V4L2_COLORSPACE_JPEG,
134 .priv = 1},
135 {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
136 .bytesperline = 640,
137 .sizeimage = 640 * 480 * 3 / 8 + 590,
138 .colorspace = V4L2_COLORSPACE_JPEG,
139 .priv = 0},
132}; 140};
133static struct cam_mode sif_mode[] = { 141static struct v4l2_pix_format sif_mode[] = {
134 {V4L2_PIX_FMT_JPEG, 176, 144}, 142 {176, 144, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
135 {V4L2_PIX_FMT_JPEG, 352, 288}, 143 .bytesperline = 176,
144 .sizeimage = 176 * 144 * 3 / 8 + 589,
145 .colorspace = V4L2_COLORSPACE_JPEG,
146 .priv = 1},
147 {352, 288, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
148 .bytesperline = 352,
149 .sizeimage = 352 * 288 * 3 / 8 + 589,
150 .colorspace = V4L2_COLORSPACE_JPEG,
151 .priv = 0},
136}; 152};
137 153
138/* OV519 Camera interface register numbers */ 154/* OV519 Camera interface register numbers */