diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2009-11-25 12:00:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 18:42:13 -0200 |
| commit | 8ca5a639f4f3eb8958a7e270fcff7516374637a5 (patch) | |
| tree | c4d79ad0d56913cfedff5c9018d2f32b2f7cc2a1 /drivers/media/video/uvc/uvcvideo.h | |
| parent | 4057ac6ca9a77c4275b34b5925ab5c99557913b1 (diff) | |
| download | op-kernel-dev-8ca5a639f4f3eb8958a7e270fcff7516374637a5.zip op-kernel-dev-8ca5a639f4f3eb8958a7e270fcff7516374637a5.tar.gz | |
V4L/DVB (13506): uvcvideo: Factorize common field in uvc_entity structure
The bNrInPins and baSourceID fields are common among all entities (some
of use bSourceID but this is conceptually the same). Move those two
fields out of entity type-specific unions into the uvc_entity structure
top level.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvcvideo.h')
| -rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index 9e6948fb..7ec9a04 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h @@ -293,11 +293,9 @@ struct uvc_entity { } media; struct { - __u8 bSourceID; } output; struct { - __u8 bSourceID; __u16 wMaxMultiplier; __u8 bControlSize; __u8 *bmControls; @@ -305,21 +303,20 @@ struct uvc_entity { } processing; struct { - __u8 bNrInPins; - __u8 *baSourceID; } selector; struct { __u8 guidExtensionCode[16]; __u8 bNumControls; - __u8 bNrInPins; - __u8 *baSourceID; __u8 bControlSize; __u8 *bmControls; __u8 *bmControlsType; } extension; }; + __u8 bNrInPins; + __u8 *baSourceID; + unsigned int ncontrols; struct uvc_control *controls; }; |
