#include <media/v4l2-common.h>
#include <linux/mutex.h>
-#ifdef GSPCA_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
/* GSPCA our debug messages */
extern int gspca_debug;
#define PDEBUG(level, fmt, args...) \
#define D_PACK 0x20
#define D_USBI 0x40
#define D_USBO 0x80
+#define D_V4L2 0x0100
#else
#define PDEBUG(level, fmt, args...)
#endif
#define GSPCA_MAX_FRAMES 16 /* maximum number of video frame buffers */
/* ISOC transfers */
-#define NURBS 4 /* number of URBs */
+#define MAX_NURBS 16 /* max number of URBs */
#define ISO_MAX_PKT 32 /* max number of packets in an ISOC transfer */
-#define ISO_MAX_SIZE 0x10000 /* max size of one URB buffer (64 Kb) */
+#define ISO_MAX_SIZE 0x8000 /* max size of one URB buffer (32 Kb) */
/* device information - set at probe time */
-struct cam_mode {
- __u32 pixfmt;
- short width;
- short height;
- short mode; /* subdriver value */
- short reserved; /* subdriver value */
-};
struct cam {
char *dev_name;
- struct cam_mode *cam_mode; /* size nmodes */
+ struct v4l2_pix_format *cam_mode; /* size nmodes */
char nmodes;
__u8 epaddr;
};
struct v4l2_querymenu *);
typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev,
struct gspca_frame *frame,
- unsigned char *data,
+ __u8 *data,
int len);
struct ctrl {
/* subdriver description */
struct sd_desc {
/* information */
- char *name; /* sub-driver name */
+ const char *name; /* sub-driver name */
/* controls */
- struct ctrl *ctrls;
+ const struct ctrl *ctrls;
int nctrls;
/* operations */
- cam_cf_op config; /* called on probe */
- cam_op open; /* called on open */
- cam_v_op start; /* called on stream on */
- cam_v_op stopN; /* called on stream off - main alt */
- cam_v_op stop0; /* called on stream off - alt 0 */
- cam_v_op close; /* called on close */
+ cam_cf_op config; /* called on probe */
+ cam_op open; /* called on open */
+ cam_v_op start; /* called on stream on */
+ cam_v_op stopN; /* called on stream off - main alt */
+ cam_v_op stop0; /* called on stream off - alt 0 */
+ cam_v_op close; /* called on close */
cam_pkt_op pkt_scan;
+/* optional operations */
+ cam_v_op dq_callback; /* called when a frame has been dequeued */
cam_jpg_op get_jcomp;
cam_jpg_op set_jcomp;
cam_qmnu_op querymenu;
};
-struct gspca_pktbuf {
- char *data;
- struct urb *urb;
-};
-
/* packet types when moving from iso buf to frame buf */
#define DISCARD_PACKET 0
#define FIRST_PACKET 1
#define LAST_PACKET 3
struct gspca_frame {
- unsigned char *data; /* frame buffer */
- unsigned char *data_end; /* current end of frame while filling */
+ __u8 *data; /* frame buffer */
+ __u8 *data_end; /* end of frame while filling */
int vma_use_count;
struct v4l2_buffer v4l2_buf;
};
struct gspca_dev {
- struct video_device vdev; /* !! must be the first item */
+ struct video_device vdev; /* !! must be the first item */
+ struct file_operations fops;
struct usb_device *dev;
+ struct file *capt_file; /* file doing video capture */
struct cam cam; /* device information */
const struct sd_desc *sd_desc; /* subdriver description */
- struct gspca_pktbuf pktbuf[NURBS];
+ __u8 usb_buf[8]; /* buffer for USB exchanges */
+ struct urb *urb[MAX_NURBS];
__u8 *frbuf; /* buffer for nframes */
struct gspca_frame frame[GSPCA_MAX_FRAMES];
- unsigned int frsz; /* frame size */
+ __u32 frsz; /* frame size */
char nframes; /* number of frames */
char fr_i; /* frame being filled */
char fr_q; /* next frame to queue */
__u8 iface; /* USB interface number */
__u8 alt; /* USB alternate setting */
- char curr_mode; /* current camera mode */
+ __u8 curr_mode; /* current camera mode */
__u32 pixfmt; /* current mode parameters */
- short width;
- short height;
+ __u16 width;
+ __u16 height;
atomic_t nevent; /* number of frames done */
wait_queue_head_t wq; /* wait queue */
struct mutex read_lock; /* read protection */
struct mutex queue_lock; /* ISOC queue protection */
__u32 sequence; /* frame sequence number */
- signed char streaming;
- char users; /* # open */
+ char streaming;
+ char users; /* number of opens */
char present; /* device connected */
char nbufread; /* number of buffers for read() */
+ char nurbs; /* number of allocated URBs */
+ char memory; /* memory type (V4L2_MEMORY_xxx) */
+ __u8 nbalt; /* number of USB alternate settings */
};
int gspca_dev_probe(struct usb_interface *intf,
const struct usb_device_id *id,
const struct sd_desc *sd_desc,
- int dev_size);
-int gspca_dev_init(struct gspca_dev *gspca_dev,
- struct usb_interface *intf);
+ int dev_size,
+ struct module *module);
void gspca_disconnect(struct usb_interface *intf);
struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
int packet_type,
struct gspca_frame *frame,
- unsigned char *data,
+ const __u8 *data,
int len);
+int gspca_auto_gain_n_exposure(struct gspca_dev *gspca_dev, int avg_lum,
+ int desired_avg_lum, int deadzone, int gain_knee, int exposure_knee);
#endif /* GSPCAV2_H */
git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff