Commit dff369aa authored by Antonio Ospite's avatar Antonio Ospite Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9682): gspca: New subdriver parameter 'bulk_nurbs'. 



Some webcams with image transfer by bulk messages accept one or many
permanent bulk read.

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6270330a

drivers/media/video/gspca/gspca.c

+15 −4
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static void bulk_irq(struct urb *urb 
{

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

	struct gspca_frame *frame;

	int st;



	PDEBUG(D_PACK, "bulk irq");

	if (!gspca_dev->streaming)
@@ -226,6 +227,13 @@ static void bulk_irq(struct urb *urb 
					urb->transfer_buffer,

					urb->actual_length);

	}



	/* resubmit the URB */

	if (gspca_dev->cam.bulk_nurbs != 0) {

		st = usb_submit_urb(urb, GFP_ATOMIC);

		if (st < 0)

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

	}

}



/*
@@ -527,6 +535,9 @@ static int create_urbs(struct gspca_dev *gspca_dev, 
		if (bsize == 0)

			bsize = psize;

		PDEBUG(D_STREAM, "bulk bsize:%d", bsize);

		if (gspca_dev->cam.bulk_nurbs != 0)

			nurbs = gspca_dev->cam.bulk_nurbs;

		else

			nurbs = 1;

	}
@@ -615,8 +626,8 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev) 
		gspca_dev->streaming = 1;

		atomic_set(&gspca_dev->nevent, 0);



		/* bulk transfers are started by the subdriver */

		if (gspca_dev->alt == 0)

		/* some bulk transfers are started by the subdriver */

		if (gspca_dev->alt == 0 && gspca_dev->cam.bulk_nurbs == 0)

			break;



		/* submit the URBs */

drivers/media/video/gspca/gspca.h

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ struct cam { 
	int bulk_size;		/* buffer size when image transfer by bulk */

	struct v4l2_pix_format *cam_mode;	/* size nmodes */

	char nmodes;

	__u8 bulk_nurbs;	/* number of URBs in bulk mode

				 * - cannot be > MAX_NURBS

				 * - when 0 and bulk_size != 0 means

				 *   1 URB and submit done by subdriver */

	__u8 epaddr;

};