diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/media/usb/gspca/gspca.h | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/media/usb/gspca/gspca.h')
| -rw-r--r-- | drivers/media/usb/gspca/gspca.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/usb/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h index 300642d..ac0b11f 100644 --- a/drivers/media/usb/gspca/gspca.h +++ b/drivers/media/usb/gspca/gspca.h @@ -88,10 +88,6 @@ typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev, typedef int (*cam_int_pkt_op) (struct gspca_dev *gspca_dev, u8 *data, int len); -typedef void (*cam_format_op) (struct gspca_dev *gspca_dev, - struct v4l2_format *fmt); -typedef int (*cam_frmsize_op) (struct gspca_dev *gspca_dev, - struct v4l2_frmsizeenum *fsize); /* subdriver description */ struct sd_desc { @@ -113,8 +109,6 @@ struct sd_desc { cam_set_jpg_op set_jcomp; cam_streamparm_op get_streamparm; cam_streamparm_op set_streamparm; - cam_format_op try_fmt; - cam_frmsize_op enum_framesizes; #ifdef CONFIG_VIDEO_ADV_DEBUG cam_set_reg_op set_register; cam_get_reg_op get_register; @@ -189,7 +183,9 @@ struct gspca_dev { __u8 streaming; /* protected by both mutexes (*) */ __u8 curr_mode; /* current camera mode */ - struct v4l2_pix_format pixfmt; /* current mode parameters */ + __u32 pixfmt; /* current mode parameters */ + __u16 width; + __u16 height; __u32 sequence; /* frame sequence number */ wait_queue_head_t wq; /* wait queue */ |