listusb: parse UVC devices

- Various cleanups to the USB-audio side, which is similar - Add in the UVC (USB Video) specific info with parsing of some of the descriptors (most of the "control" part).
2016-11-02 15:26:04 +01:00
parent 56f749a63f
commit e64640878a
7 changed files with 565 additions and 21 deletions
@@ -14,18 +14,18 @@ enum {
 	USB_AUDIO_INTERFACE_AUDIO_CLASS		= 0x01
 };

-enum { // Audio Interface Subclasses	
-	USB_AUDIO_INTERFACE_UNDEFINED_SUBCLASS =	0x00, 
+enum { // Audio Interface Subclasses
+	USB_AUDIO_INTERFACE_UNDEFINED_SUBCLASS =	0x00,
 	USB_AUDIO_INTERFACE_AUDIOCONTROL_SUBCLASS =	0x01,
-	USB_AUDIO_INTERFACE_AUDIOSTREAMING_SUBCLASS,		//
-	USB_AUDIO_INTERFACE_MIDISTREAMING_SUBCLASS			// 
+	USB_AUDIO_INTERFACE_AUDIOSTREAMING_SUBCLASS,
+	USB_AUDIO_INTERFACE_MIDISTREAMING_SUBCLASS
 };

 enum { // Audio Interface Protocol Codes	
-	USB_AUDIO_PROTOCOL_UNDEFINED =	0x00 
+	USB_AUDIO_PROTOCOL_UNDEFINED =	0x00
 };

-enum { // Audio Interface Protocol Codes	
+enum { // Audio Interface Class-Specific Descriptor Types
 	USB_AUDIO_CS_UNDEFINED				= 0x20,
 	USB_AUDIO_CS_DEVICE					= 0x21,
 	USB_AUDIO_CS_CONFIGURATION			= 0x22,
@@ -66,7 +66,7 @@ typedef struct {
 		struct {
 			uint16	total_length;
 			uint8	in_collection;
-			uint8	interface_numbers[1];
+			uint8	interface_numbers[0];
 		} _PACKED r1;

 		struct {
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2016, Adrien Destugues, pulkomandy@pulkomandy.tk
+ * Distributed under terms of the MIT license.
+ */
+
+
+#ifndef USB_VIDEO_H
+#define USB_VIDEO_H
+
+
+// Based on specification for UVC version 1.5.
+
+
+#include <SupportDefs.h>
+
+
+#define USB_VIDEO_DEVICE_CLASS 			0x0E
+
+enum { // Video Interface Subclasses
+	USB_VIDEO_INTERFACE_UNDEFINED_SUBCLASS		= 0x00,
+	USB_VIDEO_INTERFACE_VIDEOCONTROL_SUBCLASS	= 0x01,
+	USB_VIDEO_INTERFACE_VIDEOSTREAMING_SUBCLASS,
+	USB_VIDEO_INTERFACE_COLLECTION_SUBCLASS,
+};
+
+
+enum { // Video Interface Protocol Codes
+	USB_VIDEO_PROTOCOL_UNDEFINED				= 0x00,
+	USB_VIDEO_PROTOCOL_15						= 0x01,
+};
+
+
+enum { // Video Interface Class-Specific Descriptor Types
+	USB_VIDEO_CS_UNDEFINED						= 0x20,
+	USB_VIDEO_CS_DEVICE							= 0x21,
+	USB_VIDEO_CS_CONFIGURATION					= 0x22,
+	USB_VIDEO_CS_STRING							= 0x23,
+	USB_VIDEO_CS_INTERFACE						= 0x24,
+	USB_VIDEO_CS_ENDPOINT						= 0x25,
+};
+
+
+enum { // Video Class-Specific VideoControl Interface descriptor subtypes
+	USB_VIDEO_VC_DESCRIPTOR_UNDEFINED			= 0x00,
+	USB_VIDEO_VC_HEADER							= 0x01,
+	USB_VIDEO_VC_INPUT_TERMINAL					= 0x02,
+	USB_VIDEO_VC_OUTPUT_TERMINAL				= 0x03,
+	USB_VIDEO_VC_SELECTOR_UNIT					= 0x04,
+	USB_VIDEO_VC_PROCESSING_UNIT				= 0x05,
+	USB_VIDEO_VC_EXTENSION_UNIT					= 0x06,
+	USB_VIDEO_VC_ENCODING_UNIT					= 0x07,
+};
+
+
+enum {
+	// USB Terminal Types
+	USB_VIDEO_VENDOR_USB_IO						= 0x100,
+	USB_VIDEO_STREAMING_USB_IO					= 0x101,
+	// Input terminal types
+	USB_VIDEO_VENDOR_IN							= 0x200,
+	USB_VIDEO_CAMERA_IN							= 0x201,
+	USB_VIDEO_MEDIA_TRANSPORT_IN				= 0x202,
+	// Output terminal types
+	USB_VIDEO_VENDOR_OUT						= 0x300,
+	USB_VIDEO_DISPLAY_OUT						= 0x301,
+	USB_VIDEO_MEDIA_TRANSPORT_OUT				= 0x302,
+	// External terminal types
+	USB_VIDEO_VENDOR_EXT						= 0x400,
+	USB_VIDEO_COMPOSITE_EXT						= 0x401,
+	USB_VIDEO_SVIDEO_EXT						= 0x402,
+	USB_VIDEO_COMPONENT_EXT						= 0x403,
+};
+
+
+// Class Specific Video Control Interface Header
+// 1.5: Table 3-3 p.48
+typedef struct {
+	uint8	length;
+	uint8	descriptor_type;		// USB_AUDIO_CS_INTERFACE
+	uint8	descriptor_subtype; 	// USB_AUDIO_AC_HEADER
+	uint16	bcd_release_no;
+	uint16	total_length;
+	uint32	clock_frequency;
+	uint8	in_collection;
+	uint8	interface_numbers[0];
+} _PACKED usb_videocontrol_header_descriptor;
+
+
+// Input Terminal Descriptor
+// 1.5: Table 3-4, page 50
+typedef struct {
+	uint8	length;
+	uint8	descriptor_type;		// USB_VIDEO_CS_INTERFACE
+	uint8	descriptor_subtype; 	// USB_VIDEO_VC_INPUT_TERMINAL
+	uint8	terminal_id;
+	uint16	terminal_type;
+	uint8	assoc_terminal;
+	uint8	terminal;
+
+	union {
+		struct {
+			uint16	focal_length_min;
+			uint16	focal_length_max;
+			uint16	focal_length;
+			uint8	control_size;
+			uint8	controls[3];
+		} _PACKED camera;
+	};
+} _PACKED usb_video_input_terminal_descriptor;
+
+
+// Output terminal descriptor
+// 1.5: Table 3-5, page 51
+typedef struct {
+	uint8	length;
+	uint8	descriptor_type;		// USB_VIDEO_CS_INTERFACE
+	uint8	descriptor_subtype; 	// USB_VIDEO_VC_OUTPUT_TERMINAL
+	uint8	terminal_id;
+	uint16	terminal_type;
+	uint8	assoc_terminal;
+	uint8	source_id;
+	uint8	terminal;
+} _PACKED usb_video_output_terminal_descriptor;
+
+
+// Processing unit descriptor
+// 1.5: Table 3-8, page 54
+typedef struct {
+	uint8	length;
+	uint8	descriptor_type;
+	uint8	descriptor_subtype;
+	uint8	unit_id;
+	uint8	source_id;
+	uint16	max_multiplier;
+	uint8	control_size;
+	uint8	controls[3];
+	uint8	processing;
+	uint8	video_standards;
+} _PACKED usb_video_processing_unit_descriptor;
+
+
+#endif /* !USB_VIDEO_H */