diff options
| author | Douglas Schilling Landgraf <dougsland@redhat.com> | 2009-03-31 17:10:58 -0300 |
|---|---|---|
| committer | Douglas Schilling Landgraf <dougsland@redhat.com> | 2009-03-31 17:10:58 -0300 |
| commit | 5a77a70cc69ef5dc3da63db495a588ec1f3934bc (patch) | |
| tree | a3cc3643a6664f429737cbc34b465e88daa80f3e /linux/drivers/media/video/em28xx/em28xx.h | |
| parent | 40948714693ba8c56716c2931a4caeb6f912e184 (diff) | |
| download | mediapointer-dvb-s2-5a77a70cc69ef5dc3da63db495a588ec1f3934bc.tar.gz mediapointer-dvb-s2-5a77a70cc69ef5dc3da63db495a588ec1f3934bc.tar.bz2 | |
em28xx: convert to v4l2_subdev
From: Douglas Schilling Landgraf <dougsland@redhat.com>
Converted em28xx driver to v4l2_subdev.
Thanks to Hans Verkuil <hverkuil@xs4all.nl> for helping this conversion.
Priority: normal
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx.h')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h index c9be33aba..a9d0a865f 100644 --- a/linux/drivers/media/video/em28xx/em28xx.h +++ b/linux/drivers/media/video/em28xx/em28xx.h @@ -28,6 +28,7 @@ #include "compat.h" #include <linux/videodev2.h> #include <media/videobuf-vmalloc.h> +#include <media/v4l2-device.h> #include <linux/i2c.h> #include <linux/mutex.h> @@ -386,6 +387,8 @@ struct em28xx_board { unsigned int valid:1; unsigned char xclk, i2c_speed; + unsigned char radio_addr; + unsigned short tvaudio_addr; enum em28xx_decoder decoder; enum em28xx_adecoder adecoder; @@ -469,6 +472,7 @@ struct em28xx { int devno; /* marks the number of this device */ enum em28xx_chip_id chip_id; + struct v4l2_device v4l2_dev; struct em28xx_board board; unsigned int stream_on:1; /* Locks streams */ @@ -586,11 +590,9 @@ struct em28xx_ops { }; /* Provided by em28xx-i2c.c */ - -void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg); void em28xx_do_i2c_scan(struct em28xx *dev); -int em28xx_i2c_register(struct em28xx *dev); -int em28xx_i2c_unregister(struct em28xx *dev); +int em28xx_i2c_register(struct em28xx *dev); +int em28xx_i2c_unregister(struct em28xx *dev); /* Provided by em28xx-core.c */ |