diff options
Diffstat (limited to 'epan/dissectors/packet-usb-video.c')
-rw-r--r-- | epan/dissectors/packet-usb-video.c | 426 |
1 files changed, 213 insertions, 213 deletions
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c index fcbfe3f83d..79213f096e 100644 --- a/epan/dissectors/packet-usb-video.c +++ b/epan/dissectors/packet-usb-video.c @@ -355,205 +355,205 @@ static expert_field ei_usb_vid_bitmask_len = EI_INIT; /* Lookup tables */ static const value_string vc_ep_descriptor_subtypes[] = { - { EP_INTERRUPT, "Interrupt" }, - { 0, NULL } + { EP_INTERRUPT, "Interrupt" }, + { 0, NULL } }; static const value_string vid_descriptor_type_vals[] = { - {CS_INTERFACE, "video class interface"}, - {CS_ENDPOINT, "video class endpoint"}, - {0,NULL} + {CS_INTERFACE, "video class interface"}, + {CS_ENDPOINT, "video class endpoint"}, + {0,NULL} }; static value_string_ext vid_descriptor_type_vals_ext = VALUE_STRING_EXT_INIT(vid_descriptor_type_vals); static const value_string vc_if_descriptor_subtypes[] = { - { VC_HEADER, "Header" }, - { VC_INPUT_TERMINAL, "Input Terminal" }, - { VC_OUTPUT_TERMINAL, "Output Terminal" }, - { VC_SELECTOR_UNIT, "Selector Unit" }, - { VC_PROCESSING_UNIT, "Processing Unit" }, - { VC_EXTENSION_UNIT, "Extension Unit" }, - { VC_ENCODING_UNIT, "Encoding Unit" }, - { 0, NULL } + { VC_HEADER, "Header" }, + { VC_INPUT_TERMINAL, "Input Terminal" }, + { VC_OUTPUT_TERMINAL, "Output Terminal" }, + { VC_SELECTOR_UNIT, "Selector Unit" }, + { VC_PROCESSING_UNIT, "Processing Unit" }, + { VC_EXTENSION_UNIT, "Extension Unit" }, + { VC_ENCODING_UNIT, "Encoding Unit" }, + { 0, NULL } }; static value_string_ext vc_if_descriptor_subtypes_ext = VALUE_STRING_EXT_INIT(vc_if_descriptor_subtypes); static const value_string cs_control_interface[] = { - { VC_CONTROL_UNDEFINED, "Undefined" }, - { VC_VIDEO_POWER_MODE_CONTROL, "Video Power Mode" }, - { VC_REQUEST_ERROR_CODE_CONTROL, "Request Error Code" }, - { VC_REQUEST_INDICATE_HOST_CLOCK_CONTROL, "Request Indicate Host Clock" }, - { 0, NULL } + { VC_CONTROL_UNDEFINED, "Undefined" }, + { VC_VIDEO_POWER_MODE_CONTROL, "Video Power Mode" }, + { VC_REQUEST_ERROR_CODE_CONTROL, "Request Error Code" }, + { VC_REQUEST_INDICATE_HOST_CLOCK_CONTROL, "Request Indicate Host Clock" }, + { 0, NULL } }; static value_string_ext cs_control_interface_ext = VALUE_STRING_EXT_INIT(cs_control_interface); static const value_string cs_streaming_interface[] = { - { VS_CONTROL_UNDEFINED, "Undefined" }, - { VS_PROBE_CONTROL, "Probe" }, - { VS_COMMIT_CONTROL, "Commit" }, - { VS_STILL_PROBE_CONTROL, "Still Probe" }, - { VS_STILL_COMMIT_CONTROL, "Still Commit" }, - { VS_STILL_IMAGE_TRIGGER_CONTROL, "Still Image Trigger" }, - { VS_STREAM_ERROR_CODE_CONTROL, "Stream Error Code" }, - { VS_GENERATE_KEY_FRAME_CONTROL, "Generate Key Frame" }, - { VS_UPDATE_FRAME_SEGMENT_CONTROL, "Update Frame Segment" }, - { VS_SYNCH_DELAY_CONTROL, "Synch Delay" }, - { 0, NULL } + { VS_CONTROL_UNDEFINED, "Undefined" }, + { VS_PROBE_CONTROL, "Probe" }, + { VS_COMMIT_CONTROL, "Commit" }, + { VS_STILL_PROBE_CONTROL, "Still Probe" }, + { VS_STILL_COMMIT_CONTROL, "Still Commit" }, + { VS_STILL_IMAGE_TRIGGER_CONTROL, "Still Image Trigger" }, + { VS_STREAM_ERROR_CODE_CONTROL, "Stream Error Code" }, + { VS_GENERATE_KEY_FRAME_CONTROL, "Generate Key Frame" }, + { VS_UPDATE_FRAME_SEGMENT_CONTROL, "Update Frame Segment" }, + { VS_SYNCH_DELAY_CONTROL, "Synch Delay" }, + { 0, NULL } }; static value_string_ext cs_streaming_interface_ext = VALUE_STRING_EXT_INIT(cs_streaming_interface); static const value_string cs_selector_unit[] = { - { SU_CONTROL_UNDEFINED, "Undefined" }, - { SU_INPUT_SELECT_CONTROL, "Input Select" }, - { 0, NULL } + { SU_CONTROL_UNDEFINED, "Undefined" }, + { SU_INPUT_SELECT_CONTROL, "Input Select" }, + { 0, NULL } }; static value_string_ext cs_selector_unit_ext = VALUE_STRING_EXT_INIT(cs_selector_unit); static const value_string cs_camera_terminal[] = { - { CT_CONTROL_UNDEFINED, "Undefined" }, - { CT_SCANNING_MODE_CONTROL, "Scanning Mode" }, - { CT_AE_MODE_CONTROL, "Auto-Exposure Mode" }, - { CT_AE_PRIORITY_CONTROL, "Auto-Exposure Priority" }, - { CT_EXPOSURE_TIME_ABSOLUTE_CONTROL, "Exposure Time (Absolute)" }, - { CT_EXPOSURE_TIME_RELATIVE_CONTROL, "Exposure Time (Relative)" }, - { CT_FOCUS_ABSOLUTE_CONTROL, "Focus (Absolute)" }, - { CT_FOCUS_RELATIVE_CONTROL, "Focus (Relative)" }, - { CT_FOCUS_AUTO_CONTROL, "Focus, Auto" }, - { CT_IRIS_ABSOLUTE_CONTROL, "Iris (Absolute)" }, - { CT_IRIS_RELATIVE_CONTROL, "Iris (Relative)" }, - { CT_ZOOM_ABSOLUTE_CONTROL, "Zoom (Absolute)" }, - { CT_ZOOM_RELATIVE_CONTROL, "Zoom (Relative)" }, - { CT_PANTILT_ABSOLUTE_CONTROL, "PanTilt (Absolute)" }, - { CT_PANTILT_RELATIVE_CONTROL, "PanTilt (Relative)" }, - { CT_ROLL_ABSOLUTE_CONTROL, "Roll (Absolute)" }, - { CT_ROLL_RELATIVE_CONTROL, "Roll (Relative)" }, - { CT_PRIVACY_CONTROL, "Privacy" }, - { CT_FOCUS_SIMPLE_CONTROL, "Focus (Simple)" }, - { CT_WINDOW_CONTROL, "Window" }, - { CT_REGION_OF_INTEREST_CONTROL, "Region of Interest" }, - { 0, NULL } + { CT_CONTROL_UNDEFINED, "Undefined" }, + { CT_SCANNING_MODE_CONTROL, "Scanning Mode" }, + { CT_AE_MODE_CONTROL, "Auto-Exposure Mode" }, + { CT_AE_PRIORITY_CONTROL, "Auto-Exposure Priority" }, + { CT_EXPOSURE_TIME_ABSOLUTE_CONTROL, "Exposure Time (Absolute)" }, + { CT_EXPOSURE_TIME_RELATIVE_CONTROL, "Exposure Time (Relative)" }, + { CT_FOCUS_ABSOLUTE_CONTROL, "Focus (Absolute)" }, + { CT_FOCUS_RELATIVE_CONTROL, "Focus (Relative)" }, + { CT_FOCUS_AUTO_CONTROL, "Focus, Auto" }, + { CT_IRIS_ABSOLUTE_CONTROL, "Iris (Absolute)" }, + { CT_IRIS_RELATIVE_CONTROL, "Iris (Relative)" }, + { CT_ZOOM_ABSOLUTE_CONTROL, "Zoom (Absolute)" }, + { CT_ZOOM_RELATIVE_CONTROL, "Zoom (Relative)" }, + { CT_PANTILT_ABSOLUTE_CONTROL, "PanTilt (Absolute)" }, + { CT_PANTILT_RELATIVE_CONTROL, "PanTilt (Relative)" }, + { CT_ROLL_ABSOLUTE_CONTROL, "Roll (Absolute)" }, + { CT_ROLL_RELATIVE_CONTROL, "Roll (Relative)" }, + { CT_PRIVACY_CONTROL, "Privacy" }, + { CT_FOCUS_SIMPLE_CONTROL, "Focus (Simple)" }, + { CT_WINDOW_CONTROL, "Window" }, + { CT_REGION_OF_INTEREST_CONTROL, "Region of Interest" }, + { 0, NULL } }; static value_string_ext cs_camera_terminal_ext = VALUE_STRING_EXT_INIT(cs_camera_terminal); static const value_string cs_processing_unit[] = { - { PU_CONTROL_UNDEFINED, "Undefined" }, - { PU_BACKLIGHT_COMPENSATION_CONTROL, "Backlight Compensation" }, - { PU_BRIGHTNESS_CONTROL, "Brightness" }, - { PU_CONTRAST_CONTROL, "Contrast" }, - { PU_GAIN_CONTROL, "Gain" }, - { PU_POWER_LINE_FREQUENCY_CONTROL, "Power Line Frequency" }, - { PU_HUE_CONTROL, "Hue" }, - { PU_SATURATION_CONTROL, "Saturation" }, - { PU_SHARPNESS_CONTROL, "Sharpness" }, - { PU_GAMMA_CONTROL, "Gamma" }, - { PU_WHITE_BALANCE_TEMPERATURE_CONTROL, "White Balance Temperature" }, - { PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,"White Balance Temperature Auto" }, - { PU_WHITE_BALANCE_COMPONENT_CONTROL, "White Balance Component" }, - { PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL, "White Balance Component Auto" }, - { PU_DIGITAL_MULTIPLIER_CONTROL, "Digital Multiplier" }, - { PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL, "Digital Multiplier Limit" }, - { PU_HUE_AUTO_CONTROL, "Hue Auto" }, - { PU_ANALOG_VIDEO_STANDARD_CONTROL, "Video Standard" }, - { PU_ANALOG_LOCK_STATUS_CONTROL, "Analog Lock Status" }, - { PU_CONTRAST_AUTO_CONTROL, "Contrast Auto" }, - { 0, NULL } + { PU_CONTROL_UNDEFINED, "Undefined" }, + { PU_BACKLIGHT_COMPENSATION_CONTROL, "Backlight Compensation" }, + { PU_BRIGHTNESS_CONTROL, "Brightness" }, + { PU_CONTRAST_CONTROL, "Contrast" }, + { PU_GAIN_CONTROL, "Gain" }, + { PU_POWER_LINE_FREQUENCY_CONTROL, "Power Line Frequency" }, + { PU_HUE_CONTROL, "Hue" }, + { PU_SATURATION_CONTROL, "Saturation" }, + { PU_SHARPNESS_CONTROL, "Sharpness" }, + { PU_GAMMA_CONTROL, "Gamma" }, + { PU_WHITE_BALANCE_TEMPERATURE_CONTROL, "White Balance Temperature" }, + { PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,"White Balance Temperature Auto" }, + { PU_WHITE_BALANCE_COMPONENT_CONTROL, "White Balance Component" }, + { PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL, "White Balance Component Auto" }, + { PU_DIGITAL_MULTIPLIER_CONTROL, "Digital Multiplier" }, + { PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL, "Digital Multiplier Limit" }, + { PU_HUE_AUTO_CONTROL, "Hue Auto" }, + { PU_ANALOG_VIDEO_STANDARD_CONTROL, "Video Standard" }, + { PU_ANALOG_LOCK_STATUS_CONTROL, "Analog Lock Status" }, + { PU_CONTRAST_AUTO_CONTROL, "Contrast Auto" }, + { 0, NULL } }; static value_string_ext cs_processing_unit_ext = VALUE_STRING_EXT_INIT(cs_processing_unit); static const value_string vc_terminal_types[] = { - { TT_VENDOR_SPECIFIC, "Vendor Specific", }, - { TT_STREAMING, "Streaming" }, - { ITT_VENDOR_SPECIFIC, "Vendor Specific Input" }, - { ITT_CAMERA, "Camera Input" }, - { ITT_MEDIA_TRANSPORT_INPUT, "Media Transport Input" }, - { OTT_VENDOR_SPECIFIC, "Vendor Specific Output" }, - { OTT_DISPLAY, "Display Output" }, - { OTT_MEDIA_TRANSPORT_OUTPUT, "Media Transport Output" }, - { EXTERNAL_VENDOR_SPECIFIC, "Vendor Specific External" }, - { COMPOSITE_CONNECTOR, "Composite Connector" }, - { SVIDEO_CONNECTOR, "SVideo Connector" }, - { COMPONENT_CONNECTOR, "Component Connector" }, - { 0, NULL } + { TT_VENDOR_SPECIFIC, "Vendor Specific", }, + { TT_STREAMING, "Streaming" }, + { ITT_VENDOR_SPECIFIC, "Vendor Specific Input" }, + { ITT_CAMERA, "Camera Input" }, + { ITT_MEDIA_TRANSPORT_INPUT, "Media Transport Input" }, + { OTT_VENDOR_SPECIFIC, "Vendor Specific Output" }, + { OTT_DISPLAY, "Display Output" }, + { OTT_MEDIA_TRANSPORT_OUTPUT, "Media Transport Output" }, + { EXTERNAL_VENDOR_SPECIFIC, "Vendor Specific External" }, + { COMPOSITE_CONNECTOR, "Composite Connector" }, + { SVIDEO_CONNECTOR, "SVideo Connector" }, + { COMPONENT_CONNECTOR, "Component Connector" }, + { 0, NULL } }; static value_string_ext vc_terminal_types_ext = VALUE_STRING_EXT_INIT(vc_terminal_types); static const value_string vs_if_descriptor_subtypes[] = { - { VS_UNDEFINED, "Undefined" }, - { VS_INPUT_HEADER, "Input Header" }, - { VS_OUTPUT_HEADER, "Output Header" }, - { VS_STILL_IMAGE_FRAME, "Still Image Frame" }, - { VS_FORMAT_UNCOMPRESSED, "Format Uncompressed" }, - { VS_FRAME_UNCOMPRESSED, "Frame Uncompressed" }, - { VS_FORMAT_MJPEG, "Format MJPEG" }, - { VS_FRAME_MJPEG, "Frame MJPEG" }, - { VS_FORMAT_MPEG1, "Format MPEG1" }, - { VS_FORMAT_MPEG2PS, "Format MPEG2-PS" }, - { VS_FORMAT_MPEG2TS, "Format MPEG2-TS" }, - { VS_FORMAT_MPEG4SL, "Format MPEG4-SL" }, - { VS_FORMAT_DV, "Format DV" }, - { VS_COLORFORMAT, "Colorformat" }, - { VS_FORMAT_VENDOR, "Format Vendor" }, - { VS_FRAME_VENDOR, "Frame Vendor" }, - { VS_FORMAT_FRAME_BASED, "Format Frame-Based" }, - { VS_FRAME_FRAME_BASED, "Frame Frame-Based" }, - { VS_FORMAT_STREAM_BASED, "Format Stream Based" }, - { VS_FORMAT_H264, "Format H.264" }, - { VS_FRAME_H264, "Frame H.264" }, - { VS_FORMAT_H264_SIMULCAST, "Format H.264 Simulcast" }, - { VS_FORMAT_VP8, "Format VP8" }, - { VS_FRAME_VP8, "Frame VP8" }, - { VS_FORMAT_VP8_SIMULCAST, "Format VP8 Simulcast" }, - { 0, NULL } + { VS_UNDEFINED, "Undefined" }, + { VS_INPUT_HEADER, "Input Header" }, + { VS_OUTPUT_HEADER, "Output Header" }, + { VS_STILL_IMAGE_FRAME, "Still Image Frame" }, + { VS_FORMAT_UNCOMPRESSED, "Format Uncompressed" }, + { VS_FRAME_UNCOMPRESSED, "Frame Uncompressed" }, + { VS_FORMAT_MJPEG, "Format MJPEG" }, + { VS_FRAME_MJPEG, "Frame MJPEG" }, + { VS_FORMAT_MPEG1, "Format MPEG1" }, + { VS_FORMAT_MPEG2PS, "Format MPEG2-PS" }, + { VS_FORMAT_MPEG2TS, "Format MPEG2-TS" }, + { VS_FORMAT_MPEG4SL, "Format MPEG4-SL" }, + { VS_FORMAT_DV, "Format DV" }, + { VS_COLORFORMAT, "Colorformat" }, + { VS_FORMAT_VENDOR, "Format Vendor" }, + { VS_FRAME_VENDOR, "Frame Vendor" }, + { VS_FORMAT_FRAME_BASED, "Format Frame-Based" }, + { VS_FRAME_FRAME_BASED, "Frame Frame-Based" }, + { VS_FORMAT_STREAM_BASED, "Format Stream Based" }, + { VS_FORMAT_H264, "Format H.264" }, + { VS_FRAME_H264, "Frame H.264" }, + { VS_FORMAT_H264_SIMULCAST, "Format H.264 Simulcast" }, + { VS_FORMAT_VP8, "Format VP8" }, + { VS_FRAME_VP8, "Frame VP8" }, + { VS_FORMAT_VP8_SIMULCAST, "Format VP8 Simulcast" }, + { 0, NULL } }; static value_string_ext vs_if_descriptor_subtypes_ext = VALUE_STRING_EXT_INIT(vs_if_descriptor_subtypes); static const value_string interrupt_status_types[] = { - { INT_VIDEOCONTROL, "VideoControl Interface" }, - { INT_VIDEOSTREAMING, "VideoStreaming Interface" }, - { 0, NULL } + { INT_VIDEOCONTROL, "VideoControl Interface" }, + { INT_VIDEOSTREAMING, "VideoStreaming Interface" }, + { 0, NULL } }; static const value_string control_change_types[] = { - { CONTROL_CHANGE_VALUE, "Value" }, - { CONTROL_CHANGE_INFO, "Info" }, - { CONTROL_CHANGE_FAILURE, "Failure" }, - { CONTROL_CHANGE_MIN, "Min" }, - { CONTROL_CHANGE_MAX, "Max" }, - { 0, NULL } + { CONTROL_CHANGE_VALUE, "Value" }, + { CONTROL_CHANGE_INFO, "Info" }, + { CONTROL_CHANGE_FAILURE, "Failure" }, + { CONTROL_CHANGE_MIN, "Min" }, + { CONTROL_CHANGE_MAX, "Max" }, + { 0, NULL } }; static value_string_ext control_change_types_ext = VALUE_STRING_EXT_INIT(control_change_types); static const value_string control_interrupt_events[] = { - { CONTROL_INTERRUPT_EVENT_CONTROL_CHANGE, "Control Change" }, - { 0, NULL } + { CONTROL_INTERRUPT_EVENT_CONTROL_CHANGE, "Control Change" }, + { 0, NULL } }; /* Table 3-13 VS Interface Input Header Descriptor - bStillCaptureMethod field */ static const value_string vs_still_capture_methods[] = { - { 0, "None" }, - { 1, "Uninterrupted streaming" }, - { 2, "Suspended streaming" }, - { 3, "Dedicated pipe" }, - { 0, NULL } + { 0, "None" }, + { 1, "Uninterrupted streaming" }, + { 2, "Suspended streaming" }, + { 3, "Dedicated pipe" }, + { 0, NULL } }; static value_string_ext vs_still_capture_methods_ext = VALUE_STRING_EXT_INIT(vs_still_capture_methods); /* Table 3-13 VS Interface Input Header Descriptor - bTriggerUsage field */ static const value_string vs_trigger_usage[] = { - { 0, "Initiate still image capture" }, - { 1, "General purpose button event" }, - { 0, NULL } + { 0, "Initiate still image capture" }, + { 1, "General purpose button event" }, + { 0, NULL } }; /* bmInterlaceFlags for format descriptors */ @@ -570,20 +570,20 @@ static const true_false_string interlaced_fields_meaning = { /* bmInterlaceFlags for format descriptors */ static const value_string field_pattern_meaning[] = { - { 0, "Field 1 only" }, - { 1, "Field 2 only" }, - { 2, "Regular pattern of fields 1 and 2" }, - { 3, "Random pattern of fields 1 and 2" }, - {0, NULL}, + { 0, "Field 1 only" }, + { 1, "Field 2 only" }, + { 2, "Regular pattern of fields 1 and 2" }, + { 3, "Random pattern of fields 1 and 2" }, + {0, NULL}, }; static value_string_ext field_pattern_meaning_ext = VALUE_STRING_EXT_INIT(field_pattern_meaning); /* bCopyProtect for format descriptors */ static const value_string copy_protect_meaning[] = { - { 0, "No restrictions" }, - { 1, "Restrict duplication" }, - {0, NULL}, + { 0, "No restrictions" }, + { 1, "Restrict duplication" }, + {0, NULL}, }; /* Table 4-46 Video Probe and Commit Controls - bmHint field */ @@ -594,57 +594,57 @@ static const true_false_string probe_hint_meaning = { /* Table 3-19 Color Matching Descriptor - bColorPrimaries field */ static const value_string color_primaries_meaning[] = { - { 0, "Unspecified" }, - { 1, "BT.709, sRGB" }, - { 2, "BT.470-2 (M)" }, - { 3, "BT.470-2 (B,G)" }, - { 4, "SMPTE 170M" }, - { 5, "SMPTE 240M" }, - {0, NULL}, + { 0, "Unspecified" }, + { 1, "BT.709, sRGB" }, + { 2, "BT.470-2 (M)" }, + { 3, "BT.470-2 (B,G)" }, + { 4, "SMPTE 170M" }, + { 5, "SMPTE 240M" }, + {0, NULL}, }; static value_string_ext color_primaries_meaning_ext = VALUE_STRING_EXT_INIT(color_primaries_meaning); /* Table 3-19 Color Matching Descriptor - bTransferCharacteristics field */ static const value_string color_transfer_characteristics[] = { - { 0, "Unspecified" }, - { 1, "BT.709" }, - { 2, "BT.470-2 (M)" }, - { 3, "BT.470-2 (B,G)" }, - { 4, "SMPTE 170M" }, - { 5, "SMPTE 240M" }, - { 6, "Linear (V=Lc)" }, - { 7, "sRGB" }, - {0, NULL}, + { 0, "Unspecified" }, + { 1, "BT.709" }, + { 2, "BT.470-2 (M)" }, + { 3, "BT.470-2 (B,G)" }, + { 4, "SMPTE 170M" }, + { 5, "SMPTE 240M" }, + { 6, "Linear (V=Lc)" }, + { 7, "sRGB" }, + {0, NULL}, }; static value_string_ext color_transfer_characteristics_ext = VALUE_STRING_EXT_INIT(color_transfer_characteristics); /* Table 3-19 Color Matching Descriptor - bMatrixCoefficients field */ static const value_string matrix_coefficients_meaning[] = { - { 0, "Unspecified" }, - { 1, "BT.709" }, - { 2, "FCC" }, - { 3, "BT.470-2 (B,G)" }, - { 4, "SMPTE 170M (BT.601)" }, - { 5, "SMPTE 240M" }, - {0, NULL}, + { 0, "Unspecified" }, + { 1, "BT.709" }, + { 2, "FCC" }, + { 3, "BT.470-2 (B,G)" }, + { 4, "SMPTE 170M (BT.601)" }, + { 5, "SMPTE 240M" }, + {0, NULL}, }; static value_string_ext matrix_coefficients_meaning_ext = VALUE_STRING_EXT_INIT(matrix_coefficients_meaning); static const value_string request_error_codes[] = { - { UVC_ERROR_NONE, "No error" }, - { UVC_ERROR_NOT_READY, "Not ready" }, - { UVC_ERROR_WRONG_STATE, "Wrong state" }, - { UVC_ERROR_POWER, "Insufficient power" } , - { UVC_ERROR_OUT_OF_RANGE, "Out of range" }, - { UVC_ERROR_INVALID_UNIT, "Invalid unit" }, - { UVC_ERROR_INVALID_CONTROL, "Invalid control" }, - { UVC_ERROR_INVALID_REQUEST, "Invalid request" }, - { UVC_ERROR_INVALID_VALUE, "Invalid value within range" }, - { UVC_ERROR_UNKNOWN, "Unknown" }, - {0, NULL}, + { UVC_ERROR_NONE, "No error" }, + { UVC_ERROR_NOT_READY, "Not ready" }, + { UVC_ERROR_WRONG_STATE, "Wrong state" }, + { UVC_ERROR_POWER, "Insufficient power" } , + { UVC_ERROR_OUT_OF_RANGE, "Out of range" }, + { UVC_ERROR_INVALID_UNIT, "Invalid unit" }, + { UVC_ERROR_INVALID_CONTROL, "Invalid control" }, + { UVC_ERROR_INVALID_REQUEST, "Invalid request" }, + { UVC_ERROR_INVALID_VALUE, "Invalid value within range" }, + { UVC_ERROR_UNKNOWN, "Unknown" }, + {0, NULL}, }; static value_string_ext request_error_codes_ext = VALUE_STRING_EXT_INIT(request_error_codes); @@ -897,20 +897,20 @@ dissect_usb_video_control_interface_descriptor(proto_tree *parent_tree, tvbuff_t guint8 descriptor_len, packet_info *pinfo, usb_conv_info_t *usb_conv_info) { video_conv_info_t *video_conv_info = NULL; - video_entity_t *entity = NULL; - proto_item *item = NULL; - proto_item *subtype_item = NULL; - proto_tree *tree = NULL; - guint8 entity_id = 0; - guint16 terminal_type = 0; - int offset = 0; - guint8 subtype; + video_entity_t *entity = NULL; + proto_item *item = NULL; + proto_item *subtype_item = NULL; + proto_tree *tree = NULL; + guint8 entity_id = 0; + guint16 terminal_type = 0; + int offset = 0; + guint8 subtype; subtype = tvb_get_guint8(tvb, offset+2); if (parent_tree) { - const gchar* subtype_str; + const gchar *subtype_str; subtype_str = val_to_str_ext(subtype, &vc_if_descriptor_subtypes_ext, "Unknown (0x%x)"); @@ -1245,10 +1245,10 @@ dissect_usb_video_frame(proto_tree *tree, tvbuff_t *tvb, int offset, NULL }; proto_item *desc_item; - guint8 bFrameIntervalType; - guint8 frame_index; - guint16 frame_width; - guint16 frame_height; + guint8 bFrameIntervalType; + guint8 frame_index; + guint16 frame_width; + guint16 frame_height; frame_index = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_usb_vid_frame_index, tvb, offset, 1, ENC_NA); @@ -1348,11 +1348,11 @@ static int dissect_usb_video_streaming_interface_descriptor(proto_tree *parent_tree, tvbuff_t *tvb, guint8 descriptor_len) { - proto_item *item; - proto_tree *tree; - int offset = 0; - const gchar* subtype_str; - guint8 subtype; + proto_item *item; + proto_tree *tree; + int offset = 0; + const gchar *subtype_str; + guint8 subtype; subtype = tvb_get_guint8(tvb, offset+2); @@ -1418,10 +1418,10 @@ static int dissect_usb_video_endpoint_descriptor(proto_tree *parent_tree, tvbuff_t *tvb, guint8 descriptor_len) { - proto_item *item = NULL; - proto_tree *tree = NULL; - int offset = 0; - guint8 subtype; + proto_item *item = NULL; + proto_tree *tree = NULL; + int offset = 0; + guint8 subtype; subtype = tvb_get_guint8(tvb, offset+2); @@ -1713,9 +1713,9 @@ dissect_usb_vid_control_info(proto_tree *tree, tvbuff_t *tvb, int offset) static void dissect_usb_vid_control_value(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 request) { - gint value_size; - const char* fallback_name; - int hf; + gint value_size; + const char *fallback_name; + int hf; switch (request) { @@ -1800,9 +1800,9 @@ dissect_usb_vid_get_set(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, usb_trans_info_t *usb_trans_info, usb_conv_info_t *usb_conv_info) { - const gchar *short_name = NULL; - guint8 control_sel; - guint8 entity_id; + const gchar *short_name = NULL; + guint8 control_sel; + guint8 entity_id; entity_id = usb_trans_info->setup.wIndex >> 8; control_sel = usb_trans_info->setup.wValue >> 8; @@ -1996,11 +1996,11 @@ static const value_string setup_request_names_vals[] = { static int dissect_usb_vid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - gboolean is_request = (pinfo->srcport == NO_ENDPOINT); - usb_conv_info_t *usb_conv_info; - usb_trans_info_t *usb_trans_info; - int offset = 0; - usb_setup_dissector dissector = NULL; + gboolean is_request = (pinfo->srcport == NO_ENDPOINT); + usb_conv_info_t *usb_conv_info; + usb_trans_info_t *usb_trans_info; + int offset = 0; + usb_setup_dissector dissector = NULL; const usb_setup_dissector_table_t *tmp; /* Reject the packet if data or usb_trans_info are NULL */ @@ -2053,9 +2053,9 @@ dissect_usb_vid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi static int dissect_usb_vid_interrupt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - usb_conv_info_t *usb_conv_info; + usb_conv_info_t *usb_conv_info; gint bytes_available; - int offset = 0; + int offset = 0; usb_conv_info = (usb_conv_info_t *)data; bytes_available = tvb_length_remaining(tvb, offset); @@ -3254,10 +3254,10 @@ proto_reg_handoff_usb_vid(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ |