Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (0cfd8103) · Commits · 戴 / test

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities
		What: /sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Description:
		These files show the various USB TMC capabilities as described
		by the device itself. The full description of the bitfields
		can be found in the USB TMC documents from the USB-IF entitled
		"Universal Serial Bus Test and Measurement Class Specification
		(USBTMC) Revision 1.0" section 4.2.1.8.

		The files are read only.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities
		What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Description:
		These files show the various USB TMC capabilities as described
		by the device itself. The full description of the bitfields
		can be found in the USB TMC documents from the USB-IF entitled
		"Universal Serial Bus Test and Measurement Class, Subclass
		USB488 Specification (USBTMC-USB488) Revision 1.0" section
		4.2.2.

		The files are read only.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/TermChar
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Description:
		This file is the TermChar value to be sent to the USB TMC
		device as described by the document, "Universal Serial Bus Test
		and Measurement Class Specification
		(USBTMC) Revision 1.0" as published by the USB-IF.

		Note that the TermCharEnabled file determines if this value is
		sent to the device or not.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Description:
		This file determines if the TermChar is to be sent to the
		device on every transaction or not. For more details about
		this, please see the document, "Universal Serial Bus Test and
		Measurement Class Specification (USBTMC) Revision 1.0" as
		published by the USB-IF.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Description:
		This file determines if the the transaction of the USB TMC
		device is to be automatically aborted if there is any error.
		For more details about this, please see the document,
		"Universal Serial Bus Test and Measurement Class Specification
		(USBTMC) Revision 1.0" as published by the USB-IF.

Documentation/ABI/testing/sysfs-bus-usb

+16 −0

Original line number	Diff line number	Diff line
		@@ -85,3 +85,19 @@ Description:
		Users:
		PowerTOP <power@bughost.org>
		http://www.lesswatts.org/projects/powertop/

		What: /sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
		Date: January 2008
		KernelVersion: 2.6.27
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		When read, this file returns 1 if the interface driver
		for this interface supports autosuspend. It also
		returns 1 if no driver has claimed this interface, as an
		unclaimed interface will not stop the device from being
		autosuspended if all other interface drivers are idle.
		The file returns 0 if autosuspend support has not been
		added to the driver.
		Users:
		USB PM tool
		git://git.moblin.org/users/sarah/usb-pm-tool/

Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		Where: /sys/bus/usb/.../powered
		Date: August 2008
		Kernel Version: 2.6.26
		Contact: Harrison Metzger <harrisonmetz@gmail.com>
		Description: Controls whether the device's display will powered.
		A value of 0 is off and a non-zero value is on.

		Where: /sys/bus/usb/.../mode_msb
		Where: /sys/bus/usb/.../mode_lsb
		Date: August 2008
		Kernel Version: 2.6.26
		Contact: Harrison Metzger <harrisonmetz@gmail.com>
		Description: Controls the devices display mode.
		For a 6 character display the values are
		MSB 0x06; LSB 0x3F, and
		for an 8 character display the values are
		MSB 0x08; LSB 0xFF.

		Where: /sys/bus/usb/.../textmode
		Date: August 2008
		Kernel Version: 2.6.26
		Contact: Harrison Metzger <harrisonmetz@gmail.com>
		Description: Controls the way the device interprets its text buffer.
		raw: each character controls its segment manually
		hex: each character is between 0-15
		ascii: each character is between '0'-'9' and 'A'-'F'.

		Where: /sys/bus/usb/.../text
		Date: August 2008
		Kernel Version: 2.6.26
		Contact: Harrison Metzger <harrisonmetz@gmail.com>
		Description: The text (or data) for the device to display

		Where: /sys/bus/usb/.../decimals
		Date: August 2008
		Kernel Version: 2.6.26
		Contact: Harrison Metzger <harrisonmetz@gmail.com>
		Description: Controls the decimal places on the device.
		To set the nth decimal place, give this field
		the value of 10 ** n. Assume this field has
		the value k and has 1 or more decimal places set,
		to set the mth place (where m is not already set),
		change this fields value to k + 10 ** m.
		No newline at end of file

Documentation/DocBook/gadget.tmpl

+3 −0

Original line number	Diff line number	Diff line
		@@ -557,6 +557,9 @@ Near-term plans include converting all of them, except for "gadgetfs".
		</para>

		!Edrivers/usb/gadget/f_acm.c
		!Edrivers/usb/gadget/f_ecm.c
		!Edrivers/usb/gadget/f_subset.c
		!Edrivers/usb/gadget/f_obex.c
		!Edrivers/usb/gadget/f_serial.c

		</sect1>

Documentation/devices.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -2571,6 +2571,9 @@ Your cooperation is appreciated.
		160 = /dev/usb/legousbtower0 1st USB Legotower device
		...
		175 = /dev/usb/legousbtower15 16th USB Legotower device
		176 = /dev/usb/usbtmc1 First USB TMC device
		...
		192 = /dev/usb/usbtmc16 16th USB TMC device
		240 = /dev/usb/dabusb0 First daubusb device
		...
		243 = /dev/usb/dabusb3 Fourth dabusb device

Admin message