diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 16:31:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 16:31:15 -0300 |
| commit | f42fd11e76e077c2e4ccd61627cdb53ab7e32e8d (patch) | |
| tree | 9e4762aa354bafad8f789d4d4dbb1fb5ccc23239 /linux/drivers/media/video/usbvision/usbvision.h | |
| parent | ab59a93feb6d2b697c06ee5fad3ff40a7d2b34ed (diff) | |
| parent | c25f637daca2ca532f5cf0bb6f32decb8308953c (diff) | |
| download | mediapointer-dvb-s2-f42fd11e76e077c2e4ccd61627cdb53ab7e32e8d.tar.gz mediapointer-dvb-s2-f42fd11e76e077c2e4ccd61627cdb53ab7e32e8d.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-usbvision
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision.h')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision.h b/linux/drivers/media/video/usbvision/usbvision.h index 590ff1e19..dc86c2139 100644 --- a/linux/drivers/media/video/usbvision/usbvision.h +++ b/linux/drivers/media/video/usbvision/usbvision.h @@ -35,7 +35,7 @@ #include <linux/usb.h> #include <linux/i2c.h> #include <linux/mutex.h> -#include <media/v4l2-common.h> +#include <media/v4l2-device.h> #include <media/tuner.h> #include <linux/videodev2.h> #include "compat.h" @@ -358,13 +358,13 @@ extern struct usbvision_device_data_st usbvision_device_data[]; extern struct usb_device_id usbvision_table[]; struct usb_usbvision { + struct v4l2_device v4l2_dev; struct video_device *vdev; /* Video Device */ struct video_device *rdev; /* Radio Device */ struct video_device *vbi; /* VBI Device */ /* i2c Declaration Section*/ struct i2c_adapter i2c_adap; - struct i2c_client i2c_client; struct urb *ctrlUrb; unsigned char ctrlUrbBuffer[8]; @@ -375,7 +375,6 @@ struct usb_usbvision { /* configuration part */ int have_tuner; int tuner_type; - int tuner_addr; int bridgeType; // NT1003, NT1004, NT1005 int radio; int video_inputs; // # of inputs @@ -465,6 +464,8 @@ struct usb_usbvision { int ComprBlockTypes[4]; }; +#define call_all(usbvision, o, f, args...) \ + v4l2_device_call_all(&usbvision->v4l2_dev, 0, o, f, ##args) /* --------------------------------------------------------------- */ /* defined in usbvision-i2c.c */ @@ -476,7 +477,6 @@ struct usb_usbvision { /* ----------------------------------------------------------------------- */ int usbvision_i2c_register(struct usb_usbvision *usbvision); int usbvision_i2c_unregister(struct usb_usbvision *usbvision); -void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg); /* defined in usbvision-core.c */ int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg); |