V4L/DVB (12187): uvcvideo: Move UVC definitions to linux/usb/video.h

To make UVC constants accessible by a future UVC gadget driver, move them from
drivers/media/video/uvc/uvcvideo.h to include/linux/usb/video.h.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 1 insertions, 135 deletions

diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index cc5023e09ca9..5cf68f590725 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -67,144 +67,12 @@ struct uvc_xu_control {
 #ifdef __KERNEL__
 
 #include <linux/poll.h>
+#include <linux/usb/video.h>
 
 /* --------------------------------------------------------------------------
  * UVC constants
  */
 
-#define UVC_SC_UNDEFINED                                0x00
-#define UVC_SC_VIDEOCONTROL                             0x01
-#define UVC_SC_VIDEOSTREAMING                           0x02
-#define UVC_SC_VIDEO_INTERFACE_COLLECTION               0x03
-
-#define UVC_PC_PROTOCOL_UNDEFINED                       0x00
-
-/* VideoControl class specific interface descriptor */
-#define UVC_VC_DESCRIPTOR_UNDEFINED                     0x00
-#define UVC_VC_HEADER                                   0x01
-#define UVC_VC_INPUT_TERMINAL                           0x02
-#define UVC_VC_OUTPUT_TERMINAL                          0x03
-#define UVC_VC_SELECTOR_UNIT                            0x04
-#define UVC_VC_PROCESSING_UNIT                          0x05
-#define UVC_VC_EXTENSION_UNIT                           0x06
-
-/* VideoStreaming class specific interface descriptor */
-#define UVC_VS_UNDEFINED                                0x00
-#define UVC_VS_INPUT_HEADER                             0x01
-#define UVC_VS_OUTPUT_HEADER                            0x02
-#define UVC_VS_STILL_IMAGE_FRAME                        0x03
-#define UVC_VS_FORMAT_UNCOMPRESSED                      0x04
-#define UVC_VS_FRAME_UNCOMPRESSED                       0x05
-#define UVC_VS_FORMAT_MJPEG                             0x06
-#define UVC_VS_FRAME_MJPEG                              0x07
-#define UVC_VS_FORMAT_MPEG2TS                           0x0a
-#define UVC_VS_FORMAT_DV                                0x0c
-#define UVC_VS_COLORFORMAT                              0x0d
-#define UVC_VS_FORMAT_FRAME_BASED                       0x10
-#define UVC_VS_FRAME_FRAME_BASED                        0x11
-#define UVC_VS_FORMAT_STREAM_BASED                      0x12
-
-/* Endpoint type */
-#define UVC_EP_UNDEFINED                                0x00
-#define UVC_EP_GENERAL                                  0x01
-#define UVC_EP_ENDPOINT                                 0x02
-#define UVC_EP_INTERRUPT                                0x03
-
-/* Request codes */
-#define UVC_RC_UNDEFINED                                0x00
-#define UVC_SET_CUR                                     0x01
-#define UVC_GET_CUR                                     0x81
-#define UVC_GET_MIN                                     0x82
-#define UVC_GET_MAX                                     0x83
-#define UVC_GET_RES                                     0x84
-#define UVC_GET_LEN                                     0x85
-#define UVC_GET_INFO                                    0x86
-#define UVC_GET_DEF                                     0x87
-
-/* VideoControl interface controls */
-#define UVC_VC_CONTROL_UNDEFINED                        0x00
-#define UVC_VC_VIDEO_POWER_MODE_CONTROL                 0x01
-#define UVC_VC_REQUEST_ERROR_CODE_CONTROL               0x02
-
-/* Terminal controls */
-#define UVC_TE_CONTROL_UNDEFINED                        0x00
-
-/* Selector Unit controls */
-#define UVC_SU_CONTROL_UNDEFINED                        0x00
-#define UVC_SU_INPUT_SELECT_CONTROL                     0x01
-
-/* Camera Terminal controls */
-#define UVC_CT_CONTROL_UNDEFINED                        0x00
-#define UVC_CT_SCANNING_MODE_CONTROL                    0x01
-#define UVC_CT_AE_MODE_CONTROL                          0x02
-#define UVC_CT_AE_PRIORITY_CONTROL                      0x03
-#define UVC_CT_EXPOSURE_TIME_ABSOLUTE_CONTROL           0x04
-#define UVC_CT_EXPOSURE_TIME_RELATIVE_CONTROL           0x05
-#define UVC_CT_FOCUS_ABSOLUTE_CONTROL                   0x06
-#define UVC_CT_FOCUS_RELATIVE_CONTROL                   0x07
-#define UVC_CT_FOCUS_AUTO_CONTROL                       0x08
-#define UVC_CT_IRIS_ABSOLUTE_CONTROL                    0x09
-#define UVC_CT_IRIS_RELATIVE_CONTROL                    0x0a
-#define UVC_CT_ZOOM_ABSOLUTE_CONTROL                    0x0b
-#define UVC_CT_ZOOM_RELATIVE_CONTROL                    0x0c
-#define UVC_CT_PANTILT_ABSOLUTE_CONTROL                 0x0d
-#define UVC_CT_PANTILT_RELATIVE_CONTROL                 0x0e
-#define UVC_CT_ROLL_ABSOLUTE_CONTROL                    0x0f
-#define UVC_CT_ROLL_RELATIVE_CONTROL                    0x10
-#define UVC_CT_PRIVACY_CONTROL                          0x11
-
-/* Processing Unit controls */
-#define UVC_PU_CONTROL_UNDEFINED                        0x00
-#define UVC_PU_BACKLIGHT_COMPENSATION_CONTROL           0x01
-#define UVC_PU_BRIGHTNESS_CONTROL                       0x02
-#define UVC_PU_CONTRAST_CONTROL                         0x03
-#define UVC_PU_GAIN_CONTROL                             0x04
-#define UVC_PU_POWER_LINE_FREQUENCY_CONTROL             0x05
-#define UVC_PU_HUE_CONTROL                              0x06
-#define UVC_PU_SATURATION_CONTROL                       0x07
-#define UVC_PU_SHARPNESS_CONTROL                        0x08
-#define UVC_PU_GAMMA_CONTROL                            0x09
-#define UVC_PU_WHITE_BALANCE_TEMPERATURE_CONTROL        0x0a
-#define UVC_PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL   0x0b
-#define UVC_PU_WHITE_BALANCE_COMPONENT_CONTROL          0x0c
-#define UVC_PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL     0x0d
-#define UVC_PU_DIGITAL_MULTIPLIER_CONTROL               0x0e
-#define UVC_PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL         0x0f
-#define UVC_PU_HUE_AUTO_CONTROL                         0x10
-#define UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL            0x11
-#define UVC_PU_ANALOG_LOCK_STATUS_CONTROL               0x12
-
-/* VideoStreaming interface controls */
-#define UVC_VS_CONTROL_UNDEFINED                        0x00
-#define UVC_VS_PROBE_CONTROL                            0x01
-#define UVC_VS_COMMIT_CONTROL                           0x02
-#define UVC_VS_STILL_PROBE_CONTROL                      0x03
-#define UVC_VS_STILL_COMMIT_CONTROL                     0x04
-#define UVC_VS_STILL_IMAGE_TRIGGER_CONTROL              0x05
-#define UVC_VS_STREAM_ERROR_CODE_CONTROL                0x06
-#define UVC_VS_GENERATE_KEY_FRAME_CONTROL               0x07
-#define UVC_VS_UPDATE_FRAME_SEGMENT_CONTROL             0x08
-#define UVC_VS_SYNC_DELAY_CONTROL                       0x09
-
-#define UVC_TT_VENDOR_SPECIFIC                          0x0100
-#define UVC_TT_STREAMING                                0x0101
-
-/* Input Terminal types */
-#define UVC_ITT_VENDOR_SPECIFIC                         0x0200
-#define UVC_ITT_CAMERA                                  0x0201
-#define UVC_ITT_MEDIA_TRANSPORT_INPUT                   0x0202
-
-/* Output Terminal types */
-#define UVC_OTT_VENDOR_SPECIFIC                         0x0300
-#define UVC_OTT_DISPLAY                                 0x0301
-#define UVC_OTT_MEDIA_TRANSPORT_OUTPUT                  0x0302
-
-/* External Terminal types */
-#define UVC_EXTERNAL_VENDOR_SPECIFIC                    0x0400
-#define UVC_COMPOSITE_CONNECTOR                         0x0401
-#define UVC_SVIDEO_CONNECTOR                            0x0402
-#define UVC_COMPONENT_CONNECTOR                         0x0403
-
 #define UVC_TERM_INPUT                  0x0000
 #define UVC_TERM_OUTPUT                 0x8000
 
@@ -216,8 +84,6 @@ struct uvc_xu_control {
 #define UVC_ENTITY_IS_OTERM(entity) \
         (((entity)->type & 0x8000) == UVC_TERM_OUTPUT)
 
-#define UVC_STATUS_TYPE_CONTROL         1
-#define UVC_STATUS_TYPE_STREAMING       2
 
 /* ------------------------------------------------------------------------
  * GUIDs