Date: Sun, 3 Apr 2011 22:01:26 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r220308 - in stable/8: share/man/man4 sys/dev/usb sys/dev/usb/controller sys/dev/usb/input sys/dev/usb/serial sys/dev/usb/template usr.sbin/usbconfig Message-ID: <201104032201.p33M1QWg062302@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Sun Apr 3 22:01:26 2011 New Revision: 220308 URL: http://svn.freebsd.org/changeset/base/220308 Log: MFC r219048, r219004, r218475 and r204632. - The NetBSD Foundation has granted permission to remove clause 3 and 4 from their software. - use device_printf() instead of printf() to give more accurate warnings. - use memcpy() instead of bcopy(). - add missing #if's for non-FreeBSD compilation. - Add missing xhci(4) manual page. - Minor update in some USB manual pages. - Correct USB 3.0 wire-speed to 5.0Gbps Approved by: thompsa (mentor) Added: stable/8/share/man/man4/xhci.4 - copied, changed from r219004, head/share/man/man4/xhci.4 Modified: stable/8/share/man/man4/Makefile stable/8/share/man/man4/ehci.4 stable/8/share/man/man4/ohci.4 stable/8/share/man/man4/snd_uaudio.4 stable/8/share/man/man4/uhci.4 stable/8/share/man/man4/usb.4 stable/8/sys/dev/usb/controller/ehci.h stable/8/sys/dev/usb/controller/ehci_pci.c stable/8/sys/dev/usb/controller/ohci.h stable/8/sys/dev/usb/controller/ohci_pci.c stable/8/sys/dev/usb/controller/ohcireg.h stable/8/sys/dev/usb/controller/uhci.h stable/8/sys/dev/usb/controller/uhci_pci.c stable/8/sys/dev/usb/controller/uhcireg.h stable/8/sys/dev/usb/controller/usb_controller.c stable/8/sys/dev/usb/input/uhid.c stable/8/sys/dev/usb/input/ukbd.c stable/8/sys/dev/usb/input/ums.c stable/8/sys/dev/usb/serial/uftdi.c stable/8/sys/dev/usb/serial/ugensa.c stable/8/sys/dev/usb/serial/uipaq.c stable/8/sys/dev/usb/serial/ulpt.c stable/8/sys/dev/usb/serial/uvisor.c stable/8/sys/dev/usb/template/usb_template.c stable/8/sys/dev/usb/usb_cdc.h stable/8/sys/dev/usb/usb_hid.c stable/8/sys/dev/usb/usb_transfer.c stable/8/sys/dev/usb/usbdevs stable/8/usr.sbin/usbconfig/dump.c Directory Properties: stable/8/share/man/man4/ (props changed) stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/usr.sbin/usbconfig/ (props changed) Modified: stable/8/share/man/man4/Makefile ============================================================================== --- stable/8/share/man/man4/Makefile Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/share/man/man4/Makefile Sun Apr 3 22:01:26 2011 (r220308) @@ -492,6 +492,7 @@ MAN= aac.4 \ ${_wpi.4} \ xe.4 \ ${_xen.4} \ + xhci.4 \ xl.4 \ xpt.4 \ zero.4 \ Modified: stable/8/share/man/man4/ehci.4 ============================================================================== --- stable/8/share/man/man4/ehci.4 Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/share/man/man4/ehci.4 Sun Apr 3 22:01:26 2011 (r220308) @@ -36,7 +36,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2005 +.Dd February 24, 2011 .Dt EHCI 4 .Os .Sh NAME @@ -77,6 +77,7 @@ but can be noticed since 2.0 devices plugged in to the same connector appear to connect to different USB busses. .Sh SEE ALSO +.Xr xhci 4 , .Xr ohci 4 , .Xr uhci 4 , .Xr usb 4 @@ -85,7 +86,19 @@ The .Nm device driver first appeared in .Fx 5.1 . -.Sh BUGS -The driver is not finished and is quite buggy. -.Pp -There is currently no support for isochronous transfers. +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width "xxxxxx" +.It Va hw.usb.ehci.lostintrbug +This tunable enables the lost interrupt quirk. +The default value is 0 (off). +.It Va hw.usb.ehci.iaadbug +This tunable enables the EHCI doorbell quirk. +The default value is 0 (off). +.It Va hw.usb.ehci.no_hs +This tunable disables USB devices to attach like HIGH-speed ones and will force all attached devices to attach to the FULL- or LOW-speed companion controller. +The default value is 0 (off). +.El Modified: stable/8/share/man/man4/ohci.4 ============================================================================== --- stable/8/share/man/man4/ohci.4 Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/share/man/man4/ohci.4 Sun Apr 3 22:01:26 2011 (r220308) @@ -63,6 +63,7 @@ NVIDIA nForce3 Sun PCIO-2 (RIO USB) .El .Sh SEE ALSO +.Xr xhci 4 , .Xr ehci 4 , .Xr uhci 4 .Sh HISTORY Modified: stable/8/share/man/man4/snd_uaudio.4 ============================================================================== --- stable/8/share/man/man4/snd_uaudio.4 Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/share/man/man4/snd_uaudio.4 Sun Apr 3 22:01:26 2011 (r220308) @@ -36,12 +36,12 @@ .\" .\" $FreeBSD$ .\" -.Dd December 15, 2005 +.Dd February 24, 2011 .Dt SND_UAUDIO 4 .Os .Sh NAME .Nm snd_uaudio -.Nd USB audio device driver +.Nd USB audio and MIDI device driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: @@ -62,7 +62,9 @@ The .Nm driver provides support for .Tn USB -audio class devices. +audio class devices and +.Tn USB +MIDI class devices. .Pp A .Tn USB @@ -101,8 +103,7 @@ as of this writing, does not handle devi abstracted manner, i.e., a detach request is refused by the .Tn PCM framework if the device is in use. -For -.Tn USB -and supposedly other detach-able busses, it is necessary to allow the -device un-registration to complete successfully, otherwise the driver -leaves wild pointers to invalid data structures and thus leading to a panic. +It is necessary to allow the device un-registration to complete +successfully, otherwise the +.Tn PCM +layer will panic. Modified: stable/8/share/man/man4/uhci.4 ============================================================================== --- stable/8/share/man/man4/uhci.4 Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/share/man/man4/uhci.4 Sun Apr 3 22:01:26 2011 (r220308) @@ -53,6 +53,7 @@ Intel 82371SB (PIIX3) VIA 83C572 .El .Sh SEE ALSO +.Xr xhci 4 , .Xr ehci 4 , .Xr ohci 4 .Sh HISTORY Modified: stable/8/share/man/man4/usb.4 ============================================================================== --- stable/8/share/man/man4/usb.4 Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/share/man/man4/usb.4 Sun Apr 3 22:01:26 2011 (r220308) @@ -190,7 +190,8 @@ specifications can be found at: .Xr uplcom 4 , .Xr urio 4 , .Xr uvscom 4 , -.Xr usbconfig 8 +.Xr usbconfig 8 , +.Xr xhci 4 .Sh STANDARDS The .Nm Copied and modified: stable/8/share/man/man4/xhci.4 (from r219004, head/share/man/man4/xhci.4) ============================================================================== --- head/share/man/man4/xhci.4 Thu Feb 24 18:08:23 2011 (r219004, copy source) +++ stable/8/share/man/man4/xhci.4 Sun Apr 3 22:01:26 2011 (r220308) @@ -48,7 +48,7 @@ The .Tn XHCI controller supports .Tn USB -connection speeds up to 4.8Gbps when using a USB 3.0 compliant device. +connection speeds up to 5.0Gbps when using a USB 3.0 compliant device. .Sh SEE ALSO .Xr ehci 4 , .Xr ohci 4 , Modified: stable/8/sys/dev/usb/controller/ehci.h ============================================================================== --- stable/8/sys/dev/usb/controller/ehci.h Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/ehci.h Sun Apr 3 22:01:26 2011 (r220308) @@ -14,13 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- stable/8/sys/dev/usb/controller/ehci_pci.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/ehci_pci.c Sun Apr 3 22:01:26 2011 (r220308) @@ -14,13 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/ohci.h ============================================================================== --- stable/8/sys/dev/usb/controller/ohci.h Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/ohci.h Sun Apr 3 22:01:26 2011 (r220308) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/ohci_pci.c ============================================================================== --- stable/8/sys/dev/usb/controller/ohci_pci.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/ohci_pci.c Sun Apr 3 22:01:26 2011 (r220308) @@ -14,13 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/ohcireg.h ============================================================================== --- stable/8/sys/dev/usb/controller/ohcireg.h Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/ohcireg.h Sun Apr 3 22:01:26 2011 (r220308) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/uhci.h ============================================================================== --- stable/8/sys/dev/usb/controller/uhci.h Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/uhci.h Sun Apr 3 22:01:26 2011 (r220308) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/uhci_pci.c ============================================================================== --- stable/8/sys/dev/usb/controller/uhci_pci.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/uhci_pci.c Sun Apr 3 22:01:26 2011 (r220308) @@ -14,13 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/uhcireg.h ============================================================================== --- stable/8/sys/dev/usb/controller/uhcireg.h Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/uhcireg.h Sun Apr 3 22:01:26 2011 (r220308) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/controller/usb_controller.c ============================================================================== --- stable/8/sys/dev/usb/controller/usb_controller.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/controller/usb_controller.c Sun Apr 3 22:01:26 2011 (r220308) @@ -362,7 +362,7 @@ usb_bus_attach(struct usb_proc_msg *pm) case USB_REV_3_0: speed = USB_SPEED_SUPER; - device_printf(bus->bdev, "4.8Gbps Super Speed USB v3.0\n"); + device_printf(bus->bdev, "5.0Gbps Super Speed USB v3.0\n"); break; default: @@ -454,19 +454,19 @@ usb_attach_sub(device_t dev, struct usb_ if (usb_proc_create(&bus->giant_callback_proc, &bus->bus_mtx, pname, USB_PRI_MED)) { - printf("WARNING: Creation of USB Giant " + device_printf(dev, "WARNING: Creation of USB Giant " "callback process failed.\n"); } else if (usb_proc_create(&bus->non_giant_callback_proc, &bus->bus_mtx, pname, USB_PRI_HIGH)) { - printf("WARNING: Creation of USB non-Giant " + device_printf(dev, "WARNING: Creation of USB non-Giant " "callback process failed.\n"); } else if (usb_proc_create(&bus->explore_proc, &bus->bus_mtx, pname, USB_PRI_MED)) { - printf("WARNING: Creation of USB explore " + device_printf(dev, "WARNING: Creation of USB explore " "process failed.\n"); } else if (usb_proc_create(&bus->control_xfer_proc, &bus->bus_mtx, pname, USB_PRI_MED)) { - printf("WARNING: Creation of USB control transfer " + device_printf(dev, "WARNING: Creation of USB control transfer " "process failed.\n"); } else { /* Get final attach going */ Modified: stable/8/sys/dev/usb/input/uhid.c ============================================================================== --- stable/8/sys/dev/usb/input/uhid.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/input/uhid.c Sun Apr 3 22:01:26 2011 (r220308) @@ -23,13 +23,6 @@ __FBSDID("$FreeBSD$"); * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/input/ukbd.c ============================================================================== --- stable/8/sys/dev/usb/input/ukbd.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/input/ukbd.c Sun Apr 3 22:01:26 2011 (r220308) @@ -18,13 +18,6 @@ __FBSDID("$FreeBSD$"); * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/input/ums.c ============================================================================== --- stable/8/sys/dev/usb/input/ums.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/input/ums.c Sun Apr 3 22:01:26 2011 (r220308) @@ -14,13 +14,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/serial/uftdi.c ============================================================================== --- stable/8/sys/dev/usb/serial/uftdi.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/serial/uftdi.c Sun Apr 3 22:01:26 2011 (r220308) @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/serial/ugensa.c ============================================================================== --- stable/8/sys/dev/usb/serial/ugensa.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/serial/ugensa.c Sun Apr 3 22:01:26 2011 (r220308) @@ -16,13 +16,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/serial/uipaq.c ============================================================================== --- stable/8/sys/dev/usb/serial/uipaq.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/serial/uipaq.c Sun Apr 3 22:01:26 2011 (r220308) @@ -17,13 +17,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/serial/ulpt.c ============================================================================== --- stable/8/sys/dev/usb/serial/ulpt.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/serial/ulpt.c Sun Apr 3 22:01:26 2011 (r220308) @@ -19,13 +19,6 @@ __FBSDID("$FreeBSD$"); * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/serial/uvisor.c ============================================================================== --- stable/8/sys/dev/usb/serial/uvisor.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/serial/uvisor.c Sun Apr 3 22:01:26 2011 (r220308) @@ -29,13 +29,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/template/usb_template.c ============================================================================== --- stable/8/sys/dev/usb/template/usb_template.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/template/usb_template.c Sun Apr 3 22:01:26 2011 (r220308) @@ -126,7 +126,7 @@ usb_make_raw_desc(struct usb_temp_setup len = raw[0]; if (temp->buf) { dst = USB_ADD_BYTES(temp->buf, temp->size); - bcopy(raw, dst, len); + memcpy(dst, raw, len); /* check if we have got a CDC union descriptor */ Modified: stable/8/sys/dev/usb/usb_cdc.h ============================================================================== --- stable/8/sys/dev/usb/usb_cdc.h Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/usb_cdc.h Sun Apr 3 22:01:26 2011 (r220308) @@ -17,13 +17,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/usb_hid.c ============================================================================== --- stable/8/sys/dev/usb/usb_hid.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/usb_hid.c Sun Apr 3 22:01:26 2011 (r220308) @@ -19,13 +19,6 @@ __FBSDID("$FreeBSD$"); * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/sys/dev/usb/usb_transfer.c ============================================================================== --- stable/8/sys/dev/usb/usb_transfer.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/usb_transfer.c Sun Apr 3 22:01:26 2011 (r220308) @@ -1148,7 +1148,9 @@ done: static void usbd_transfer_unsetup_sub(struct usb_xfer_root *info, uint8_t needs_delay) { +#if USB_HAVE_BUSDMA struct usb_page_cache *pc; +#endif USB_BUS_LOCK_ASSERT(info->bus, MA_OWNED); Modified: stable/8/sys/dev/usb/usbdevs ============================================================================== --- stable/8/sys/dev/usb/usbdevs Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/sys/dev/usb/usbdevs Sun Apr 3 22:01:26 2011 (r220308) @@ -17,13 +17,6 @@ $FreeBSD$ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: stable/8/usr.sbin/usbconfig/dump.c ============================================================================== --- stable/8/usr.sbin/usbconfig/dump.c Sun Apr 3 21:12:16 2011 (r220307) +++ stable/8/usr.sbin/usbconfig/dump.c Sun Apr 3 22:01:26 2011 (r220308) @@ -65,11 +65,11 @@ dump_speed(uint8_t value) case LIBUSB20_SPEED_VARIABLE: return ("VARIABLE (52-480Mbps)"); case LIBUSB20_SPEED_SUPER: - return ("SUPER (4.8Gbps)"); + return ("SUPER (5.0Gbps)"); default: break; } - return ("unknown"); + return ("UNKNOWN ()"); } const char *
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104032201.p33M1QWg062302>