aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.h
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-10-23 06:29:51 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:29 -0500
commitff374747ce5357eedf034b44ec3111cec28d50d5 (patch)
treea012bf91305dcd7f95ed9e62317700859982ea00 /drivers/media/video/gspca/gspca.h
parent8fe2f1d522bb599eccfff6ef4fc55f7b7abbaeec (diff)
V4L/DVB (9545): gspca: Add a flag for empty ISOC packets.
- This flag is needed by some subdrivers as tv8532 for start of frame detection. 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.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 2ae1ad7c1483..50913caf1872 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -142,22 +142,21 @@ struct gspca_dev {
142 char fr_q; /* next frame to queue */ 142 char fr_q; /* next frame to queue */
143 char fr_o; /* next frame to dequeue */ 143 char fr_o; /* next frame to dequeue */
144 signed char fr_queue[GSPCA_MAX_FRAMES]; /* frame queue */ 144 signed char fr_queue[GSPCA_MAX_FRAMES]; /* frame queue */
145 char last_packet_type; 145 __u8 last_packet_type;
146 __s8 empty_packet; /* if (-1) don't check empty packets */
147 __u8 streaming;
146 148
147 __u8 iface; /* USB interface number */
148 __u8 alt; /* USB alternate setting */
149 __u8 curr_mode; /* current camera mode */ 149 __u8 curr_mode; /* current camera mode */
150 __u32 pixfmt; /* current mode parameters */ 150 __u32 pixfmt; /* current mode parameters */
151 __u16 width; 151 __u16 width;
152 __u16 height; 152 __u16 height;
153 __u32 sequence; /* frame sequence number */
153 154
154 atomic_t nevent; /* number of frames done */ 155 atomic_t nevent; /* number of frames done */
155 wait_queue_head_t wq; /* wait queue */ 156 wait_queue_head_t wq; /* wait queue */
156 struct mutex usb_lock; /* usb exchange protection */ 157 struct mutex usb_lock; /* usb exchange protection */
157 struct mutex read_lock; /* read protection */ 158 struct mutex read_lock; /* read protection */
158 struct mutex queue_lock; /* ISOC queue protection */ 159 struct mutex queue_lock; /* ISOC queue protection */
159 __u32 sequence; /* frame sequence number */
160 char streaming;
161#ifdef CONFIG_PM 160#ifdef CONFIG_PM
162 char frozen; /* suspend - resume */ 161 char frozen; /* suspend - resume */
163#endif 162#endif
@@ -166,6 +165,8 @@ struct gspca_dev {
166 char nbufread; /* number of buffers for read() */ 165 char nbufread; /* number of buffers for read() */
167 char nurbs; /* number of allocated URBs */ 166 char nurbs; /* number of allocated URBs */
168 char memory; /* memory type (V4L2_MEMORY_xxx) */ 167 char memory; /* memory type (V4L2_MEMORY_xxx) */
168 __u8 iface; /* USB interface number */
169 __u8 alt; /* USB alternate setting */
169 __u8 nbalt; /* number of USB alternate settings */ 170 __u8 nbalt; /* number of USB alternate settings */
170}; 171};
171 172