Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts: arch/x86/kernel/setup_percpu.c arch/x86/mm/fault.c drivers/acpi/processor_idle.c kernel/irq/handle.c
author: Ingo Molnar <mingo@elte.hu> 2009-02-11 03:22:04 -0500
committer: Ingo Molnar <mingo@elte.hu> 2009-02-11 03:22:04 -0500
commit: 95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch)
tree: aa2aac22a5b329b778a6771a87bbf1945ad49bbd /drivers/media/video/uvc/uvcvideo.h
parent: d278c48435625cb6b7edcf6a547620768b175709 (diff)
parent: 8e4921515c1a379539607eb443d51c30f4f7f338 (diff)
1 files changed, 116 insertions, 116 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index bcf4361dc1bc..027947ea9b6e 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -72,149 +72,149 @@ struct uvc_xu_control {
 * UVC constants
 */
-#define SC_UNDEFINED                    0x00
+#define SC_UNDEFINED                    0x00
-#define SC_VIDEOCONTROL                 0x01
+#define SC_VIDEOCONTROL                 0x01
-#define SC_VIDEOSTREAMING               0x02
+#define SC_VIDEOSTREAMING               0x02
-#define SC_VIDEO_INTERFACE_COLLECTION   0x03
+#define SC_VIDEO_INTERFACE_COLLECTION   0x03
-#define PC_PROTOCOL_UNDEFINED           0x00
+#define PC_PROTOCOL_UNDEFINED           0x00
-#define CS_UNDEFINED                    0x20
+#define CS_UNDEFINED                    0x20
-#define CS_DEVICE                       0x21
+#define CS_DEVICE                       0x21
-#define CS_CONFIGURATION                0x22
+#define CS_CONFIGURATION                0x22
-#define CS_STRING                       0x23
+#define CS_STRING                       0x23
-#define CS_INTERFACE                    0x24
+#define CS_INTERFACE                    0x24
-#define CS_ENDPOINT                     0x25
+#define CS_ENDPOINT                     0x25
 /* VideoControl class specific interface descriptor */
-#define VC_DESCRIPTOR_UNDEFINED         0x00
+#define VC_DESCRIPTOR_UNDEFINED         0x00
-#define VC_HEADER                       0x01
+#define VC_HEADER                       0x01
-#define VC_INPUT_TERMINAL               0x02
+#define VC_INPUT_TERMINAL               0x02
-#define VC_OUTPUT_TERMINAL              0x03
+#define VC_OUTPUT_TERMINAL              0x03
-#define VC_SELECTOR_UNIT                0x04
+#define VC_SELECTOR_UNIT                0x04
-#define VC_PROCESSING_UNIT              0x05
+#define VC_PROCESSING_UNIT              0x05
-#define VC_EXTENSION_UNIT               0x06
+#define VC_EXTENSION_UNIT               0x06
 /* VideoStreaming class specific interface descriptor */
-#define VS_UNDEFINED                    0x00
+#define VS_UNDEFINED                    0x00
-#define VS_INPUT_HEADER                 0x01
+#define VS_INPUT_HEADER                 0x01
-#define VS_OUTPUT_HEADER                0x02
+#define VS_OUTPUT_HEADER                0x02
-#define VS_STILL_IMAGE_FRAME            0x03
+#define VS_STILL_IMAGE_FRAME            0x03
-#define VS_FORMAT_UNCOMPRESSED          0x04
+#define VS_FORMAT_UNCOMPRESSED          0x04
-#define VS_FRAME_UNCOMPRESSED           0x05
+#define VS_FRAME_UNCOMPRESSED           0x05
-#define VS_FORMAT_MJPEG                 0x06
+#define VS_FORMAT_MJPEG                 0x06
-#define VS_FRAME_MJPEG                  0x07
+#define VS_FRAME_MJPEG                  0x07
-#define VS_FORMAT_MPEG2TS               0x0a
+#define VS_FORMAT_MPEG2TS               0x0a
-#define VS_FORMAT_DV                    0x0c
+#define VS_FORMAT_DV                    0x0c
-#define VS_COLORFORMAT                  0x0d
+#define VS_COLORFORMAT                  0x0d
-#define VS_FORMAT_FRAME_BASED           0x10
+#define VS_FORMAT_FRAME_BASED           0x10
-#define VS_FRAME_FRAME_BASED            0x11
+#define VS_FRAME_FRAME_BASED            0x11
-#define VS_FORMAT_STREAM_BASED          0x12
+#define VS_FORMAT_STREAM_BASED          0x12
 /* Endpoint type */
-#define EP_UNDEFINED                    0x00
+#define EP_UNDEFINED                    0x00
-#define EP_GENERAL                      0x01
+#define EP_GENERAL                      0x01
-#define EP_ENDPOINT                     0x02
+#define EP_ENDPOINT                     0x02
-#define EP_INTERRUPT                    0x03
+#define EP_INTERRUPT                    0x03
 /* Request codes */
-#define RC_UNDEFINED                    0x00
+#define RC_UNDEFINED                    0x00
-#define SET_CUR                         0x01
+#define SET_CUR                         0x01
-#define GET_CUR                         0x81
+#define GET_CUR                         0x81
-#define GET_MIN                         0x82
+#define GET_MIN                         0x82
-#define GET_MAX                         0x83
+#define GET_MAX                         0x83
-#define GET_RES                         0x84
+#define GET_RES                         0x84
-#define GET_LEN                         0x85
+#define GET_LEN                         0x85
-#define GET_INFO                        0x86
+#define GET_INFO                        0x86
-#define GET_DEF                         0x87
+#define GET_DEF                         0x87
 /* VideoControl interface controls */
-#define VC_CONTROL_UNDEFINED            0x00
+#define VC_CONTROL_UNDEFINED            0x00
-#define VC_VIDEO_POWER_MODE_CONTROL     0x01
+#define VC_VIDEO_POWER_MODE_CONTROL     0x01
-#define VC_REQUEST_ERROR_CODE_CONTROL   0x02
+#define VC_REQUEST_ERROR_CODE_CONTROL   0x02
 /* Terminal controls */
-#define TE_CONTROL_UNDEFINED            0x00
+#define TE_CONTROL_UNDEFINED            0x00
 /* Selector Unit controls */
-#define SU_CONTROL_UNDEFINED            0x00
+#define SU_CONTROL_UNDEFINED            0x00
-#define SU_INPUT_SELECT_CONTROL         0x01
+#define SU_INPUT_SELECT_CONTROL         0x01
 /* Camera Terminal controls */
-#define CT_CONTROL_UNDEFINED                            0x00
+#define CT_CONTROL_UNDEFINED                            0x00
-#define CT_SCANNING_MODE_CONTROL                        0x01
+#define CT_SCANNING_MODE_CONTROL                        0x01
-#define CT_AE_MODE_CONTROL                              0x02
+#define CT_AE_MODE_CONTROL                              0x02
-#define CT_AE_PRIORITY_CONTROL                          0x03
+#define CT_AE_PRIORITY_CONTROL                          0x03
-#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL               0x04
+#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL               0x04
-#define CT_EXPOSURE_TIME_RELATIVE_CONTROL               0x05
+#define CT_EXPOSURE_TIME_RELATIVE_CONTROL               0x05
-#define CT_FOCUS_ABSOLUTE_CONTROL                       0x06
+#define CT_FOCUS_ABSOLUTE_CONTROL                       0x06
-#define CT_FOCUS_RELATIVE_CONTROL                       0x07
+#define CT_FOCUS_RELATIVE_CONTROL                       0x07
-#define CT_FOCUS_AUTO_CONTROL                           0x08
+#define CT_FOCUS_AUTO_CONTROL                           0x08
-#define CT_IRIS_ABSOLUTE_CONTROL                        0x09
+#define CT_IRIS_ABSOLUTE_CONTROL                        0x09
-#define CT_IRIS_RELATIVE_CONTROL                        0x0a
+#define CT_IRIS_RELATIVE_CONTROL                        0x0a
-#define CT_ZOOM_ABSOLUTE_CONTROL                        0x0b
+#define CT_ZOOM_ABSOLUTE_CONTROL                        0x0b
-#define CT_ZOOM_RELATIVE_CONTROL                        0x0c
+#define CT_ZOOM_RELATIVE_CONTROL                        0x0c
-#define CT_PANTILT_ABSOLUTE_CONTROL                     0x0d
+#define CT_PANTILT_ABSOLUTE_CONTROL                     0x0d
-#define CT_PANTILT_RELATIVE_CONTROL                     0x0e
+#define CT_PANTILT_RELATIVE_CONTROL                     0x0e
-#define CT_ROLL_ABSOLUTE_CONTROL                        0x0f
+#define CT_ROLL_ABSOLUTE_CONTROL                        0x0f
-#define CT_ROLL_RELATIVE_CONTROL                        0x10
+#define CT_ROLL_RELATIVE_CONTROL                        0x10
-#define CT_PRIVACY_CONTROL                              0x11
+#define CT_PRIVACY_CONTROL                              0x11
 /* Processing Unit controls */
-#define PU_CONTROL_UNDEFINED                            0x00
+#define PU_CONTROL_UNDEFINED                            0x00
-#define PU_BACKLIGHT_COMPENSATION_CONTROL               0x01
+#define PU_BACKLIGHT_COMPENSATION_CONTROL               0x01
-#define PU_BRIGHTNESS_CONTROL                           0x02
+#define PU_BRIGHTNESS_CONTROL                           0x02
-#define PU_CONTRAST_CONTROL                             0x03
+#define PU_CONTRAST_CONTROL                             0x03
-#define PU_GAIN_CONTROL                                 0x04
+#define PU_GAIN_CONTROL                                 0x04
-#define PU_POWER_LINE_FREQUENCY_CONTROL                 0x05
+#define PU_POWER_LINE_FREQUENCY_CONTROL                 0x05
-#define PU_HUE_CONTROL                                  0x06
+#define PU_HUE_CONTROL                                  0x06
-#define PU_SATURATION_CONTROL                           0x07
+#define PU_SATURATION_CONTROL                           0x07
-#define PU_SHARPNESS_CONTROL                            0x08
+#define PU_SHARPNESS_CONTROL                            0x08
-#define PU_GAMMA_CONTROL                                0x09
+#define PU_GAMMA_CONTROL                                0x09
-#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL            0x0a
+#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL            0x0a
-#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL       0x0b
+#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL       0x0b
-#define PU_WHITE_BALANCE_COMPONENT_CONTROL              0x0c
+#define PU_WHITE_BALANCE_COMPONENT_CONTROL              0x0c
-#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL         0x0d
+#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL         0x0d
-#define PU_DIGITAL_MULTIPLIER_CONTROL                   0x0e
+#define PU_DIGITAL_MULTIPLIER_CONTROL                   0x0e
-#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL             0x0f
+#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL             0x0f
-#define PU_HUE_AUTO_CONTROL                             0x10
+#define PU_HUE_AUTO_CONTROL                             0x10
-#define PU_ANALOG_VIDEO_STANDARD_CONTROL                0x11
+#define PU_ANALOG_VIDEO_STANDARD_CONTROL                0x11
-#define PU_ANALOG_LOCK_STATUS_CONTROL                   0x12
+#define PU_ANALOG_LOCK_STATUS_CONTROL                   0x12
 #define LXU_MOTOR_PANTILT_RELATIVE_CONTROL              0x01
 #define LXU_MOTOR_PANTILT_RESET_CONTROL                 0x02
 #define LXU_MOTOR_FOCUS_MOTOR_CONTROL                   0x03
 /* VideoStreaming interface controls */
-#define VS_CONTROL_UNDEFINED            0x00
+#define VS_CONTROL_UNDEFINED            0x00
-#define VS_PROBE_CONTROL                0x01
+#define VS_PROBE_CONTROL                0x01
-#define VS_COMMIT_CONTROL               0x02
+#define VS_COMMIT_CONTROL               0x02
-#define VS_STILL_PROBE_CONTROL          0x03
+#define VS_STILL_PROBE_CONTROL          0x03
-#define VS_STILL_COMMIT_CONTROL         0x04
+#define VS_STILL_COMMIT_CONTROL         0x04
-#define VS_STILL_IMAGE_TRIGGER_CONTROL  0x05
+#define VS_STILL_IMAGE_TRIGGER_CONTROL  0x05
-#define VS_STREAM_ERROR_CODE_CONTROL    0x06
+#define VS_STREAM_ERROR_CODE_CONTROL    0x06
-#define VS_GENERATE_KEY_FRAME_CONTROL   0x07
+#define VS_GENERATE_KEY_FRAME_CONTROL   0x07
-#define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08
+#define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08
-#define VS_SYNC_DELAY_CONTROL           0x09
+#define VS_SYNC_DELAY_CONTROL           0x09
-#define TT_VENDOR_SPECIFIC              0x0100
+#define TT_VENDOR_SPECIFIC              0x0100
-#define TT_STREAMING                    0x0101
+#define TT_STREAMING                    0x0101
 /* Input Terminal types */
-#define ITT_VENDOR_SPECIFIC             0x0200
+#define ITT_VENDOR_SPECIFIC             0x0200
-#define ITT_CAMERA                      0x0201
+#define ITT_CAMERA                      0x0201
-#define ITT_MEDIA_TRANSPORT_INPUT       0x0202
+#define ITT_MEDIA_TRANSPORT_INPUT       0x0202
 /* Output Terminal types */
-#define OTT_VENDOR_SPECIFIC             0x0300
+#define OTT_VENDOR_SPECIFIC             0x0300
-#define OTT_DISPLAY                     0x0301
+#define OTT_DISPLAY                     0x0301
-#define OTT_MEDIA_TRANSPORT_OUTPUT      0x0302
+#define OTT_MEDIA_TRANSPORT_OUTPUT      0x0302
 /* External Terminal types */
-#define EXTERNAL_VENDOR_SPECIFIC        0x0400
+#define EXTERNAL_VENDOR_SPECIFIC        0x0400
-#define COMPOSITE_CONNECTOR             0x0401
+#define COMPOSITE_CONNECTOR             0x0401
-#define SVIDEO_CONNECTOR                0x0402
+#define SVIDEO_CONNECTOR                0x0402
-#define COMPONENT_CONNECTOR             0x0403
+#define COMPONENT_CONNECTOR             0x0403
 #define UVC_TERM_INPUT                  0x0000
 #define UVC_TERM_OUTPUT                 0x8000
@@ -541,11 +541,11 @@ struct uvc_streaming {
 };
 enum uvc_buffer_state {
-        UVC_BUF_STATE_IDLE       = 0,
+        UVC_BUF_STATE_IDLE      = 0,
-        UVC_BUF_STATE_QUEUED     = 1,
+        UVC_BUF_STATE_QUEUED    = 1,
-        UVC_BUF_STATE_ACTIVE     = 2,
+        UVC_BUF_STATE_ACTIVE    = 2,
-        UVC_BUF_STATE_DONE       = 3,
+        UVC_BUF_STATE_DONE      = 3,
-        UVC_BUF_STATE_ERROR      = 4,
+        UVC_BUF_STATE_ERROR     = 4,
 };
 struct uvc_buffer {
author	Ingo Molnar <mingo@elte.hu>	2009-02-11 03:22:04 -0500
committer	Ingo Molnar <mingo@elte.hu>	2009-02-11 03:22:04 -0500
commit	95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c (patch)
tree	aa2aac22a5b329b778a6771a87bbf1945ad49bbd /drivers/media/video/uvc/uvcvideo.h
parent	d278c48435625cb6b7edcf6a547620768b175709 (diff)
parent	8e4921515c1a379539607eb443d51c30f4f7f338 (diff)

diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index bcf4361dc1bc..027947ea9b6e 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h
@@ -72,149 +72,149 @@ struct uvc_xu_control {
72	* UVC constants	72	* UVC constants
73	*/	73	*/
74		74
75	#define SC_UNDEFINED 0x00	75	#define SC_UNDEFINED 0x00
76	#define SC_VIDEOCONTROL 0x01	76	#define SC_VIDEOCONTROL 0x01
77	#define SC_VIDEOSTREAMING 0x02	77	#define SC_VIDEOSTREAMING 0x02
78	#define SC_VIDEO_INTERFACE_COLLECTION 0x03	78	#define SC_VIDEO_INTERFACE_COLLECTION 0x03
79		79
80	#define PC_PROTOCOL_UNDEFINED 0x00	80	#define PC_PROTOCOL_UNDEFINED 0x00
81		81
82	#define CS_UNDEFINED 0x20	82	#define CS_UNDEFINED 0x20
83	#define CS_DEVICE 0x21	83	#define CS_DEVICE 0x21
84	#define CS_CONFIGURATION 0x22	84	#define CS_CONFIGURATION 0x22
85	#define CS_STRING 0x23	85	#define CS_STRING 0x23
86	#define CS_INTERFACE 0x24	86	#define CS_INTERFACE 0x24
87	#define CS_ENDPOINT 0x25	87	#define CS_ENDPOINT 0x25
88		88
89	/* VideoControl class specific interface descriptor */	89	/* VideoControl class specific interface descriptor */
90	#define VC_DESCRIPTOR_UNDEFINED 0x00	90	#define VC_DESCRIPTOR_UNDEFINED 0x00
91	#define VC_HEADER 0x01	91	#define VC_HEADER 0x01
92	#define VC_INPUT_TERMINAL 0x02	92	#define VC_INPUT_TERMINAL 0x02
93	#define VC_OUTPUT_TERMINAL 0x03	93	#define VC_OUTPUT_TERMINAL 0x03
94	#define VC_SELECTOR_UNIT 0x04	94	#define VC_SELECTOR_UNIT 0x04
95	#define VC_PROCESSING_UNIT 0x05	95	#define VC_PROCESSING_UNIT 0x05
96	#define VC_EXTENSION_UNIT 0x06	96	#define VC_EXTENSION_UNIT 0x06
97		97
98	/* VideoStreaming class specific interface descriptor */	98	/* VideoStreaming class specific interface descriptor */
99	#define VS_UNDEFINED 0x00	99	#define VS_UNDEFINED 0x00
100	#define VS_INPUT_HEADER 0x01	100	#define VS_INPUT_HEADER 0x01
101	#define VS_OUTPUT_HEADER 0x02	101	#define VS_OUTPUT_HEADER 0x02
102	#define VS_STILL_IMAGE_FRAME 0x03	102	#define VS_STILL_IMAGE_FRAME 0x03
103	#define VS_FORMAT_UNCOMPRESSED 0x04	103	#define VS_FORMAT_UNCOMPRESSED 0x04
104	#define VS_FRAME_UNCOMPRESSED 0x05	104	#define VS_FRAME_UNCOMPRESSED 0x05
105	#define VS_FORMAT_MJPEG 0x06	105	#define VS_FORMAT_MJPEG 0x06
106	#define VS_FRAME_MJPEG 0x07	106	#define VS_FRAME_MJPEG 0x07
107	#define VS_FORMAT_MPEG2TS 0x0a	107	#define VS_FORMAT_MPEG2TS 0x0a
108	#define VS_FORMAT_DV 0x0c	108	#define VS_FORMAT_DV 0x0c
109	#define VS_COLORFORMAT 0x0d	109	#define VS_COLORFORMAT 0x0d
110	#define VS_FORMAT_FRAME_BASED 0x10	110	#define VS_FORMAT_FRAME_BASED 0x10
111	#define VS_FRAME_FRAME_BASED 0x11	111	#define VS_FRAME_FRAME_BASED 0x11
112	#define VS_FORMAT_STREAM_BASED 0x12	112	#define VS_FORMAT_STREAM_BASED 0x12
113		113
114	/* Endpoint type */	114	/* Endpoint type */
115	#define EP_UNDEFINED 0x00	115	#define EP_UNDEFINED 0x00
116	#define EP_GENERAL 0x01	116	#define EP_GENERAL 0x01
117	#define EP_ENDPOINT 0x02	117	#define EP_ENDPOINT 0x02
118	#define EP_INTERRUPT 0x03	118	#define EP_INTERRUPT 0x03
119		119
120	/* Request codes */	120	/* Request codes */
121	#define RC_UNDEFINED 0x00	121	#define RC_UNDEFINED 0x00
122	#define SET_CUR 0x01	122	#define SET_CUR 0x01
123	#define GET_CUR 0x81	123	#define GET_CUR 0x81
124	#define GET_MIN 0x82	124	#define GET_MIN 0x82
125	#define GET_MAX 0x83	125	#define GET_MAX 0x83
126	#define GET_RES 0x84	126	#define GET_RES 0x84
127	#define GET_LEN 0x85	127	#define GET_LEN 0x85
128	#define GET_INFO 0x86	128	#define GET_INFO 0x86
129	#define GET_DEF 0x87	129	#define GET_DEF 0x87
130		130
131	/* VideoControl interface controls */	131	/* VideoControl interface controls */
132	#define VC_CONTROL_UNDEFINED 0x00	132	#define VC_CONTROL_UNDEFINED 0x00
133	#define VC_VIDEO_POWER_MODE_CONTROL 0x01	133	#define VC_VIDEO_POWER_MODE_CONTROL 0x01
134	#define VC_REQUEST_ERROR_CODE_CONTROL 0x02	134	#define VC_REQUEST_ERROR_CODE_CONTROL 0x02
135		135
136	/* Terminal controls */	136	/* Terminal controls */
137	#define TE_CONTROL_UNDEFINED 0x00	137	#define TE_CONTROL_UNDEFINED 0x00
138		138
139	/* Selector Unit controls */	139	/* Selector Unit controls */
140	#define SU_CONTROL_UNDEFINED 0x00	140	#define SU_CONTROL_UNDEFINED 0x00
141	#define SU_INPUT_SELECT_CONTROL 0x01	141	#define SU_INPUT_SELECT_CONTROL 0x01
142		142
143	/* Camera Terminal controls */	143	/* Camera Terminal controls */
144	#define CT_CONTROL_UNDEFINED 0x00	144	#define CT_CONTROL_UNDEFINED 0x00
145	#define CT_SCANNING_MODE_CONTROL 0x01	145	#define CT_SCANNING_MODE_CONTROL 0x01
146	#define CT_AE_MODE_CONTROL 0x02	146	#define CT_AE_MODE_CONTROL 0x02
147	#define CT_AE_PRIORITY_CONTROL 0x03	147	#define CT_AE_PRIORITY_CONTROL 0x03
148	#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL 0x04	148	#define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL 0x04
149	#define CT_EXPOSURE_TIME_RELATIVE_CONTROL 0x05	149	#define CT_EXPOSURE_TIME_RELATIVE_CONTROL 0x05
150	#define CT_FOCUS_ABSOLUTE_CONTROL 0x06	150	#define CT_FOCUS_ABSOLUTE_CONTROL 0x06
151	#define CT_FOCUS_RELATIVE_CONTROL 0x07	151	#define CT_FOCUS_RELATIVE_CONTROL 0x07
152	#define CT_FOCUS_AUTO_CONTROL 0x08	152	#define CT_FOCUS_AUTO_CONTROL 0x08
153	#define CT_IRIS_ABSOLUTE_CONTROL 0x09	153	#define CT_IRIS_ABSOLUTE_CONTROL 0x09
154	#define CT_IRIS_RELATIVE_CONTROL 0x0a	154	#define CT_IRIS_RELATIVE_CONTROL 0x0a
155	#define CT_ZOOM_ABSOLUTE_CONTROL 0x0b	155	#define CT_ZOOM_ABSOLUTE_CONTROL 0x0b
156	#define CT_ZOOM_RELATIVE_CONTROL 0x0c	156	#define CT_ZOOM_RELATIVE_CONTROL 0x0c
157	#define CT_PANTILT_ABSOLUTE_CONTROL 0x0d	157	#define CT_PANTILT_ABSOLUTE_CONTROL 0x0d
158	#define CT_PANTILT_RELATIVE_CONTROL 0x0e	158	#define CT_PANTILT_RELATIVE_CONTROL 0x0e
159	#define CT_ROLL_ABSOLUTE_CONTROL 0x0f	159	#define CT_ROLL_ABSOLUTE_CONTROL 0x0f
160	#define CT_ROLL_RELATIVE_CONTROL 0x10	160	#define CT_ROLL_RELATIVE_CONTROL 0x10
161	#define CT_PRIVACY_CONTROL 0x11	161	#define CT_PRIVACY_CONTROL 0x11
162		162
163	/* Processing Unit controls */	163	/* Processing Unit controls */
164	#define PU_CONTROL_UNDEFINED 0x00	164	#define PU_CONTROL_UNDEFINED 0x00
165	#define PU_BACKLIGHT_COMPENSATION_CONTROL 0x01	165	#define PU_BACKLIGHT_COMPENSATION_CONTROL 0x01
166	#define PU_BRIGHTNESS_CONTROL 0x02	166	#define PU_BRIGHTNESS_CONTROL 0x02
167	#define PU_CONTRAST_CONTROL 0x03	167	#define PU_CONTRAST_CONTROL 0x03
168	#define PU_GAIN_CONTROL 0x04	168	#define PU_GAIN_CONTROL 0x04
169	#define PU_POWER_LINE_FREQUENCY_CONTROL 0x05	169	#define PU_POWER_LINE_FREQUENCY_CONTROL 0x05
170	#define PU_HUE_CONTROL 0x06	170	#define PU_HUE_CONTROL 0x06
171	#define PU_SATURATION_CONTROL 0x07	171	#define PU_SATURATION_CONTROL 0x07
172	#define PU_SHARPNESS_CONTROL 0x08	172	#define PU_SHARPNESS_CONTROL 0x08
173	#define PU_GAMMA_CONTROL 0x09	173	#define PU_GAMMA_CONTROL 0x09
174	#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL 0x0a	174	#define PU_WHITE_BALANCE_TEMPERATURE_CONTROL 0x0a
175	#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL 0x0b	175	#define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL 0x0b
176	#define PU_WHITE_BALANCE_COMPONENT_CONTROL 0x0c	176	#define PU_WHITE_BALANCE_COMPONENT_CONTROL 0x0c
177	#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL 0x0d	177	#define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL 0x0d
178	#define PU_DIGITAL_MULTIPLIER_CONTROL 0x0e	178	#define PU_DIGITAL_MULTIPLIER_CONTROL 0x0e
179	#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL 0x0f	179	#define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL 0x0f
180	#define PU_HUE_AUTO_CONTROL 0x10	180	#define PU_HUE_AUTO_CONTROL 0x10
181	#define PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11	181	#define PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11
182	#define PU_ANALOG_LOCK_STATUS_CONTROL 0x12	182	#define PU_ANALOG_LOCK_STATUS_CONTROL 0x12
183		183
184	#define LXU_MOTOR_PANTILT_RELATIVE_CONTROL 0x01	184	#define LXU_MOTOR_PANTILT_RELATIVE_CONTROL 0x01
185	#define LXU_MOTOR_PANTILT_RESET_CONTROL 0x02	185	#define LXU_MOTOR_PANTILT_RESET_CONTROL 0x02
186	#define LXU_MOTOR_FOCUS_MOTOR_CONTROL 0x03	186	#define LXU_MOTOR_FOCUS_MOTOR_CONTROL 0x03
187		187
188	/* VideoStreaming interface controls */	188	/* VideoStreaming interface controls */
189	#define VS_CONTROL_UNDEFINED 0x00	189	#define VS_CONTROL_UNDEFINED 0x00
190	#define VS_PROBE_CONTROL 0x01	190	#define VS_PROBE_CONTROL 0x01
191	#define VS_COMMIT_CONTROL 0x02	191	#define VS_COMMIT_CONTROL 0x02
192	#define VS_STILL_PROBE_CONTROL 0x03	192	#define VS_STILL_PROBE_CONTROL 0x03
193	#define VS_STILL_COMMIT_CONTROL 0x04	193	#define VS_STILL_COMMIT_CONTROL 0x04
194	#define VS_STILL_IMAGE_TRIGGER_CONTROL 0x05	194	#define VS_STILL_IMAGE_TRIGGER_CONTROL 0x05
195	#define VS_STREAM_ERROR_CODE_CONTROL 0x06	195	#define VS_STREAM_ERROR_CODE_CONTROL 0x06
196	#define VS_GENERATE_KEY_FRAME_CONTROL 0x07	196	#define VS_GENERATE_KEY_FRAME_CONTROL 0x07
197	#define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08	197	#define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08
198	#define VS_SYNC_DELAY_CONTROL 0x09	198	#define VS_SYNC_DELAY_CONTROL 0x09
199		199
200	#define TT_VENDOR_SPECIFIC 0x0100	200	#define TT_VENDOR_SPECIFIC 0x0100
201	#define TT_STREAMING 0x0101	201	#define TT_STREAMING 0x0101
202		202
203	/* Input Terminal types */	203	/* Input Terminal types */
204	#define ITT_VENDOR_SPECIFIC 0x0200	204	#define ITT_VENDOR_SPECIFIC 0x0200
205	#define ITT_CAMERA 0x0201	205	#define ITT_CAMERA 0x0201
206	#define ITT_MEDIA_TRANSPORT_INPUT 0x0202	206	#define ITT_MEDIA_TRANSPORT_INPUT 0x0202
207		207
208	/* Output Terminal types */	208	/* Output Terminal types */
209	#define OTT_VENDOR_SPECIFIC 0x0300	209	#define OTT_VENDOR_SPECIFIC 0x0300
210	#define OTT_DISPLAY 0x0301	210	#define OTT_DISPLAY 0x0301
211	#define OTT_MEDIA_TRANSPORT_OUTPUT 0x0302	211	#define OTT_MEDIA_TRANSPORT_OUTPUT 0x0302
212		212
213	/* External Terminal types */	213	/* External Terminal types */
214	#define EXTERNAL_VENDOR_SPECIFIC 0x0400	214	#define EXTERNAL_VENDOR_SPECIFIC 0x0400
215	#define COMPOSITE_CONNECTOR 0x0401	215	#define COMPOSITE_CONNECTOR 0x0401
216	#define SVIDEO_CONNECTOR 0x0402	216	#define SVIDEO_CONNECTOR 0x0402
217	#define COMPONENT_CONNECTOR 0x0403	217	#define COMPONENT_CONNECTOR 0x0403
218		218
219	#define UVC_TERM_INPUT 0x0000	219	#define UVC_TERM_INPUT 0x0000
220	#define UVC_TERM_OUTPUT 0x8000	220	#define UVC_TERM_OUTPUT 0x8000
@@ -541,11 +541,11 @@ struct uvc_streaming {
541	};	541	};
542		542
543	enum uvc_buffer_state {	543	enum uvc_buffer_state {
544	UVC_BUF_STATE_IDLE = 0,	544	UVC_BUF_STATE_IDLE = 0,
545	UVC_BUF_STATE_QUEUED = 1,	545	UVC_BUF_STATE_QUEUED = 1,
546	UVC_BUF_STATE_ACTIVE = 2,	546	UVC_BUF_STATE_ACTIVE = 2,
547	UVC_BUF_STATE_DONE = 3,	547	UVC_BUF_STATE_DONE = 3,
548	UVC_BUF_STATE_ERROR = 4,	548	UVC_BUF_STATE_ERROR = 4,
549	};	549	};
550		550
551	struct uvc_buffer {	551	struct uvc_buffer {