diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-20 16:06:30 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-06 05:08:09 +0400 |
| commit | 178cce1262762b636bcde6685a014c70640b15cc (patch) | |
| tree | c4522812c96a0973317199fe139c7c97509feac4 /drivers/media/platform/davinci/vpif_capture.h | |
| parent | 5be452c343331dadf237bed0053fdc7d623e8049 (diff) | |
| download | linux-178cce1262762b636bcde6685a014c70640b15cc.tar.xz | |
[media] vpif_capture: separate subdev from input
vpif_capture relied on a 1-1 mapping of input and subdev. This is not
necessarily the case. Separate the two. So there is a list of subdevs
and a list of inputs. Each input refers to a subdev and has routing
information. An input does not have to have a subdev.
The initial input for each channel is set to the fist input.
Currently missing is support for associating multiple subdevs with
an input.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Tested-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/davinci/vpif_capture.h')
| -rw-r--r-- | drivers/media/platform/davinci/vpif_capture.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h index 760964c56879..3d3c1e5cd5d4 100644 --- a/drivers/media/platform/davinci/vpif_capture.h +++ b/drivers/media/platform/davinci/vpif_capture.h @@ -117,12 +117,10 @@ struct channel_obj { u8 initialized; /* Identifies channel */ enum vpif_channel_id channel_id; - /* index into sd table */ - int curr_sd_index; /* Current input */ u32 input_idx; - /* ptr to current sub device information */ - struct vpif_subdev_info *curr_subdev_info; + /* subdev corresponding to the current input, may be NULL */ + struct v4l2_subdev *sd; /* vpif configuration params */ struct vpif_params vpifparams; /* common object array */ |