summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/gspca.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-15 07:24:22 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-15 07:24:22 -0300
commite1a86ef2de8867d886c75ae5308d17aa0f9a78df (patch)
tree5ad063b7efe38e3d766762e65a4a7f498cc8047e /linux/drivers/media/video/gspca/gspca.h
parent5d42bf58c3798d11494482f0c4ce11e4264e5fab (diff)
parent7e35d0c788f864edd753b7d9b3e2289dde2dbce3 (diff)
downloadmediapointer-dvb-s2-e1a86ef2de8867d886c75ae5308d17aa0f9a78df.tar.gz
mediapointer-dvb-s2-e1a86ef2de8867d886c75ae5308d17aa0f9a78df.tar.bz2
merge: http://kernellabs.com/hg/~dheitmueller/pinnacle_hybrid_2881
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/gspca.h')
-rw-r--r--linux/drivers/media/video/gspca/gspca.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.h b/linux/drivers/media/video/gspca/gspca.h
index bd1faff88..0508a23b9 100644
--- a/linux/drivers/media/video/gspca/gspca.h
+++ b/linux/drivers/media/video/gspca/gspca.h
@@ -94,9 +94,11 @@ struct sd_desc {
/* mandatory operations */
cam_cf_op config; /* called on probe */
cam_op init; /* called on probe and resume */
- cam_op start; /* called on stream on */
+ cam_op start; /* called on stream on after URBs creation */
cam_pkt_op pkt_scan;
/* optional operations */
+ cam_op isoc_init; /* called on stream on before getting the EP */
+ cam_op isoc_nego; /* called when URB submit failed with NOSPC */
cam_v_op stopN; /* called on stream off - main alt */
cam_v_op stop0; /* called on stream off & disconnect - alt 0 */
cam_v_op dq_callback; /* called when a frame has been dequeued */
@@ -169,6 +171,7 @@ struct gspca_dev {
__u8 iface; /* USB interface number */
__u8 alt; /* USB alternate setting */
__u8 nbalt; /* number of USB alternate settings */
+ u16 pkt_size; /* ISOC packet size */
};
int gspca_dev_probe(struct usb_interface *intf,