diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-03-24 20:33:18 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 18:20:13 +0200 |
| commit | 58159171c7f201e5d6ea2666c7b3857e782a2861 (patch) | |
| tree | c08bbdf1440555d55cee9bfc9a537bb4125ebbbb /drivers/media/usb/em28xx/em28xx.h | |
| parent | [media] em28xx: move struct em28xx_fmt *format from struct em28xx to struct v4l2 (diff) | |
| download | linux-58159171c7f201e5d6ea2666c7b3857e782a2861.tar.xz linux-58159171c7f201e5d6ea2666c7b3857e782a2861.zip | |
[media] em28xx: move progressive/interlaced fields from struct em28xx to struct v4l2
The video progressive data fields belong to analog TV. Move them out
of the common em28xx struct.
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index ef23803656bf..af7e8ee16756 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -522,6 +522,11 @@ struct em28xx_v4l2 { struct em28xx_fmt *format; v4l2_std_id norm; /* selected tv norm */ + /* Progressive/interlaced mode */ + bool progressive; + int interlaced_fieldmode; /* 1=interlaced fields, 0=just top fields */ + /* FIXME: everything else than interlaced_fieldmode=1 doesn't work */ + /* Frame properties */ int width; /* current frame width */ int height; /* current frame height */ @@ -601,9 +606,6 @@ struct em28xx { int sensor_xres, sensor_yres; int sensor_xtal; - /* Progressive (non-interlaced) mode */ - int progressive; - /* Controls audio streaming */ struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */ atomic_t stream_started; /* stream should be running if true */ @@ -641,8 +643,6 @@ struct em28xx { int mute; int volume; - int interlaced; /* 1=interlace fileds, 0=just top fileds */ - unsigned long hash; /* eeprom hash - for boards with generic ID */ unsigned long i2c_hash; /* i2c devicelist hash - for boards with generic ID */ |