aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.h
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2010-01-28 04:39:49 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:49 -0500
commit0274d42e052ecd9bc6b5f69fbfc8792ce2cc0fb6 (patch)
treec16f3c1d5f17956ce82b425473e13f5a27cfb240 /drivers/media/video/gspca/gspca.h
parent2abf6dd8e8754db6b18a4d55d3e4425c0a22d280 (diff)
V4L/DVB: gspca - main: Add input support for interrupt endpoints.
Signed-off-by: Márton Németh <nm127@freemail.hu> 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.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 53c034ea84ad..0ed254b496a5 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -91,6 +91,9 @@ typedef int (*cam_qmnu_op) (struct gspca_dev *,
91typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev, 91typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev,
92 u8 *data, 92 u8 *data,
93 int len); 93 int len);
94typedef int (*cam_int_pkt_op) (struct gspca_dev *gspca_dev,
95 u8 *data,
96 int len);
94 97
95struct ctrl { 98struct ctrl {
96 struct v4l2_queryctrl qctrl; 99 struct v4l2_queryctrl qctrl;
@@ -126,6 +129,9 @@ struct sd_desc {
126 cam_reg_op get_register; 129 cam_reg_op get_register;
127#endif 130#endif
128 cam_ident_op get_chip_ident; 131 cam_ident_op get_chip_ident;
132#ifdef CONFIG_INPUT
133 cam_int_pkt_op int_pkt_scan;
134#endif
129}; 135};
130 136
131/* packet types when moving from iso buf to frame buf */ 137/* packet types when moving from iso buf to frame buf */
@@ -148,6 +154,10 @@ struct gspca_dev {
148 struct module *module; /* subdriver handling the device */ 154 struct module *module; /* subdriver handling the device */
149 struct usb_device *dev; 155 struct usb_device *dev;
150 struct file *capt_file; /* file doing video capture */ 156 struct file *capt_file; /* file doing video capture */
157#ifdef CONFIG_INPUT
158 struct input_dev *input_dev;
159 char phys[64]; /* physical device path */
160#endif
151 161
152 struct cam cam; /* device information */ 162 struct cam cam; /* device information */
153 const struct sd_desc *sd_desc; /* subdriver description */ 163 const struct sd_desc *sd_desc; /* subdriver description */
@@ -157,6 +167,9 @@ struct gspca_dev {
157#define USB_BUF_SZ 64 167#define USB_BUF_SZ 64
158 __u8 *usb_buf; /* buffer for USB exchanges */ 168 __u8 *usb_buf; /* buffer for USB exchanges */
159 struct urb *urb[MAX_NURBS]; 169 struct urb *urb[MAX_NURBS];
170#ifdef CONFIG_INPUT
171 struct urb *int_urb;
172#endif
160 173
161 __u8 *frbuf; /* buffer for nframes */ 174 __u8 *frbuf; /* buffer for nframes */
162 struct gspca_frame frame[GSPCA_MAX_FRAMES]; 175 struct gspca_frame frame[GSPCA_MAX_FRAMES];