leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (11413): gspca - m5602-mt9m111: Separate mode vectors per sensor.

Browse Source 
By separating the supported for each sensor into a separate vector we can
eliminate the nmodes variable and instead calculate it at runtime.

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Erik Andr?n 2008-12-30 16:48:42 -03:00 committed by Mauro Carvalho Chehab
parent 4eecb1767e
commit 74cadfe131
11 changed files with 113 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/video/gspca/m5602/m5602_mt9m111.c
View File

@ -18,6 +18,19 @@
#include "m5602_mt9m111.h"
static struct v4l2_pix_format mt9m111_modes[] = {
{
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage = 640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
};
static void mt9m111_dump_registers(struct sd *sd);
int mt9m111_probe(struct sd *sd)
@ -62,8 +75,8 @@ int mt9m111_probe(struct sd *sd)
return -ENODEV;
sensor_found:
sd->gspca_dev.cam.cam_mode = mt9m111.modes;
sd->gspca_dev.cam.nmodes = mt9m111.nmodes;
sd->gspca_dev.cam.cam_mode = mt9m111_modes;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(mt9m111_modes);
sd->desc->ctrls = mt9m111.ctrls;
sd->desc->nctrls = ARRAY_SIZE(mt9m111_ctrls);
return 0;

17
drivers/media/video/gspca/m5602/m5602_mt9m111.h
View File

@ -143,22 +143,7 @@ static struct m5602_sensor mt9m111 = {
.probe = mt9m111_probe,
.init = mt9m111_init,
.power_down = mt9m111_power_down,
.nmodes = 1,
.modes = {
{
M5602_DEFAULT_FRAME_WIDTH,
M5602_DEFAULT_FRAME_HEIGHT,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
.bytesperline = M5602_DEFAULT_FRAME_WIDTH,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1
}
}
.power_down = mt9m111_power_down
};
static const unsigned char preinit_mt9m111[][4] =

51
drivers/media/video/gspca/m5602/m5602_ov9650.c
View File

@ -68,6 +68,50 @@ static
{ }
};
static struct v4l2_pix_format ov9650_modes[] = {
{
176,
144,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
176 * 144,
.bytesperline = 176,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
320,
240,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
320 * 240,
.bytesperline = 320,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
352,
288,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
352 * 288,
.bytesperline = 352,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
};
static void ov9650_dump_registers(struct sd *sd);
int ov9650_probe(struct sd *sd)
@ -110,8 +154,11 @@ int ov9650_probe(struct sd *sd)
return -ENODEV;
sensor_found:
sd->gspca_dev.cam.cam_mode = ov9650.modes;
sd->gspca_dev.cam.nmodes = ov9650.nmodes;
// sd->gspca_dev.cam.cam_mode = ov9650.modes;
// sd->gspca_dev.cam.nmodes = ov9650.nmodes;
sd->gspca_dev.cam.cam_mode = ov9650_modes;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(ov9650_modes);
sd->desc->ctrls = ov9650.ctrls;
sd->desc->nctrls = ARRAY_SIZE(ov9650_ctrls);
return 0;

47
drivers/media/video/gspca/m5602/m5602_ov9650.h
View File

@ -267,52 +267,7 @@ static struct m5602_sensor ov9650 = {
.start = ov9650_start,
.stop = ov9650_stop,
.power_down = ov9650_power_down,
.ctrls = ov9650_ctrls,
.nmodes = 4,
.modes = {
{
176,
144,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
176 * 144,
.bytesperline = 176,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
320,
240,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
320 * 240,
.bytesperline = 320,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
352,
288,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
352 * 288,
.bytesperline = 352,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
}
.ctrls = ov9650_ctrls
};
static const unsigned char preinit_ov9650[][3] =

17
drivers/media/video/gspca/m5602/m5602_po1030.c
View File

@ -18,6 +18,19 @@
#include "m5602_po1030.h"
static struct v4l2_pix_format po1030_modes[] = {
{
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage = 640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
};
static void po1030_dump_registers(struct sd *sd);
int po1030_probe(struct sd *sd)
@ -59,8 +72,8 @@ int po1030_probe(struct sd *sd)
return -ENODEV;
sensor_found:
sd->gspca_dev.cam.cam_mode = po1030.modes;
sd->gspca_dev.cam.nmodes = po1030.nmodes;
sd->gspca_dev.cam.cam_mode = po1030_modes;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(po1030_modes);
sd->desc->ctrls = po1030.ctrls;
sd->desc->nctrls = ARRAY_SIZE(po1030_ctrls);
return 0;

15
drivers/media/video/gspca/m5602/m5602_po1030.h
View File

@ -232,21 +232,6 @@ static struct m5602_sensor po1030 = {
.power_down = po1030_power_down,
.ctrls = po1030_ctrls,
.nmodes = 1,
.modes = {
{
M5602_DEFAULT_FRAME_WIDTH,
M5602_DEFAULT_FRAME_HEIGHT,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
.bytesperline = M5602_DEFAULT_FRAME_WIDTH,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1
}
}
};
static const unsigned char preinit_po1030[][3] =

18
drivers/media/video/gspca/m5602/m5602_s5k4aa.c
View File

@ -50,6 +50,20 @@ static
{ }
};
static struct v4l2_pix_format s5k4aa_modes[] = {
{
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
};
static void s5k4aa_dump_registers(struct sd *sd);
int s5k4aa_probe(struct sd *sd)
@ -115,8 +129,8 @@ int s5k4aa_probe(struct sd *sd)
info("Detected a s5k4aa sensor");
sensor_found:
sd->gspca_dev.cam.cam_mode = s5k4aa.modes;
sd->gspca_dev.cam.nmodes = s5k4aa.nmodes;
sd->gspca_dev.cam.cam_mode = s5k4aa_modes;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(s5k4aa_modes);
sd->desc->ctrls = s5k4aa.ctrls;
sd->desc->nctrls = ARRAY_SIZE(s5k4aa_ctrls);
return 0;

15
drivers/media/video/gspca/m5602/m5602_s5k4aa.h
View File

@ -142,21 +142,6 @@ static struct m5602_sensor s5k4aa = {
.i2c_slave_id = 0x5a,
.i2c_regW = 2,
.ctrls = s5k4aa_ctrls,
.nmodes = 1,
.modes = {
{
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1
}
}
};
static const unsigned char preinit_s5k4aa[][4] =

18
drivers/media/video/gspca/m5602/m5602_s5k83a.c
View File

@ -18,6 +18,20 @@
#include "m5602_s5k83a.h"
static struct v4l2_pix_format s5k83a_modes[] = {
{
640,
480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
640 * 480,
.bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
};
static void s5k83a_dump_registers(struct sd *sd);
int s5k83a_probe(struct sd *sd)
@ -63,8 +77,8 @@ int s5k83a_probe(struct sd *sd)
info("Detected a s5k83a sensor");
sensor_found:
sd->gspca_dev.cam.cam_mode = s5k83a.modes;
sd->gspca_dev.cam.nmodes = s5k83a.nmodes;
sd->gspca_dev.cam.cam_mode = s5k83a_modes;
sd->gspca_dev.cam.nmodes = ARRAY_SIZE(s5k83a_modes);
sd->desc->ctrls = s5k83a.ctrls;
sd->desc->nctrls = ARRAY_SIZE(s5k83a_ctrls);
return 0;

16
drivers/media/video/gspca/m5602/m5602_s5k83a.h
View File

@ -129,7 +129,6 @@ static struct ctrl s5k83a_ctrls[] = {
}
};
static struct m5602_sensor s5k83a = {
.name = "S5K83A",
.probe = s5k83a_probe,
@ -140,21 +139,6 @@ static struct m5602_sensor s5k83a = {
.i2c_slave_id = 0x5a,
.i2c_regW = 2,
.ctrls = s5k83a_ctrls,
.nmodes = 1,
.modes = {
{
M5602_DEFAULT_FRAME_WIDTH,
M5602_DEFAULT_FRAME_HEIGHT,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
M5602_DEFAULT_FRAME_WIDTH * M5602_DEFAULT_FRAME_HEIGHT,
.bytesperline = M5602_DEFAULT_FRAME_WIDTH,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1
}
}
};
static const unsigned char preinit_s5k83a[][4] =

3
drivers/media/video/gspca/m5602/m5602_sensor.h
View File

@ -66,9 +66,6 @@ struct m5602_sensor {
int (*power_down)(struct sd *sd);
const struct ctrl *ctrls;
char nmodes;
struct v4l2_pix_format modes[];
};
#endif