V4L/DVB (10197): uvcvideo: Whitespace and comments cleanup, copyright updates. (2c2d264b) · Commits · e / devices / android_kernel_teracube_2e

drivers/media/video/uvc/uvc_ctrl.c

+3 −3

Original line number	Diff line number	Diff line
		/*
		* uvc_ctrl.c -- USB Video Class driver - Controls
		*
		* Copyright (C) 2005-2008
		* Copyright (C) 2005-2009
		* Laurent Pinchart (laurent.pinchart@skynet.be)
		*
		* This program is free software; you can redistribute it and/or modify
		@@ -28,7 +28,7 @@
		#define UVC_CTRL_DATA_BACKUP 1

		/* ------------------------------------------------------------------------
		* Control, formats, ...
		* Controls
		*/

		static struct uvc_control_info uvc_ctrls[] = {
		@@ -634,7 +634,7 @@ static __s32 uvc_get_le_value(struct uvc_control_mapping *mapping,
		mask = (1 << bits) - 1;
		}

		/* Sign-extend the value if needed */
		/* Sign-extend the value if needed. */
		if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED)
		value \|= -(value & (1 << (mapping->size - 1)));

drivers/media/video/uvc/uvc_driver.c

+24 −28

Original line number	Diff line number	Diff line
		/*
		* uvc_driver.c -- USB Video Class driver
		*
		* Copyright (C) 2005-2008
		* Copyright (C) 2005-2009
		* Laurent Pinchart (laurent.pinchart@skynet.be)
		*
		* This program is free software; you can redistribute it and/or modify
		@@ -48,7 +48,7 @@ static unsigned int uvc_quirks_param;
		unsigned int uvc_trace_param;

		/* ------------------------------------------------------------------------
		* Control, formats, ...
		* Video formats
		*/

		static struct uvc_format_desc uvc_fmts[] = {
		@@ -473,7 +473,7 @@ static int uvc_parse_format(struct uvc_device *dev,

		/* Several UVC chipsets screw up dwMaxVideoFrameBufferSize
		* completely. Observed behaviours range from setting the
		* value to 1.1x the actual frame size of hardwiring the
		* value to 1.1x the actual frame size to hardwiring the
		* 16 low bits to 0. This results in a higher than necessary
		* memory usage as well as a wrong image size information. For
		* uncompressed formats this can be fixed by computing the
		@@ -486,7 +486,7 @@ static int uvc_parse_format(struct uvc_device *dev,
		/* Some bogus devices report dwMinFrameInterval equal to
		* dwMaxFrameInterval and have dwFrameIntervalStep set to
		* zero. Setting all null intervals to 1 fixes the problem and
		* some other divisions by zero which could happen.
		* some other divisions by zero that could happen.
		*/
		for (i = 0; i < n; ++i) {
		interval = get_unaligned_le32(&buffer[26+4*i]);
		@@ -1199,13 +1199,13 @@ static void uvc_unregister_video(struct uvc_device *dev)
		* Scan the UVC descriptors to locate a chain starting at an Output Terminal
		* and containing the following units:
		*
		* - a USB Streaming Output Terminal
		* - one Output Terminal (USB Streaming or Display)
		* - zero or one Processing Unit
		* - zero, one or mode single-input Selector Units
		* - zero or one multiple-input Selector Units, provided all inputs are
		* connected to input terminals
		* - zero, one or mode single-input Extension Units
		* - one Camera Input Terminal, or one or more External terminals.
		* - one or more Input Terminals (Camera, External or USB Streaming)
		*
		* A side forward scan is made on each detected entity to check for additional
		* extension units.
		@@ -1530,10 +1530,6 @@ static int uvc_register_video(struct uvc_device *dev)

		/* Set the driver data before calling video_register_device, otherwise
		* uvc_v4l2_open might race us.
		*
		* FIXME: usb_set_intfdata hasn't been called so far. Is that a
		* problem ? Does any function which could be called here get
		* a pointer to the usb_interface ?
		*/
		dev->video.vdev = vdev;
		video_set_drvdata(vdev, &dev->video);
		@@ -1568,7 +1564,7 @@ void uvc_delete(struct kref *kref)
		struct uvc_device *dev = container_of(kref, struct uvc_device, kref);
		struct list_head p, n;

		/* Unregister the video device */
		/* Unregister the video device. */
		uvc_unregister_video(dev);
		usb_put_intf(dev->intf);
		usb_put_dev(dev->udev);
		@@ -1611,7 +1607,7 @@ static int uvc_probe(struct usb_interface *intf,
		uvc_trace(UVC_TRACE_PROBE, "Probing generic UVC device %s\n",
		udev->devpath);

		/* Allocate memory for the device and initialize it */
		/* Allocate memory for the device and initialize it. */
		if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL)
		return -ENOMEM;

		@@ -1632,7 +1628,7 @@ static int uvc_probe(struct usb_interface *intf,
		le16_to_cpu(udev->descriptor.idVendor),
		le16_to_cpu(udev->descriptor.idProduct));

		/* Parse the Video Class control descriptor */
		/* Parse the Video Class control descriptor. */
		if (uvc_parse_control(dev) < 0) {
		uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC "
		"descriptors.\n");
		@@ -1652,18 +1648,18 @@ static int uvc_probe(struct usb_interface *intf,
		"linux-uvc-devel mailing list.\n");
		}

		/* Initialize controls */
		/* Initialize controls. */
		if (uvc_ctrl_init_device(dev) < 0)
		goto error;

		/* Register the video devices */
		/* Register the video devices. */
		if (uvc_register_video(dev) < 0)
		goto error;

		/* Save our data pointer in the interface data */
		/* Save our data pointer in the interface data. */
		usb_set_intfdata(intf, dev);

		/* Initialize the interrupt URB */
		/* Initialize the interrupt URB. */
		if ((ret = uvc_status_init(dev)) < 0) {
		uvc_printk(KERN_INFO, "Unable to initialize the status "
		"endpoint (%d), status interrupt will not be "

drivers/media/video/uvc/uvc_isight.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@
		*
		* Copyright (C) 2006-2007
		* Ivan N. Zlatev <contact@i-nz.net>
		* Copyright (C) 2008-2009
		* Laurent Pinchart <laurent.pinchart@skynet.be>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by

drivers/media/video/uvc/uvc_queue.c

+15 −15

Original line number	Diff line number	Diff line
		/*
		* uvc_queue.c -- USB Video Class driver - Buffers management
		*
		* Copyright (C) 2005-2008
		* Copyright (C) 2005-2009
		* Laurent Pinchart (laurent.pinchart@skynet.be)
		*
		* This program is free software; you can redistribute it and/or modify
		@@ -36,22 +36,22 @@
		* to user space will return -EBUSY.
		*
		* Video buffers are managed using two queues. However, unlike most USB video
		* drivers which use an in queue and an out queue, we use a main queue which
		* holds all queued buffers (both 'empty' and 'done' buffers), and an irq
		* queue which holds empty buffers. This design (copied from video-buf)
		* minimizes locking in interrupt, as only one queue is shared between
		* interrupt and user contexts.
		* drivers that use an in queue and an out queue, we use a main queue to hold
		* all queued buffers (both 'empty' and 'done' buffers), and an irq queue to
		* hold empty buffers. This design (copied from video-buf) minimizes locking
		* in interrupt, as only one queue is shared between interrupt and user
		* contexts.
		*
		* Use cases
		* ---------
		*
		* Unless stated otherwise, all operations which modify the irq buffers queue
		* Unless stated otherwise, all operations that modify the irq buffers queue
		* are protected by the irq spinlock.
		*
		* 1. The user queues the buffers, starts streaming and dequeues a buffer.
		*
		* The buffers are added to the main and irq queues. Both operations are
		* protected by the queue lock, and the latert is protected by the irq
		* protected by the queue lock, and the later is protected by the irq
		* spinlock as well.
		*
		* The completion handler fetches a buffer from the irq queue and fills it
		@@ -59,7 +59,7 @@
		* returns immediately.
		*
		* When the buffer is full, the completion handler removes it from the irq
		* queue, marks it as ready (UVC_BUF_STATE_DONE) and wake its wait queue.
		* queue, marks it as ready (UVC_BUF_STATE_DONE) and wakes its wait queue.
		* At that point, any process waiting on the buffer will be woken up. If a
		* process tries to dequeue a buffer after it has been marked ready, the
		* dequeing will succeed immediately.
		@@ -90,8 +90,8 @@ void uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type)
		/*
		* Allocate the video buffers.
		*
		* Pages are reserved to make sure they will not be swaped, as they will be
		* filled in URB completion handler.
		* Pages are reserved to make sure they will not be swapped, as they will be
		* filled in the URB completion handler.
		*
		* Buffers will be individually mapped, so they must all be page aligned.
		*/
		@@ -428,7 +428,7 @@ int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
		* Cancel the video buffers queue.
		*
		* Cancelling the queue marks all buffers on the irq queue as erroneous,
		* wakes them up and remove them from the queue.
		* wakes them up and removes them from the queue.
		*
		* If the disconnect parameter is set, further calls to uvc_queue_buffer will
		* fail with -ENODEV.

drivers/media/video/uvc/uvc_status.c

+1 −1

Original line number	Diff line number	Diff line
		/*
		* uvc_status.c -- USB Video Class driver - Status endpoint
		*
		* Copyright (C) 2007-2008
		* Copyright (C) 2007-2009
		* Laurent Pinchart (laurent.pinchart@skynet.be)
		*
		* This program is free software; you can redistribute it and/or modify