diff options
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index eb5e1bfd7911..3db6487a705d 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include "gspca.h" | 24 | #include "gspca.h" |
25 | #include "jpeg.h" | 25 | #include "jpeg.h" |
26 | 26 | ||
27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 4) | 27 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 5) |
28 | static const char version[] = "2.1.4"; | 28 | static const char version[] = "2.1.5"; |
29 | 29 | ||
30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); | 30 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); |
31 | MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver"); | 31 | MODULE_DESCRIPTION("GSPCA/SONIX JPEG USB Camera Driver"); |
@@ -132,10 +132,22 @@ static struct ctrl sd_ctrls[] = { | |||
132 | }, | 132 | }, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static struct cam_mode vga_mode[] = { | 135 | static struct v4l2_pix_format vga_mode[] = { |
136 | {V4L2_PIX_FMT_JPEG, 160, 120, 2}, | 136 | {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, |
137 | {V4L2_PIX_FMT_JPEG, 320, 240, 1}, | 137 | .bytesperline = 160, |
138 | {V4L2_PIX_FMT_JPEG, 640, 480, 0}, | 138 | .sizeimage = 160 * 120 * 3 / 8 + 590, |
139 | .colorspace = V4L2_COLORSPACE_JPEG, | ||
140 | .priv = 2}, | ||
141 | {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | ||
142 | .bytesperline = 320, | ||
143 | .sizeimage = 320 * 240 * 3 / 8 + 590, | ||
144 | .colorspace = V4L2_COLORSPACE_JPEG, | ||
145 | .priv = 1}, | ||
146 | {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, | ||
147 | .bytesperline = 640, | ||
148 | .sizeimage = 640 * 480 * 3 / 8 + 590, | ||
149 | .colorspace = V4L2_COLORSPACE_JPEG, | ||
150 | .priv = 0}, | ||
139 | }; | 151 | }; |
140 | 152 | ||
141 | /*Data from sn9c102p+hv71331r */ | 153 | /*Data from sn9c102p+hv71331r */ |
@@ -1232,7 +1244,7 @@ static void sd_start(struct gspca_dev *gspca_dev) | |||
1232 | reg_w(dev, 0x99, &data, 1); | 1244 | reg_w(dev, 0x99, &data, 1); |
1233 | } | 1245 | } |
1234 | 1246 | ||
1235 | mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].mode; | 1247 | mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv; |
1236 | reg1 = 0x02; | 1248 | reg1 = 0x02; |
1237 | reg17 = 0x61; | 1249 | reg17 = 0x61; |
1238 | switch (sd->sensor) { | 1250 | switch (sd->sensor) { |