Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61a09182 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (97 commits)
  USB: qcserial: add device id for HP devices
  USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c
  USB: allow malformed LANGID descriptors
  USB: pxa27x_udc: typo fixes and code cleanups
  USB: gadget: gadget zero uses new suspend/resume hooks
  USB: gadget: composite device-level suspend/resume hooks
  USB: r8a66597-hcd: suspend/resume support
  USB: more u32 conversion after transfer_buffer_length and actual_length
  USB: Fix cp2101 USB serial device driver termios functions for console use
  USB: CP2101 New Device ID
  USB: ipaq: handle 4 endpoint devices
  USB: S3C: Move usb-control.h to platform include
  USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue
  USB: pedantic: spelling correction in comment for ch9.h
  USB: host: fix sparse warning: Using plain integer as NULL pointer
  USB: ohci-s3c2410: fix name of bus clock
  USB: ohci-s3c2410: remove <mach/hardware.h> include
  USB: serial: rename cp2101 driver to cp210x
  USB: CP2101 Reduce Error Logging
  USB: CP2101 Support AN205 baud rates
  ...
parents 0c93ea40 fd8345f8

Documentation/usb/usbmon.txt

+20 −7
Original line number Diff line number Diff line
@@ -229,16 +229,26 @@ struct usbmon_packet { 
	int status;		/* 28: */

	unsigned int length;	/* 32: Length of data (submitted or actual) */

	unsigned int len_cap;	/* 36: Delivered length */

	unsigned char setup[8];	/* 40: Only for Control 'S' */

};				/* 48 bytes total */

	union {			/* 40: */

		unsigned char setup[SETUP_LEN];	/* Only for Control S-type */

		struct iso_rec {		/* Only for ISO */

			int error_count;

			int numdesc;

		} iso;

	} s;

	int interval;		/* 48: Only for Interrupt and ISO */

	int start_frame;	/* 52: For ISO */

	unsigned int xfer_flags; /* 56: copy of URB's transfer_flags */

	unsigned int ndesc;	/* 60: Actual number of ISO descriptors */

};				/* 64 total length */



These events can be received from a character device by reading with read(2),

with an ioctl(2), or by accessing the buffer with mmap.

with an ioctl(2), or by accessing the buffer with mmap. However, read(2)

only returns first 48 bytes for compatibility reasons.



The character device is usually called /dev/usbmonN, where N is the USB bus

number. Number zero (/dev/usbmon0) is special and means "all buses".

However, this feature is not implemented yet. Note that specific naming

policy is set by your Linux distribution.

Note that specific naming policy is set by your Linux distribution.



If you create /dev/usbmon0 by hand, make sure that it is owned by root

and has mode 0600. Otherwise, unpriviledged users will be able to snoop
@@ -279,9 +289,10 @@ size is out of [unspecified] bounds for this kernel, the call fails with 
This call returns the current size of the buffer in bytes.



 MON_IOCX_GET, defined as _IOW(MON_IOC_MAGIC, 6, struct mon_get_arg)

 MON_IOCX_GETX, defined as _IOW(MON_IOC_MAGIC, 10, struct mon_get_arg)



This call waits for events to arrive if none were in the kernel buffer,

then returns the first event. Its argument is a pointer to the following

These calls wait for events to arrive if none were in the kernel buffer,

then return the first event. The argument is a pointer to the following

structure:



struct mon_get_arg {
@@ -294,6 +305,8 @@ Before the call, hdr, data, and alloc should be filled. Upon return, the area 
pointed by hdr contains the next event structure, and the data buffer contains

the data, if any. The event is removed from the kernel buffer.



The MON_IOCX_GET copies 48 bytes, MON_IOCX_GETX copies 64 bytes.



 MON_IOCX_MFETCH, defined as _IOWR(MON_IOC_MAGIC, 7, struct mon_mfetch_arg)



This ioctl is primarily used when the application accesses the buffer

arch/arm/mach-s3c2410/usb-simtec.c

+2 −1
Original line number Diff line number Diff line
@@ -29,13 +29,14 @@ 


#include <mach/bast-map.h>

#include <mach/bast-irq.h>

#include <mach/usb-control.h>

#include <mach/regs-gpio.h>



#include <mach/hardware.h>

#include <asm/irq.h>



#include <plat/usb-control.h>

#include <plat/devs.h>



#include "usb-simtec.h"



/* control power and monitor over-current events on various Simtec

arch/arm/mach-s3c2410/include/mach/usb-control.h→arch/arm/plat-s3c/include/plat/usb-control.h

+3 −3
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/usb-control.h

/* arch/arm/plat-s3c/include/plat/usb-control.h

 *

 * Copyright (c) 2004 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * S3C2410 - usb port information

 * S3C - USB host port information

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -11,7 +11,7 @@ 
*/



#ifndef __ASM_ARCH_USBCONTROL_H

#define __ASM_ARCH_USBCONTROL_H "arch/arm/mach-s3c2410/include/mach/usb-control.h"

#define __ASM_ARCH_USBCONTROL_H



#define S3C_HCDFLG_USED	(1)

drivers/block/ub.c

+5 −6
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum); 
 */

#ifdef CONFIG_USB_LIBUSUAL



#define ub_usb_ids  storage_usb_ids

#define ub_usb_ids  usb_storage_usb_ids

#else



static struct usb_device_id ub_usb_ids[] = {
@@ -2146,10 +2146,9 @@ static int ub_get_pipes(struct ub_dev *sc, struct usb_device *dev, 
		ep = &altsetting->endpoint[i].desc;



		/* Is it a BULK endpoint? */

		if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

				== USB_ENDPOINT_XFER_BULK) {

		if (usb_endpoint_xfer_bulk(ep)) {

			/* BULK in or out? */

			if (ep->bEndpointAddress & USB_DIR_IN) {

			if (usb_endpoint_dir_in(ep)) {

				if (ep_in == NULL)

					ep_in = ep;

			} else {
@@ -2168,9 +2167,9 @@ static int ub_get_pipes(struct ub_dev *sc, struct usb_device *dev, 
	sc->send_ctrl_pipe = usb_sndctrlpipe(dev, 0);

	sc->recv_ctrl_pipe = usb_rcvctrlpipe(dev, 0);

	sc->send_bulk_pipe = usb_sndbulkpipe(dev,

		ep_out->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);

		usb_endpoint_num(ep_out));

	sc->recv_bulk_pipe = usb_rcvbulkpipe(dev, 

		ep_in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);

		usb_endpoint_num(ep_in));



	return 0;

}

drivers/usb/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-$(CONFIG_USB_SL811_HCD) += host/ 
obj-$(CONFIG_USB_U132_HCD)	+= host/

obj-$(CONFIG_USB_R8A66597_HCD)	+= host/

obj-$(CONFIG_USB_HWA_HCD)	+= host/

obj-$(CONFIG_USB_ISP1760_HCD)	+= host/



obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/