diff options
| author | Erik Andrén <erik.andren@gmail.com> | 2009-02-12 07:32:52 +0100 |
|---|---|---|
| committer | Erik Andrén <erik.andren@gmail.com> | 2009-02-12 07:32:52 +0100 |
| commit | 7ca03eac2d8ff90a5ffc56ee23935a4daf31aabf (patch) | |
| tree | 85b8e684f011c09e31b7d3626845731c6e596605 /linux/drivers/media/video/gspca | |
| parent | c2d3fb9ba38411d60945585f92142052c98856b5 (diff) | |
| download | mediapointer-dvb-s2-7ca03eac2d8ff90a5ffc56ee23935a4daf31aabf.tar.gz mediapointer-dvb-s2-7ca03eac2d8ff90a5ffc56ee23935a4daf31aabf.tar.bz2 | |
gspca - m5602-s5k4aa: Fixup SXGA resolution.
From: Grégory Lardière <spmf2004-m560x@yahoo.fr>
The SXGA resolution doesn't work unless you first force the VGA resolution. More investigation is needed in order to fix this the "right" way.
Priority: normal
Signed-off-by: Grégory Lardière <spmf2004-m560x@yahoo.fr>
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 30 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 9 |
2 files changed, 20 insertions, 19 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c index 97c06c5d0..48bf519c6 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c +++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c @@ -66,27 +66,25 @@ static }; static struct v4l2_pix_format s5k4aa_modes[] = { -#if 0 { - 1280, - 1024, + 640, + 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, .sizeimage = - 1280 * 1024, - .bytesperline = 1280, + 640 * 480, + .bytesperline = 640, .colorspace = V4L2_COLORSPACE_SRGB, .priv = 0 }, -#endif { - 640, - 480, + 1280, + 1024, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, .sizeimage = - 640 * 480, - .bytesperline = 640, + 1280 * 1024, + .bytesperline = 1280, .colorspace = V4L2_COLORSPACE_SRGB, .priv = 0 } @@ -303,6 +301,10 @@ int s5k4aa_start(struct sd *sd) return -EINVAL; } } + err = s5k4aa_set_noise(&sd->gspca_dev, 0); + if (err < 0) + return err; + break; case 640: PDEBUG(D_V4L2, "Configuring camera for VGA mode"); @@ -335,6 +337,10 @@ int s5k4aa_start(struct sd *sd) return -EINVAL; } } + err = s5k4aa_set_noise(&sd->gspca_dev, 1); + if (err < 0) + return err; + break; } return err; } @@ -389,10 +395,6 @@ int s5k4aa_init(struct sd *sd) if (err < 0) return err; - err = s5k4aa_set_noise(&sd->gspca_dev, sensor_settings[NOISE_SUPP_IDX]); - if (err < 0) - return err; - err = s5k4aa_set_vflip(&sd->gspca_dev, sensor_settings[VFLIP_IDX]); if (err < 0) return err; diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h index e0709a55e..4440da4e7 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h +++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h @@ -265,18 +265,17 @@ static const unsigned char SXGA_s5k4aa[][4] = {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xa0, 0x00}, /* 48 MHz */ {SENSOR, S5K4AA_PAGE_MAP, 0x02, 0x00}, - {SENSOR, S5K4AA_READ_MODE, S5K4AA_RM_H_FLIP | S5K4AA_RM_ROW_SKIP_2X - | S5K4AA_RM_COL_SKIP_2X, 0x00}, + {SENSOR, S5K4AA_READ_MODE, S5K4AA_RM_H_FLIP, 0x00}, {SENSOR, 0x37, 0x01, 0x00}, {SENSOR, S5K4AA_ROWSTART_HI, 0x00, 0x00}, - {SENSOR, S5K4AA_ROWSTART_LO, 0x0a, 0x00}, + {SENSOR, S5K4AA_ROWSTART_LO, 0x09, 0x00}, {SENSOR, S5K4AA_COLSTART_HI, 0x00, 0x00}, - {SENSOR, S5K4AA_COLSTART_LO, 0x0b, 0x00}, + {SENSOR, S5K4AA_COLSTART_LO, 0x0a, 0x00}, {SENSOR, S5K4AA_WINDOW_HEIGHT_HI, 0x04, 0x00}, {SENSOR, S5K4AA_WINDOW_HEIGHT_LO, 0x00, 0x00}, {SENSOR, S5K4AA_WINDOW_WIDTH_HI, 0x05, 0x00}, {SENSOR, S5K4AA_WINDOW_WIDTH_LO, 0x00, 0x00}, - {SENSOR, S5K4AA_H_BLANK_HI__, 0x00, 0x00}, + {SENSOR, S5K4AA_H_BLANK_HI__, 0x01, 0x00}, {SENSOR, S5K4AA_H_BLANK_LO__, 0xa8, 0x00}, {SENSOR, S5K4AA_EXPOSURE_HI, 0x01, 0x00}, {SENSOR, S5K4AA_EXPOSURE_LO, 0x00, 0x00}, |