Skip to content

Commit df1a09f

Browse files
authored
Merge pull request #408 from adafruit/update-tinyusb-pr2526
update tinyusb to include uvc hardfault fix
2 parents 040eb93 + 681746c commit df1a09f

File tree

7 files changed

+296
-276
lines changed

7 files changed

+296
-276
lines changed

src/class/video/video.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,23 @@ typedef enum {
160160
/* A.9.1 VideoControl Interface Control Selectors */
161161
typedef enum {
162162
VIDEO_VC_CTL_UNDEFINED = 0x00,
163-
VIDEO_VC_CTL_VIDEO_POWER_MODE,
164-
VIDEO_VC_CTL_REQUEST_ERROR_CODE,
163+
VIDEO_VC_CTL_VIDEO_POWER_MODE, // 0x01
164+
VIDEO_VC_CTL_REQUEST_ERROR_CODE, // 0x02
165165
} video_interface_control_selector_t;
166166

167167
/* A.9.8 VideoStreaming Interface Control Selectors */
168168
typedef enum {
169169
VIDEO_VS_CTL_UNDEFINED = 0x00,
170-
VIDEO_VS_CTL_PROBE,
171-
VIDEO_VS_CTL_COMMIT,
172-
VIDEO_VS_CTL_STILL_PROBE,
173-
VIDEO_VS_CTL_STILL_COMMIT,
174-
VIDEO_VS_CTL_STILL_IMAGE_TRIGGER,
175-
VIDEO_VS_CTL_STREAM_ERROR_CODE,
176-
VIDEO_VS_CTL_GENERATE_KEY_FRAME,
177-
VIDEO_VS_CTL_UPDATE_FRAME_SEGMENT,
178-
VIDEO_VS_CTL_SYNCH_DELAY_CONTROL,
170+
VIDEO_VS_CTL_PROBE, // 0x01
171+
VIDEO_VS_CTL_COMMIT, // 0x02
172+
VIDEO_VS_CTL_STILL_PROBE, // 0x03
173+
VIDEO_VS_CTL_STILL_COMMIT, // 0x04
174+
VIDEO_VS_CTL_STILL_IMAGE_TRIGGER, // 0x05
175+
VIDEO_VS_CTL_STREAM_ERROR_CODE, // 0x06
176+
VIDEO_VS_CTL_GENERATE_KEY_FRAME, // 0x07
177+
VIDEO_VS_CTL_UPDATE_FRAME_SEGMENT, // 0x08
178+
VIDEO_VS_CTL_SYNCH_DELAY_CONTROL, // 0x09
179+
179180
} video_interface_streaming_selector_t;
180181

181182
/* B. Terminal Types */

0 commit comments

Comments
 (0)