Commit 0a71d9ce authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13871): gspca - benq: New subdriver for camera 04a5:3035. 



Tested-by: default avatarFrancesco Lavra <francescolavra@interfree.it>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d754a6ca

Documentation/video4linux/gspca.txt

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ sunplus 04a5:3003 Benq DC 1300 
sunplus		04a5:3008	Benq DC 1500

sunplus		04a5:300a	Benq DC 3410

spca500		04a5:300c	Benq DC 1016

benq		04a5:3035	Benq DC E300

finepix		04cb:0104	Fujifilm FinePix 4800

finepix		04cb:0109	Fujifilm FinePix A202

finepix		04cb:010b	Fujifilm FinePix A203

drivers/media/video/gspca/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,15 @@ source "drivers/media/video/gspca/m5602/Kconfig" 
source "drivers/media/video/gspca/stv06xx/Kconfig"

source "drivers/media/video/gspca/gl860/Kconfig"



config USB_GSPCA_BENQ

	tristate "Benq USB Camera Driver"

	depends on VIDEO_V4L2 && USB_GSPCA

	help

	  Say Y here if you want support for the Benq DC E300 camera.



	  To compile this driver as a module, choose M here: the

	  module will be called gspca_benq.



config USB_GSPCA_CONEX

	tristate "Conexant Camera Driver"

	depends on VIDEO_V4L2 && USB_GSPCA

drivers/media/video/gspca/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_USB_GSPCA)          += gspca_main.o

obj-$(CONFIG_USB_GSPCA_BENQ)     += gspca_benq.o

obj-$(CONFIG_USB_GSPCA_CONEX)    += gspca_conex.o

obj-$(CONFIG_USB_GSPCA_ETOMS)    += gspca_etoms.o

obj-$(CONFIG_USB_GSPCA_FINEPIX)  += gspca_finepix.o
@@ -30,6 +31,7 @@ obj-$(CONFIG_USB_GSPCA_VC032X) += gspca_vc032x.o 
obj-$(CONFIG_USB_GSPCA_ZC3XX)    += gspca_zc3xx.o



gspca_main-objs     := gspca.o

gspca_benq-objs     := benq.o

gspca_conex-objs    := conex.o

gspca_etoms-objs    := etoms.o

gspca_finepix-objs  := finepix.o

drivers/media/video/gspca/benq.c

0 → 100644
+322 −0
Original line number Diff line number Diff line 
/*

 * Benq DC E300 subdriver

 *

 * Copyright (C) 2009 Jean-Francois Moine (http://moinejf.free.fr)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



#define MODULE_NAME "benq"



#include "gspca.h"



MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>");

MODULE_DESCRIPTION("Benq DC E300 USB Camera Driver");

MODULE_LICENSE("GPL");



/* specific webcam descriptor */

struct sd {

	struct gspca_dev gspca_dev;	/* !! must be the first item */

};



/* V4L2 controls supported by the driver */

static struct ctrl sd_ctrls[] = {

};



static const struct v4l2_pix_format vga_mode[] = {

	{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,

		.bytesperline = 320,

		.sizeimage = 320 * 240 * 3 / 8 + 590,

		.colorspace = V4L2_COLORSPACE_JPEG},

};



static void sd_isoc_irq(struct urb *urb);



/* -- write a register -- */

static void reg_w(struct gspca_dev *gspca_dev,

			u16 value, u16 index)

{

	struct usb_device *dev = gspca_dev->dev;

	int ret;



	if (gspca_dev->usb_err < 0)

		return;

	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),

			0x02,

			USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

			value,

			index,

			NULL,

			0,

			500);

	if (ret < 0) {

		PDEBUG(D_ERR, "reg_w err %d", ret);

		gspca_dev->usb_err = ret;

	}

}



/* this function is called at probe time */

static int sd_config(struct gspca_dev *gspca_dev,

			const struct usb_device_id *id)

{

	gspca_dev->cam.cam_mode = vga_mode;

	gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode);

	gspca_dev->cam.no_urb_create = 1;

	gspca_dev->cam.reverse_alts = 1;

	return 0;

}



/* this function is called at probe and resume time */

static int sd_init(struct gspca_dev *gspca_dev)

{

	return 0;

}



static int sd_isoc_init(struct gspca_dev *gspca_dev)

{

	int ret;



	ret = usb_set_interface(gspca_dev->dev, gspca_dev->iface,

		gspca_dev->nbalt - 1);

	if (ret < 0) {

		err("usb_set_interface failed");

		return ret;

	}

/*	reg_w(gspca_dev, 0x0003, 0x0002); */

	return 0;

}



/* -- start the camera -- */

static int sd_start(struct gspca_dev *gspca_dev)

{

	struct urb *urb;

	int i, n;



	/* create 4 URBs - 2 on endpoint 0x83 and 2 on 0x082 */

#if MAX_NURBS < 4

#error "Not enough URBs in the gspca table"

#endif

#define SD_PKT_SZ 64

#define SD_NPKT 32

	for (n = 0; n < 4; n++) {

		urb = usb_alloc_urb(SD_NPKT, GFP_KERNEL);

		if (!urb) {

			err("usb_alloc_urb failed");

			return -ENOMEM;

		}

		gspca_dev->urb[n] = urb;

		urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev,

						SD_PKT_SZ * SD_NPKT,

						GFP_KERNEL,

						&urb->transfer_dma);



		if (urb->transfer_buffer == NULL) {

			err("usb_buffer_alloc failed");

			return -ENOMEM;

		}

		urb->dev = gspca_dev->dev;

		urb->context = gspca_dev;

		urb->transfer_buffer_length = SD_PKT_SZ * SD_NPKT;

		urb->pipe = usb_rcvisocpipe(gspca_dev->dev,

					n & 1 ? 0x82 : 0x83);

		urb->transfer_flags = URB_ISO_ASAP

					| URB_NO_TRANSFER_DMA_MAP;

		urb->interval = 1;

		urb->complete = sd_isoc_irq;

		urb->number_of_packets = SD_NPKT;

		for (i = 0; i < SD_NPKT; i++) {

			urb->iso_frame_desc[i].length = SD_PKT_SZ;

			urb->iso_frame_desc[i].offset = SD_PKT_SZ * i;

		}

	}



	return gspca_dev->usb_err;

}



static void sd_stopN(struct gspca_dev *gspca_dev)

{

	reg_w(gspca_dev, 0x003c, 0x0003);

	reg_w(gspca_dev, 0x003c, 0x0004);

	reg_w(gspca_dev, 0x003c, 0x0005);

	reg_w(gspca_dev, 0x003c, 0x0006);

	reg_w(gspca_dev, 0x003c, 0x0007);

	usb_set_interface(gspca_dev->dev, gspca_dev->iface, gspca_dev->nbalt - 1);

}



static void sd_pkt_scan(struct gspca_dev *gspca_dev,

			u8 *data,		/* isoc packet */

			int len)		/* iso packet length */

{

	/* unused */

}



/* reception of an URB */

static void sd_isoc_irq(struct urb *urb)

{

	struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;

	struct urb *urb0;

	u8 *data;

	int i, st;



	PDEBUG(D_PACK, "sd isoc irq");

	if (!gspca_dev->streaming)

		return;

	if (urb->status != 0) {

		if (urb->status == -ESHUTDOWN)

			return;		/* disconnection */

#ifdef CONFIG_PM

		if (gspca_dev->frozen)

			return;

#endif

		PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);

		return;

	}



	/* if this is a control URN (ep 0x83), wait */

	if (urb == gspca_dev->urb[0] || urb == gspca_dev->urb[2])

		return;



	/* scan both received URBs */

	if (urb == gspca_dev->urb[1])

		urb0 = gspca_dev->urb[0];

	else

		urb0 = gspca_dev->urb[2];

	for (i = 0; i < urb->number_of_packets; i++) {



		/* check the packet status and length */

		if (urb0->iso_frame_desc[i].actual_length != SD_PKT_SZ

		    || urb->iso_frame_desc[i].actual_length != SD_PKT_SZ) {

			PDEBUG(D_ERR, "ISOC bad lengths %d / %d",

				urb0->iso_frame_desc[i].actual_length,

				urb->iso_frame_desc[i].actual_length);

			gspca_dev->last_packet_type = DISCARD_PACKET;

			continue;

		}

		st = urb0->iso_frame_desc[i].status;

		if (st == 0)

			st = urb->iso_frame_desc[i].status;

		if (st) {

			PDEBUG(D_ERR,

				"ISOC data error: [%d] status=%d",

				i, st);

			gspca_dev->last_packet_type = DISCARD_PACKET;

			continue;

		}



		/*

		 * The images are received in URBs of different endpoints

		 * (0x83 and 0x82).

		 * Image pieces in URBs of ep 0x83 are continuated in URBs of

		 * ep 0x82 of the same index.

		 * The packets in the URBs of endpoint 0x83 start with:

		 *	- 80 ba/bb 00 00 = start of image followed by 'ff d8'

		 *	- 04 ba/bb oo oo = image piece

		 *		where 'oo oo' is the image offset

						(not cheked)

		 *	- (other -> bad frame)

		 * The images are JPEG encoded with full header and

		 * normal ff escape.

		 * The end of image ('ff d9') may occur in any URB.

		 * (not cheked)

		 */

		data = (u8 *) urb0->transfer_buffer

					+ urb0->iso_frame_desc[i].offset;

		if (data[0] == 0x80 && (data[1] & 0xfe) == 0xba) {



			/* new image */

			gspca_frame_add(gspca_dev, LAST_PACKET,

					NULL, 0);

			gspca_frame_add(gspca_dev, FIRST_PACKET,

					data + 4, SD_PKT_SZ - 4);

		} else if (data[0] == 0x04 && (data[1] & 0xfe) == 0xba) {

			gspca_frame_add(gspca_dev, INTER_PACKET,

					data + 4, SD_PKT_SZ - 4);

		} else {

			gspca_dev->last_packet_type = DISCARD_PACKET;

			continue;

		}

		data = (u8 *) urb->transfer_buffer

					+ urb->iso_frame_desc[i].offset;

			gspca_frame_add(gspca_dev, INTER_PACKET,

					data, SD_PKT_SZ);

	}



	/* resubmit the URBs */

	st = usb_submit_urb(urb0, GFP_ATOMIC);

	if (st < 0)

		PDEBUG(D_ERR|D_PACK, "usb_submit_urb(0) ret %d", st);

	st = usb_submit_urb(urb, GFP_ATOMIC);

	if (st < 0)

		PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);

}



/* sub-driver description */

static const struct sd_desc sd_desc = {

	.name = MODULE_NAME,

	.ctrls = sd_ctrls,

	.nctrls = ARRAY_SIZE(sd_ctrls),

	.config = sd_config,

	.init = sd_init,

	.isoc_init = sd_isoc_init,

	.start = sd_start,

	.stopN = sd_stopN,

	.pkt_scan = sd_pkt_scan,

};



/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x04a5, 0x3035)},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);



/* -- device connect -- */

static int sd_probe(struct usb_interface *intf,

			const struct usb_device_id *id)

{

	return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),

				THIS_MODULE);

}



static struct usb_driver sd_driver = {

	.name = MODULE_NAME,

	.id_table = device_table,

	.probe = sd_probe,

	.disconnect = gspca_disconnect,

#ifdef CONFIG_PM

	.suspend = gspca_suspend,

	.resume = gspca_resume,

#endif

};



/* -- module insert / remove -- */

static int __init sd_mod_init(void)

{

	int ret;



	ret = usb_register(&sd_driver);

	if (ret < 0)

		return ret;

	info("registered");

	return 0;

}

static void __exit sd_mod_exit(void)

{

	usb_deregister(&sd_driver);

	info("deregistered");

}



module_init(sd_mod_init);

module_exit(sd_mod_exit);