aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.h
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-06-30 06:07:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:17:37 -0400
commit1f53b0b0107e3d4b5a4382eaed6a8b4fc146b50c (patch)
treefccb40536217d5db828ea725d1a2531521827d86 /drivers/media/video/gspca/gspca.h
parent1852e75a55287156f2a435ca4ea4f8c1c75bac6c (diff)
V4L/DVB (12229): gspca - main: Change the ISOC initialization mechanism.
- call a new subdriver function 'isoc_init' before chosing the first alternate setting. - call a new subdriver function 'isoc_nego' when submitting the URBs failed. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/gspca.h')
-rw-r--r--drivers/media/video/gspca/gspca.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 46c4effdfcd5..70b1fd830876 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -98,9 +98,11 @@ struct sd_desc {
98/* mandatory operations */ 98/* mandatory operations */
99 cam_cf_op config; /* called on probe */ 99 cam_cf_op config; /* called on probe */
100 cam_op init; /* called on probe and resume */ 100 cam_op init; /* called on probe and resume */
101 cam_op start; /* called on stream on */ 101 cam_op start; /* called on stream on after URBs creation */
102 cam_pkt_op pkt_scan; 102 cam_pkt_op pkt_scan;
103/* optional operations */ 103/* optional operations */
104 cam_op isoc_init; /* called on stream on before getting the EP */
105 cam_op isoc_nego; /* called when URB submit failed with NOSPC */
104 cam_v_op stopN; /* called on stream off - main alt */ 106 cam_v_op stopN; /* called on stream off - main alt */
105 cam_v_op stop0; /* called on stream off & disconnect - alt 0 */ 107 cam_v_op stop0; /* called on stream off & disconnect - alt 0 */
106 cam_v_op dq_callback; /* called when a frame has been dequeued */ 108 cam_v_op dq_callback; /* called when a frame has been dequeued */
@@ -178,6 +180,7 @@ struct gspca_dev {
178 __u8 iface; /* USB interface number */ 180 __u8 iface; /* USB interface number */
179 __u8 alt; /* USB alternate setting */ 181 __u8 alt; /* USB alternate setting */
180 __u8 nbalt; /* number of USB alternate settings */ 182 __u8 nbalt; /* number of USB alternate settings */
183 u16 pkt_size; /* ISOC packet size */
181}; 184};
182 185
183int gspca_dev_probe(struct usb_interface *intf, 186int gspca_dev_probe(struct usb_interface *intf,