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

Commit a13ee1dd authored by Olivier Lorin's avatar Olivier Lorin Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: gspca - gl860: new driver for MI2020 sensor 



- new MI2020 driver version made from a webcam gift
- all previous flavors of this driver removed

Signed-off-by: default avatarOlivier Lorin <o.lorin@laposte.net>
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent be2a9fae

drivers/media/video/gspca/gl860/gl860-mi2020.c

+265 −468

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/gspca/gl860/gl860.c

+1 −28
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ SD_SETGET(contrast) 
/* control table */

static struct ctrl sd_ctrls_mi1320[GL860_NCTRLS];

static struct ctrl sd_ctrls_mi2020[GL860_NCTRLS];

static struct ctrl sd_ctrls_mi2020b[GL860_NCTRLS];

static struct ctrl sd_ctrls_ov2640[GL860_NCTRLS];

static struct ctrl sd_ctrls_ov9655[GL860_NCTRLS];
@@ -121,8 +120,6 @@ static int gl860_build_control_table(struct gspca_dev *gspca_dev) 
		sd_ctrls = sd_ctrls_mi1320;

	else if (_MI2020_)

		sd_ctrls = sd_ctrls_mi2020;

	else if (_MI2020b_)

		sd_ctrls = sd_ctrls_mi2020b;

	else if (_OV2640_)

		sd_ctrls = sd_ctrls_ov2640;

	else if (_OV9655_)
@@ -187,19 +184,6 @@ static const struct sd_desc sd_desc_mi2020 = { 
	.dq_callback = sd_callback,

};



static const struct sd_desc sd_desc_mi2020b = {

	.name        = MODULE_NAME,

	.ctrls       = sd_ctrls_mi2020b,

	.nctrls      = GL860_NCTRLS,

	.config      = sd_config,

	.init        = sd_init,

	.isoc_init   = sd_isoc_init,

	.start       = sd_start,

	.stop0       = sd_stop0,

	.pkt_scan    = sd_pkt_scan,

	.dq_callback = sd_callback,

};



static const struct sd_desc sd_desc_ov2640 = {

	.name        = MODULE_NAME,

	.ctrls       = sd_ctrls_ov2640,
@@ -344,8 +328,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
		sd->sensor = ID_OV9655;

	else if (strcmp(sensor, "MI2020") == 0)

		sd->sensor = ID_MI2020;

	else if (strcmp(sensor, "MI2020b") == 0)

		sd->sensor = ID_MI2020b;



	/* Get sensor and set the suitable init/start/../stop functions */

	if (gl860_guess_sensor(gspca_dev, vendor_id, product_id) == -1)
@@ -369,13 +351,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
		dev_init_settings   = mi2020_init_settings;

		break;



	case ID_MI2020b:

		gspca_dev->sd_desc = &sd_desc_mi2020b;

		cam->cam_mode = mi2020_mode;

		cam->nmodes = ARRAY_SIZE(mi2020_mode);

		dev_init_settings   = mi2020_init_settings;

		break;



	case ID_OV2640:

		gspca_dev->sd_desc = &sd_desc_ov2640;

		cam->cam_mode = ov2640_mode;
@@ -620,7 +595,7 @@ int gl860_RTx(struct gspca_dev *gspca_dev, 
	else if (len > 1 && r < len)

		PDEBUG(D_ERR, "short ctrl transfer %d/%d", r, len);



	if ((_MI2020_ || _MI2020b_ || _MI2020c_) && (val || index))

	if (_MI2020_ && (val || index))

		msleep(1);

	if (_OV2640_)

		msleep(1);
@@ -767,8 +742,6 @@ static int gl860_guess_sensor(struct gspca_dev *gspca_dev, 
		PDEBUG(D_PROBE, "05e3:f191 sensor MI1320 (1.3M)");

	} else if (_MI2020_) {

		PDEBUG(D_PROBE, "05e3:0503 sensor MI2020 (2.0M)");

	} else if (_MI2020b_) {

		PDEBUG(D_PROBE, "05e3:0503 sensor MI2020 alt. driver (2.0M)");

	} else if (_OV9655_) {

		PDEBUG(D_PROBE, "05e3:0503 sensor OV9655 (1.3M)");

	} else if (_OV2640_) {

drivers/media/video/gspca/gl860/gl860.h

+0 −3
Original line number Diff line number Diff line
@@ -32,12 +32,9 @@ 
#define ID_OV2640   2

#define ID_OV9655   4

#define ID_MI2020   8

#define ID_MI2020b 16



#define _MI1320_  (((struct sd *) gspca_dev)->sensor == ID_MI1320)

#define _MI2020_  (((struct sd *) gspca_dev)->sensor == ID_MI2020)

#define _MI2020b_ (((struct sd *) gspca_dev)->sensor == ID_MI2020b)

#define _MI2020c_ 0

#define _OV2640_  (((struct sd *) gspca_dev)->sensor == ID_OV2640)

#define _OV9655_  (((struct sd *) gspca_dev)->sensor == ID_OV9655)