diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-07-10 14:03:20 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 15:43:15 -0400 |
commit | bbafc0cb6c52c40647f561854db5fbac4d608186 (patch) | |
tree | d10c23e4e0a7ae5e169f7b7c627c6a762b0a2d56 /drivers/media/video/uvc | |
parent | c89f66f629f0e94806e3ec6f8f77b61a8feed39f (diff) |
V4L/DVB: uvc: Move constants and structures definitions to linux/usb/video.h
The UVC host and gadget drivers both define constants and structures in
private header files. Move all those definitions to linux/usb/video.h
where they can be shared by the two drivers (and be available for
userspace applications).
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
-rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index 47b20e7e3786..ac272456fbfd 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h | |||
@@ -196,25 +196,6 @@ struct uvc_device; | |||
196 | /* TODO: Put the most frequently accessed fields at the beginning of | 196 | /* TODO: Put the most frequently accessed fields at the beginning of |
197 | * structures to maximize cache efficiency. | 197 | * structures to maximize cache efficiency. |
198 | */ | 198 | */ |
199 | struct uvc_streaming_control { | ||
200 | __u16 bmHint; | ||
201 | __u8 bFormatIndex; | ||
202 | __u8 bFrameIndex; | ||
203 | __u32 dwFrameInterval; | ||
204 | __u16 wKeyFrameRate; | ||
205 | __u16 wPFrameRate; | ||
206 | __u16 wCompQuality; | ||
207 | __u16 wCompWindowSize; | ||
208 | __u16 wDelay; | ||
209 | __u32 dwMaxVideoFrameSize; | ||
210 | __u32 dwMaxPayloadTransferSize; | ||
211 | __u32 dwClockFrequency; | ||
212 | __u8 bmFramingInfo; | ||
213 | __u8 bPreferedVersion; | ||
214 | __u8 bMinVersion; | ||
215 | __u8 bMaxVersion; | ||
216 | }; | ||
217 | |||
218 | struct uvc_control_info { | 199 | struct uvc_control_info { |
219 | struct list_head list; | 200 | struct list_head list; |
220 | struct list_head mappings; | 201 | struct list_head mappings; |