diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-03-24 20:33:20 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 18:23:36 +0200 |
| commit | f0e38230b3b1e564841a52e2de17e063f5df19ea (patch) | |
| tree | f471792de12dbb58aac04bb1fac7ee527dfb9e12 /drivers/media/usb/em28xx/em28xx.h | |
| parent | [media] em28xx: move sensor parameter fields from struct em28xx to struct v4l2 (diff) | |
| download | linux-f0e38230b3b1e564841a52e2de17e063f5df19ea.tar.xz linux-f0e38230b3b1e564841a52e2de17e063f5df19ea.zip | |
[media] em28xx: move capture state tracking fields from struct em28xx to struct v4l2
Move some temporary capture tracking date to the em28xx_v4l2 struct,
as those info are used only by em28xx v4l2 submodule.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx.h')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index 59040fc21b10..7edba65f99c9 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -539,6 +539,12 @@ struct em28xx_v4l2 { unsigned vscale; /* vertical scale factor (see datasheet) */ unsigned int vbi_width; unsigned int vbi_height; /* lines per field */ + + /* Capture state tracking */ + int capture_type; + bool top_field; + int vbi_read; + unsigned int field_count; }; struct em28xx_audio { @@ -649,11 +655,6 @@ struct em28xx { unsigned long i2c_hash; /* i2c devicelist hash - for boards with generic ID */ - /* capture state tracking */ - int capture_type; - unsigned char top_field:1; - int vbi_read; - struct work_struct request_module_wk; /* locks */ @@ -673,8 +674,6 @@ struct em28xx { struct em28xx_usb_ctl usb_ctl; spinlock_t slock; - unsigned int field_count; - /* usb transfer */ struct usb_device *udev; /* the usb device */ u8 ifnum; /* number of the assigned usb interface */ |