Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74cadfe1 authored by Erik Andr?n's avatar Erik Andr?n Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarErik Andr?n <erik.andren@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4eecb176

drivers/media/video/gspca/m5602/m5602_mt9m111.c

+15 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/gspca/m5602/m5602_mt9m111.h

+1 −16
Original line number Diff line number Diff line
@@ -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] =

drivers/media/video/gspca/m5602/m5602_ov9650.c

+49 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/gspca/m5602/m5602_ov9650.h

+1 −46
Original line number Diff line number Diff line
@@ -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] =

drivers/media/video/gspca/m5602/m5602_po1030.c

+15 −2
Original line number Diff line number Diff line
@@ -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;