 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvideo.c,v 1.65 2022/03/03 06:21:50 riastradh Exp $	*/
+/*	$NetBSD: uvideo.c,v 1.66 2022/03/03 06:22:03 riastradh Exp $	*/
 /*
  * Copyright (c) 2008 Patrick Mahoney
  * All rights reserved.
+ *
  * This code was written by Patrick Mahoney (pat@polycrystal.org) as
  * part of Google Summer of Code 2008.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB video specs:
  *      http://www.usb.org/developers/devclass_docs/USB_Video_Class_1_1.zip
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.65 2022/03/03 06:21:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.66 2022/03/03 06:22:03 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #ifdef _MODULE
 #include <sys/module.h>
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 @@ -1015,26 +1015,31 @@ uvideo_unit_free_controls(struct uvideo_
 /* Initialize a stream from a Video Streaming interface
  * descriptor. Adds the stream to the stream_list in uvideo_softc.
  * This should be called once for new streams, and
  * uvideo_stream_init_desc() should then be called for this and each
  * additional interface with the same interface number. */
 static usbd_status
 uvideo_stream_init(struct uvideo_stream *vs,
 		   struct uvideo_softc *sc,
 		   const usb_interface_descriptor_t *ifdesc)
+{
 	uWord len;
 	usbd_status err;
 	DPRINTF(("%s: %s ifaceno=%d vs=%p\n", __func__,
 		device_xname(sc->sc_dev),
 		ifdesc->bInterfaceNumber,
 		vs));
 	SLIST_INSERT_HEAD(&sc->sc_stream_list, vs, entries);
 	memset(vs, 0, sizeof(*vs));
 	vs->vs_parent = sc;
 	vs->vs_ifaceno = ifdesc->bInterfaceNumber;
 	vs->vs_subtype = 0;
 	SIMPLEQ_INIT(&vs->vs_formats);
 	SIMPLEQ_INIT(&vs->vs_pixel_formats);
 	vs->vs_default_format = NULL;
 	vs->vs_current_format.priv = -1;
 	vs->vs_xfer_type = 0;
 	err = usbd_device2interface_handle(sc->sc_udev, vs->vs_ifaceno,
 	    &vs->vs_iface);
 @@ -1094,26 +1099,29 @@ static usbd_status
 uvideo_stream_init_desc(struct uvideo_stream *vs,
 			const usb_interface_descriptor_t *ifdesc,
 			usbd_desc_iter_t *iter)
+{
 	const usb_descriptor_t *desc;
 	const uvideo_descriptor_t *uvdesc;
 	struct uvideo_bulk_xfer *bx;
 	struct uvideo_isoc_xfer *ix;
 	struct uvideo_alternate *alt;
 	uint8_t xfer_type, xfer_dir;
 	uint8_t bmAttributes, bEndpointAddress;
 	int i;
 	DPRINTF(("%s: bInterfaceNumber=%d bAlternateSetting=%d\n", __func__,
 		ifdesc->bInterfaceNumber, ifdesc->bAlternateSetting));
 	/* Iterate until the next interface descriptor.  All
 	 * descriptors until then belong to this streaming
 	 * interface. */
 	while ((desc = usb_desc_iter_next_non_interface(iter)) != NULL) {
 		uvdesc = (const uvideo_descriptor_t *)desc;
 		switch (uvdesc->bDescriptorType) {
 		case UDESC_ENDPOINT:
 			bmAttributes = GET(usb_endpoint_descriptor_t,
 					   desc, bmAttributes);
 			bEndpointAddress = GET(usb_endpoint_descriptor_t,
 					       desc, bEndpointAddress);
 			xfer_type = UE_GET_XFERTYPE(bmAttributes);
 @@ -1209,26 +1217,30 @@ uvideo_stream_init_desc(struct uvideo_st
 				break;
+			}
 			break;
 		default:
 			DPRINTF(("uvideo_stream_init_desc: "
 				 "unknown descriptor "
 				 "len=%d type=0x%02x\n",
 				 uvdesc->bLength,
 				 uvdesc->bDescriptorType));
 			break;
+		}
+	}
 	DPRINTF(("%s: bInterfaceNumber=%d bAlternateSetting=%d done\n",
 		__func__,
 		ifdesc->bInterfaceNumber, ifdesc->bAlternateSetting));
 	return USBD_NORMAL_COMPLETION;
+}
 /* Finialize and free memory associated with this stream. */
 static void
 uvideo_stream_free(struct uvideo_stream *vs)
+{
 	struct uvideo_alternate *alt;
 	struct uvideo_pixel_format *pixel_format;
 	struct uvideo_format *format;
 	/* free linked list of alternate interfaces */
 	if (vs->vs_xfer_type == UE_ISOCHRONOUS) {
 @@ -1257,51 +1269,64 @@ uvideo_stream_free(struct uvideo_stream
 static usbd_status
 uvideo_stream_init_frame_based_format(struct uvideo_stream *vs,
 				      const uvideo_descriptor_t *format_desc,
 				      usbd_desc_iter_t *iter)
+{
 	struct uvideo_pixel_format *pformat, *pfiter;
 	enum video_pixel_format pixel_format;
 	struct uvideo_format *format;
 	const uvideo_descriptor_t *uvdesc;
 	uint8_t subtype, default_index, index;
 	uint32_t frame_interval;
 	const usb_guid_t *guid;
 	DPRINTF(("%s: ifaceno=%d subtype=%d probelen=%d\n", __func__,
 		vs->vs_ifaceno, vs->vs_subtype, vs->vs_probelen));
 	pixel_format = VIDEO_FORMAT_UNDEFINED;
 	switch (format_desc->bDescriptorSubtype) {
 	case UDESC_VS_FORMAT_UNCOMPRESSED:
 		DPRINTF(("%s: uncompressed\n", __func__));
 		subtype = UDESC_VS_FRAME_UNCOMPRESSED;
 		default_index = GET(uvideo_vs_format_uncompressed_descriptor_t,
 				    format_desc,
 				    bDefaultFrameIndex);
 		guid = GETP(uvideo_vs_format_uncompressed_descriptor_t,
 			    format_desc,
 			    guidFormat);
 		if (usb_guid_cmp(guid, &uvideo_guid_format_yuy2) == 0)
 			pixel_format = VIDEO_FORMAT_YUY2;
 		else if (usb_guid_cmp(guid, &uvideo_guid_format_nv12) == 0)
 			pixel_format = VIDEO_FORMAT_NV12;
 		else if (usb_guid_cmp(guid, &uvideo_guid_format_uyvy) == 0)
 			pixel_format = VIDEO_FORMAT_UYVY;
 		else {
 #ifdef UVIDEO_DEBUG
 			DPRINTF(("%s: unknown format: ", __func__));
 			usb_guid_print(guid);
 			DPRINTF(("\n"));
 #endif
+		}
 		break;
 	case UDESC_VS_FORMAT_FRAME_BASED:
 		DPRINTF(("%s: frame-based\n", __func__));
 		subtype = UDESC_VS_FRAME_FRAME_BASED;
 		default_index = GET(uvideo_format_frame_based_descriptor_t,
 				    format_desc,
 				    bDefaultFrameIndex);
 		break;
 	case UDESC_VS_FORMAT_MJPEG:
 		DPRINTF(("%s: mjpeg\n", __func__));
 		subtype = UDESC_VS_FRAME_MJPEG;
 		default_index = GET(uvideo_vs_format_mjpeg_descriptor_t,
 				    format_desc,
 				    bDefaultFrameIndex);
 		pixel_format = VIDEO_FORMAT_MJPEG;
 		break;
 	default:
 		DPRINTF(("uvideo: unknown frame based format %d\n",
 			 format_desc->bDescriptorSubtype));
 		return USBD_INVAL;
+	}
 	pformat = NULL;