Module Name: src
Committed By: skrll
Date: Wed Dec 3 11:24:45 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [nick-nhusb]: awin_usb.c
src/sys/arch/arm/at91 [nick-nhusb]: at91ohci.c
src/sys/arch/arm/ep93xx [nick-nhusb]: epohci.c
src/sys/arch/arm/imx [nick-nhusb]: imxusb.c
src/sys/arch/arm/omap [nick-nhusb]: omap3_ehci.c omapl1x_ohci.c tiotg.c
src/sys/arch/arm/s3c2xx0 [nick-nhusb]: ohci_s3c24x0.c
src/sys/arch/hpcmips/dev [nick-nhusb]: plumohci.c
src/sys/arch/mips/alchemy/dev [nick-nhusb]: ohci_aubus.c
src/sys/arch/mips/atheros/dev [nick-nhusb]: ehci_arbus.c ohci_arbus.c
src/sys/arch/mips/ralink [nick-nhusb]: ralink_ohci.c
src/sys/arch/mips/rmi [nick-nhusb]: rmixl_ehci.c rmixl_ohci.c
src/sys/arch/playstation2/dev [nick-nhusb]: ohci_sbus.c
src/sys/arch/powerpc/booke/dev [nick-nhusb]: pq3ehci.c
src/sys/dev/marvell [nick-nhusb]: ehci_mv.c
src/sys/dev/pci [nick-nhusb]: ehci_pci.c
src/sys/dev/usb [nick-nhusb]: if_urtwn.c if_urtwnreg.h
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/arch/arm/allwinner/awin_usb.c
cvs rdiff -u -r1.5 -r1.5.28.1 src/sys/arch/arm/at91/at91ohci.c
cvs rdiff -u -r1.7 -r1.7.14.1 src/sys/arch/arm/ep93xx/epohci.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.10 -r1.10.6.1 src/sys/arch/arm/omap/omap3_ehci.c
cvs rdiff -u -r1.1 -r1.1.12.1 src/sys/arch/arm/omap/omapl1x_ohci.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/arm/omap/tiotg.c
cvs rdiff -u -r1.8 -r1.8.30.1 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
cvs rdiff -u -r1.14 -r1.14.14.1 src/sys/arch/hpcmips/dev/plumohci.c
cvs rdiff -u -r1.15 -r1.15.30.1 src/sys/arch/mips/alchemy/dev/ohci_aubus.c
cvs rdiff -u -r1.2 -r1.2.16.1 src/sys/arch/mips/atheros/dev/ehci_arbus.c
cvs rdiff -u -r1.1 -r1.1.30.1 src/sys/arch/mips/atheros/dev/ohci_arbus.c
cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/arch/mips/ralink/ralink_ohci.c
cvs rdiff -u -r1.5 -r1.5.16.1 src/sys/arch/mips/rmi/rmixl_ehci.c
cvs rdiff -u -r1.4 -r1.4.30.1 src/sys/arch/mips/rmi/rmixl_ohci.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/playstation2/dev/ohci_sbus.c
cvs rdiff -u -r1.5 -r1.5.16.1 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.5 -r1.5.6.1 src/sys/dev/marvell/ehci_mv.c
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.34.4.1 -r1.34.4.2 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/usb/if_urtwnreg.h
cvs rdiff -u -r1.32.2.3 -r1.32.2.4 src/sys/external/bsd/dwc2/dwc2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.17 src/sys/arch/arm/allwinner/awin_usb.c:1.17.2.1
--- src/sys/arch/arm/allwinner/awin_usb.c:1.17 Fri Nov 14 08:20:22 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c Wed Dec 3 11:24:43 2014
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.17 2014/11/14 08:20:22 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.17.2.1 2014/12/03 11:24:43 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -359,7 +359,7 @@ awinusb_match(device_t parent, cfdata_t
KASSERT(loc->loc_port != AWINIOCF_PORT_DEFAULT);
KASSERT(!strcmp(cf->cf_name, loc->loc_name));
- KASSERT(cf->cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
+ KASSERT(cf->cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
|| cf->cf_loc[AWINIOCF_PORT] == loc->loc_port);
KASSERT((awinusb_ports & __BIT(loc->loc_port)) == 0);
Index: src/sys/arch/arm/at91/at91ohci.c
diff -u src/sys/arch/arm/at91/at91ohci.c:1.5 src/sys/arch/arm/at91/at91ohci.c:1.5.28.1
--- src/sys/arch/arm/at91/at91ohci.c:1.5 Fri Nov 4 17:13:15 2011
+++ src/sys/arch/arm/at91/at91ohci.c Wed Dec 3 11:24:43 2014
@@ -1,11 +1,11 @@
-/* $Id: at91ohci.c,v 1.5 2011/11/04 17:13:15 aymeric Exp $ */
-/* $NetBSD: at91ohci.c,v 1.5 2011/11/04 17:13:15 aymeric Exp $ */
+/* $Id: at91ohci.c,v 1.5.28.1 2014/12/03 11:24:43 skrll Exp $ */
+/* $NetBSD: at91ohci.c,v 1.5.28.1 2014/12/03 11:24:43 skrll Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy.
* All rights reserved.
*
- * Based on arch/arm/ep93xx/epohci.c,
+ * Based on arch/arm/ep93xx/epohci.c,
* Copyright (c) 2004 Jesse Off
* All rights reserved.
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.5 2011/11/04 17:13:15 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.5.28.1 2014/12/03 11:24:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ at91ohci_attach(device_t parent, device_
sc->sc_pid = sa->sa_pid;
/* Map I/O space */
- if (bus_space_map(sc->sc.iot, sa->sa_addr, sa->sa_size,
+ if (bus_space_map(sc->sc.iot, sa->sa_addr, sa->sa_size,
0, &sc->sc.ioh)) {
printf(": cannot map mem space\n");
return;
Index: src/sys/arch/arm/ep93xx/epohci.c
diff -u src/sys/arch/arm/ep93xx/epohci.c:1.7 src/sys/arch/arm/ep93xx/epohci.c:1.7.14.1
--- src/sys/arch/arm/ep93xx/epohci.c:1.7 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/ep93xx/epohci.c Wed Dec 3 11:24:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: epohci.c,v 1.7 2012/11/12 18:00:36 skrll Exp $ */
+/* $NetBSD: epohci.c,v 1.7.14.1 2014/12/03 11:24:43 skrll Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.7 2012/11/12 18:00:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.7.14.1 2014/12/03 11:24:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ epohci_attach(device_t parent, device_t
sc->sc_intr = sa->sa_intr;
/* Map I/O space */
- if (bus_space_map(sc->sc.iot, sa->sa_addr, sa->sa_size,
+ if (bus_space_map(sc->sc.iot, sa->sa_addr, sa->sa_size,
0, &sc->sc.ioh)) {
printf(": cannot map mem space\n");
return;
@@ -120,7 +120,7 @@ epohci_attach(device_t parent, device_t
*/
do {
- i = bus_space_read_4(sc->sc.iot, syscon_ioh,
+ i = bus_space_read_4(sc->sc.iot, syscon_ioh,
EP93XX_SYSCON_PwrSts);
} while ((i & 0x100) == 0);
bus_space_unmap(sc->sc.iot, syscon_ioh, EP93XX_APB_SYSCON_SIZE);
@@ -143,7 +143,7 @@ epohci_callback(device_t self)
strlcpy(sc->sc.sc_vendor, "Cirrus Logic", sizeof sc->sc.sc_vendor);
- sc->sc_ih = ep93xx_intr_establish(sc->sc_intr, IPL_USB,
+ sc->sc_ih = ep93xx_intr_establish(sc->sc_intr, IPL_USB,
ohci_intr, sc);
r = ohci_init(&sc->sc);
Index: src/sys/arch/arm/imx/imxusb.c
diff -u src/sys/arch/arm/imx/imxusb.c:1.7 src/sys/arch/arm/imx/imxusb.c:1.7.2.1
--- src/sys/arch/arm/imx/imxusb.c:1.7 Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imxusb.c Wed Dec 3 11:24:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: imxusb.c,v 1.7 2014/09/25 05:05:28 ryo Exp $ */
+/* $NetBSD: imxusb.c,v 1.7.2.1 2014/12/03 11:24:43 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi and Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.7 2014/09/25 05:05:28 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.7.2.1 2014/12/03 11:24:43 skrll Exp $");
#include "opt_imx.h"
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1
static int imxehci_match(device_t, cfdata_t, void *);
static void imxehci_attach(device_t, device_t, void *);
-
+
uint8_t imxusb_ulpi_read(struct imxehci_softc *sc, int addr);
void imxusb_ulpi_write(struct imxehci_softc *sc, int addr, uint8_t data);
static void ulpi_reset(struct imxehci_softc *sc);
@@ -71,11 +71,11 @@ static int
imxehci_match(device_t parent, cfdata_t cf, void *aux)
{
struct imxusbc_attach_args *aa = aux;
-
+
if (aa->aa_unit < 0 || 3 < aa->aa_unit) {
return 0;
}
-
+
return 1;
}
@@ -103,7 +103,7 @@ imxehci_attach(device_t parent, device_t
aprint_normal(": i.MX USB Controller\n");
/* per unit registers */
- if (bus_space_subregion(iot, aa->aa_ioh,
+ if (bus_space_subregion(iot, aa->aa_ioh,
aa->aa_unit * IMXUSB_EHCI_SIZE, IMXUSB_EHCI_SIZE,
&sc->sc_ioh) ||
bus_space_subregion(iot, aa->aa_ioh,
@@ -119,11 +119,11 @@ imxehci_attach(device_t parent, device_t
hcirev = bus_space_read_2(iot, sc->sc_hsc.ioh, EHCI_HCIVERSION);
aprint_normal_dev(self,
- "id=%d revision=%d HCI revision=0x%x\n",
+ "id=%d revision=%d HCI revision=0x%x\n",
(int)__SHIFTOUT(id, IMXUSB_ID_ID),
(int)__SHIFTOUT(id, IMXUSB_ID_REVISION),
hcirev);
-
+
hwhost = bus_space_read_4(iot, sc->sc_ioh, IMXUSB_HWHOST);
hwdevice = bus_space_read_4(iot, sc->sc_ioh, IMXUSB_HWDEVICE);
@@ -147,14 +147,14 @@ imxehci_attach(device_t parent, device_t
sc->sc_hsc.sc_bus.dmatag = aa->aa_dmat;
- sc->sc_hsc.sc_offs = bus_space_read_1(iot, sc->sc_hsc.ioh,
+ sc->sc_hsc.sc_offs = bus_space_read_1(iot, sc->sc_hsc.ioh,
EHCI_CAPLENGTH);
/* Platform dependent setup */
if (usbc->sc_init_md_hook)
usbc->sc_init_md_hook(sc);
-
+
imxehci_reset(sc);
imxehci_select_interface(sc, sc->sc_iftype);
@@ -173,7 +173,7 @@ imxehci_attach(device_t parent, device_t
}
imxehci_host_mode(sc);
-
+
if (usbc->sc_setup_md_hook)
usbc->sc_setup_md_hook(sc, IMXUSB_HOST);
@@ -294,7 +294,7 @@ ulpi_wait(struct imxehci_softc *sc, int
}
#define TIMEOUT 100000
-
+
uint8_t
imxusb_ulpi_read(struct imxehci_softc *sc, int addr)
{
Index: src/sys/arch/arm/omap/omap3_ehci.c
diff -u src/sys/arch/arm/omap/omap3_ehci.c:1.10 src/sys/arch/arm/omap/omap3_ehci.c:1.10.6.1
--- src/sys/arch/arm/omap/omap3_ehci.c:1.10 Sat Mar 29 23:32:41 2014
+++ src/sys/arch/arm/omap/omap3_ehci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_ehci.c,v 1.10 2014/03/29 23:32:41 matt Exp $ */
+/* $NetBSD: omap3_ehci.c,v 1.10.6.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2010-2012 Jared D. McNeill <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.10 2014/03/29 23:32:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.10.6.1 2014/12/03 11:24:44 skrll Exp $");
#include "locators.h"
@@ -132,32 +132,32 @@ enum omap3_ehci_port_mode {
static const uint32_t uhh_map[3][4] = {
#if defined(OMAP4) || defined(OMAP5)
- {
- [OMAP3_EHCI_PORT_MODE_NONE] =
+ {
+ [OMAP3_EHCI_PORT_MODE_NONE] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_UTMI, UHH_HOSTCONFIG_P1_MODE),
- [OMAP3_EHCI_PORT_MODE_PHY] =
+ [OMAP3_EHCI_PORT_MODE_PHY] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_ULPI_PHY, UHH_HOSTCONFIG_P1_MODE),
- [OMAP3_EHCI_PORT_MODE_TLL] =
+ [OMAP3_EHCI_PORT_MODE_TLL] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_UTMI, UHH_HOSTCONFIG_P1_MODE),
- [OMAP3_EHCI_PORT_MODE_HSIC] =
+ [OMAP3_EHCI_PORT_MODE_HSIC] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_HSIC, UHH_HOSTCONFIG_P1_MODE),
}, {
- [OMAP3_EHCI_PORT_MODE_NONE] =
+ [OMAP3_EHCI_PORT_MODE_NONE] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_UTMI, UHH_HOSTCONFIG_P2_MODE),
- [OMAP3_EHCI_PORT_MODE_PHY] =
+ [OMAP3_EHCI_PORT_MODE_PHY] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_ULPI_PHY, UHH_HOSTCONFIG_P2_MODE),
- [OMAP3_EHCI_PORT_MODE_TLL] =
+ [OMAP3_EHCI_PORT_MODE_TLL] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_UTMI, UHH_HOSTCONFIG_P2_MODE),
- [OMAP3_EHCI_PORT_MODE_HSIC] =
+ [OMAP3_EHCI_PORT_MODE_HSIC] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_HSIC, UHH_HOSTCONFIG_P2_MODE),
}, {
- [OMAP3_EHCI_PORT_MODE_NONE] =
+ [OMAP3_EHCI_PORT_MODE_NONE] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_UTMI, UHH_HOSTCONFIG_P3_MODE),
- [OMAP3_EHCI_PORT_MODE_PHY] =
+ [OMAP3_EHCI_PORT_MODE_PHY] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_ULPI_PHY, UHH_HOSTCONFIG_P3_MODE),
- [OMAP3_EHCI_PORT_MODE_TLL] =
+ [OMAP3_EHCI_PORT_MODE_TLL] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_UTMI, UHH_HOSTCONFIG_P3_MODE),
- [OMAP3_EHCI_PORT_MODE_HSIC] =
+ [OMAP3_EHCI_PORT_MODE_HSIC] =
__SHIFTIN(UHH_HOSTCONFIG_PMODE_HSIC, UHH_HOSTCONFIG_P3_MODE),
}
#else
@@ -176,7 +176,7 @@ static const uint32_t uhh_map[3][4] = {
[OMAP3_EHCI_PORT_MODE_PHY] = 0,
[OMAP3_EHCI_PORT_MODE_TLL] = UHH_HOSTCONFIG_P3_ULPI_BYPASS,
[OMAP3_EHCI_PORT_MODE_HSIC] = UHH_HOSTCONFIG_P3_ULPI_BYPASS,
- },
+ },
#endif
};
@@ -748,7 +748,7 @@ static void
uhh_power(struct omap3_ehci_softc *sc, bool on)
{
int retry = 5000;
-
+
uint32_t v;
v = UHH_READ4(sc, UHH_REVISION);
Index: src/sys/arch/arm/omap/omapl1x_ohci.c
diff -u src/sys/arch/arm/omap/omapl1x_ohci.c:1.1 src/sys/arch/arm/omap/omapl1x_ohci.c:1.1.12.1
--- src/sys/arch/arm/omap/omapl1x_ohci.c:1.1 Wed Oct 2 16:48:26 2013
+++ src/sys/arch/arm/omap/omapl1x_ohci.c Wed Dec 3 11:24:44 2014
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_ohci.c,v 1.1 2013/10/02 16:48:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_ohci.c,v 1.1.12.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,7 +150,7 @@ omapl1xohci_attach (struct device *paren
}
strlcpy(sc->sc.sc_vendor, "OMAPL1X", sizeof sc->sc.sc_vendor);
-
+
r = ohci_init(&sc->sc);
if (r != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error=%d\n", r);
Index: src/sys/arch/arm/omap/tiotg.c
diff -u src/sys/arch/arm/omap/tiotg.c:1.2 src/sys/arch/arm/omap/tiotg.c:1.2.8.1
--- src/sys/arch/arm/omap/tiotg.c:1.2 Thu Jul 17 19:58:18 2014
+++ src/sys/arch/arm/omap/tiotg.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tiotg.c,v 1.2 2014/07/17 19:58:18 bouyer Exp $ */
+/* $NetBSD: tiotg.c,v 1.2.8.1 2014/12/03 11:24:44 skrll Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
*
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tiotg.c,v 1.2 2014/07/17 19:58:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tiotg.c,v 1.2.8.1 2014/12/03 11:24:44 skrll Exp $");
#include "opt_omap.h"
#include "locators.h"
@@ -212,7 +212,7 @@ tiotg_childdet(device_t self, device_t c
{
struct tiotg_softc *sc = device_private(self);
int i;
-
+
for (i = 0; TI_OTG_NPORTS; i++) {
if (child == sc->sc_motgdev[i]) {
sc->sc_motgdev[i] = NULL;
@@ -293,7 +293,7 @@ ti_motg_attach(device_t parent, device_t
sc->sc_motg.sc_bus.dmatag = aa->aa_dmat;
val = TIOTG_USBC_READ4(sc, USBCTRL_REV);
- aprint_normal(": 0x%x version v%d.%d.%d", val,
+ aprint_normal(": 0x%x version v%d.%d.%d", val,
(val >> 8) & 7, (val >> 6) & 3, val & 63);
#ifdef TI_AM335X
@@ -343,7 +343,7 @@ ti_motg_attach(device_t parent, device_t
val |= USBCTRL_MODE_IDDIG;
TIOTG_USBC_WRITE4(sc, USBCTRL_MODE, val);
}
-
+
aprint_normal("\n");
if (bus_space_subregion(sc->sc_ctrliot, sc->sc_ctrlioh,
USB_CORE_OFFSET, USB_CORE_SIZE, &sc->sc_motg.sc_ioh) < 0) {
Index: src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
diff -u src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.8 src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.8.30.1
--- src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c:1.8 Fri Jul 1 20:31:39 2011
+++ src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_s3c24x0.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: ohci_s3c24x0.c,v 1.8.30.1 2014/12/03 11:24:44 skrll Exp $ */
/* derived from ohci_pci.c */
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.8 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0.c,v 1.8.30.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ ohci_ssio_attach(device_t parent, device
}
strlcpy(sc->sc.sc_vendor, "Samsung", sizeof sc->sc.sc_vendor);
-
+
r = ohci_init(&sc->sc);
if (r != USBD_NORMAL_COMPLETION) {
aprint_error_dev(self, "init failed, error=%d\n", r);
Index: src/sys/arch/hpcmips/dev/plumohci.c
diff -u src/sys/arch/hpcmips/dev/plumohci.c:1.14 src/sys/arch/hpcmips/dev/plumohci.c:1.14.14.1
--- src/sys/arch/hpcmips/dev/plumohci.c:1.14 Sat Oct 27 17:17:53 2012
+++ src/sys/arch/hpcmips/dev/plumohci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: plumohci.c,v 1.14 2012/10/27 17:17:53 chs Exp $ */
+/* $NetBSD: plumohci.c,v 1.14.14.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2000 UCHIYAMA Yasushi
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plumohci.c,v 1.14 2012/10/27 17:17:53 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumohci.c,v 1.14.14.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@ struct plumohci_shm {
struct plumohci_softc {
struct ohci_softc sc;
void *sc_ih;
- void *sc_wakeih;
+ void *sc_wakeih;
LIST_HEAD(, plumohci_shm) sc_shm_head;
};
@@ -142,14 +142,14 @@ plumohci_attach(device_t parent, device_
plumohci_bus_dma_tag._dmamap_chipset_v = sc;
/* Map I/O space */
- if (bus_space_map(sc->sc.iot, PLUM_OHCI_REGBASE, OHCI_PAGE_SIZE,
+ if (bus_space_map(sc->sc.iot, PLUM_OHCI_REGBASE, OHCI_PAGE_SIZE,
0, &sc->sc.ioh)) {
printf(": cannot map mem space\n");
return;
}
/* power up */
- /*
+ /*
* in the case of PLUM2, UHOSTC uses the VRAM as the shared RAM
* so establish power/clock of Video contoroller
*/
@@ -164,12 +164,12 @@ plumohci_attach(device_t parent, device_
sc->sc_ih = plum_intr_establish(pa->pa_pc, PLUM_INT_USB, IST_EDGE,
IPL_USB, ohci_intr, sc);
#if 0
- /*
- * enable the clock restart request interrupt
+ /*
+ * enable the clock restart request interrupt
* (for USBSUSPEND state)
*/
- sc->sc_wakeih = plum_intr_establish(pa->pa_pc, PLUM_INT_USBWAKE,
- IST_EDGE, IPL_USB,
+ sc->sc_wakeih = plum_intr_establish(pa->pa_pc, PLUM_INT_USBWAKE,
+ IST_EDGE, IPL_USB,
plumohci_intr, sc);
#endif
/*
@@ -203,7 +203,7 @@ plumohci_intr(void *arg)
/*
* Plum2 OHCI specific busdma routines.
- * Plum2 OHCI shared buffer can't allocate on memory
+ * Plum2 OHCI shared buffer can't allocate on memory
* but V-RAM (busspace).
*/
Index: src/sys/arch/mips/alchemy/dev/ohci_aubus.c
diff -u src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.15 src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.15.30.1
--- src/sys/arch/mips/alchemy/dev/ohci_aubus.c:1.15 Fri Jul 1 18:39:29 2011
+++ src/sys/arch/mips/alchemy/dev/ohci_aubus.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_aubus.c,v 1.15 2011/07/01 18:39:29 dyoung Exp $ */
+/* $NetBSD: ohci_aubus.c,v 1.15.30.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.15 2011/07/01 18:39:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.15.30.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c
#include <mips/alchemy/include/aubusvar.h>
#include <mips/alchemy/dev/ohcireg.h>
-#include <dev/usb/usb.h>
+#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
Index: src/sys/arch/mips/atheros/dev/ehci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.2 src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.2.16.1
--- src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.2 Fri Jul 20 02:14:02 2012
+++ src/sys/arch/mips/atheros/dev/ehci_arbus.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_arbus.c,v 1.2 2012/07/20 02:14:02 matt Exp $ */
+/* $NetBSD: ehci_arbus.c,v 1.2.16.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.2 2012/07/20 02:14:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.2.16.1 2014/12/03 11:24:44 skrll Exp $");
#include "locators.h"
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c
#include <mips/atheros/include/ar9344reg.h>
#include <mips/atheros/include/arbusvar.h>
-#include <dev/usb/usb.h>
+#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
Index: src/sys/arch/mips/atheros/dev/ohci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.1 src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.1.30.1
--- src/sys/arch/mips/atheros/dev/ohci_arbus.c:1.1 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/mips/atheros/dev/ohci_arbus.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_arbus.c,v 1.1 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: ohci_arbus.c,v 1.1.30.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c,v 1.1 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c,v 1.1.30.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_arbus.c
#include <sys/bus.h>
-#include <dev/usb/usb.h>
+#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
Index: src/sys/arch/mips/ralink/ralink_ohci.c
diff -u src/sys/arch/mips/ralink/ralink_ohci.c:1.3 src/sys/arch/mips/ralink/ralink_ohci.c:1.3.4.1
--- src/sys/arch/mips/ralink/ralink_ohci.c:1.3 Tue Apr 29 17:10:07 2014
+++ src/sys/arch/mips/ralink/ralink_ohci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_ohci.c,v 1.3 2014/04/29 17:10:07 matt Exp $ */
+/* $NetBSD: ralink_ohci.c,v 1.3.4.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -31,7 +31,7 @@
#include "ehci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ohci.c,v 1.3 2014/04/29 17:10:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ohci.c,v 1.3.4.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -105,7 +105,7 @@ ralink_ohci_attach(device_t parent, devi
"error=%d\n", error);
return;
}
-
+
sc->sc_ohci.sc_size = RA_USB_BLOCK_SIZE;
#ifdef RALINK_OHCI_DEBUG
Index: src/sys/arch/mips/rmi/rmixl_ehci.c
diff -u src/sys/arch/mips/rmi/rmixl_ehci.c:1.5 src/sys/arch/mips/rmi/rmixl_ehci.c:1.5.16.1
--- src/sys/arch/mips/rmi/rmixl_ehci.c:1.5 Fri Jul 20 02:14:01 2012
+++ src/sys/arch/mips/rmi/rmixl_ehci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $ */
+/* $NetBSD: rmixl_ehci.c,v 1.5.16.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.5.16.1 2014/12/03 11:24:44 skrll Exp $");
#include "locators.h"
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c
#include <mips/rmi/rmixl_intr.h>
#include <mips/rmi/rmixl_usbivar.h>
-#include <dev/usb/usb.h>
+#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
Index: src/sys/arch/mips/rmi/rmixl_ohci.c
diff -u src/sys/arch/mips/rmi/rmixl_ohci.c:1.4 src/sys/arch/mips/rmi/rmixl_ohci.c:1.4.30.1
--- src/sys/arch/mips/rmi/rmixl_ohci.c:1.4 Fri Jul 1 19:01:31 2011
+++ src/sys/arch/mips/rmi/rmixl_ohci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ohci.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $ */
+/* $NetBSD: rmixl_ohci.c,v 1.4.30.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.4 2011/07/01 19:01:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.4.30.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c
#include <mips/rmi/rmixl_intr.h>
#include <mips/rmi/rmixl_usbivar.h>
-#include <dev/usb/usb.h>
+#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
Index: src/sys/arch/playstation2/dev/ohci_sbus.c
diff -u src/sys/arch/playstation2/dev/ohci_sbus.c:1.11 src/sys/arch/playstation2/dev/ohci_sbus.c:1.11.8.1
--- src/sys/arch/playstation2/dev/ohci_sbus.c:1.11 Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/dev/ohci_sbus.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_sbus.c,v 1.11 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: ohci_sbus.c,v 1.11.8.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_sbus.c,v 1.11 2014/03/31 11:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_sbus.c,v 1.11.8.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
@@ -141,7 +141,7 @@ ohci_sbus_attach(struct device *parent,
LIST_INIT(&sc->sc_dmaseg_head);
result = ohci_init(&sc->sc);
-
+
if (result != USBD_NORMAL_COMPLETION) {
printf(": init failed. error=%d\n", result);
return;
Index: src/sys/arch/powerpc/booke/dev/pq3ehci.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.5 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.5.16.1
--- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.5 Fri Jul 20 02:14:01 2012
+++ src/sys/arch/powerpc/booke/dev/pq3ehci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $ */
+/* $NetBSD: pq3ehci.c,v 1.5.16.1 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.5.16.1 2014/12/03 11:24:44 skrll Exp $");
#include "opt_usb.h"
@@ -117,7 +117,7 @@ pq3ehci_attach(device_t parent, device_t
* We need to tell the USB interface to snoop all off RAM starting
* at 0. Since it can do it by powers of 2, get the highest RAM
* address and roughly round it to the next power of 2 and find
- * the number of leading zero bits.
+ * the number of leading zero bits.
*/
cpu_write_4(cnl->cnl_addr + USB_SNOOP1,
SNOOP_2GB - __builtin_clz(curcpu()->ci_softc->cpu_highmem * 2 - 1));
Index: src/sys/dev/marvell/ehci_mv.c
diff -u src/sys/dev/marvell/ehci_mv.c:1.5 src/sys/dev/marvell/ehci_mv.c:1.5.6.1
--- src/sys/dev/marvell/ehci_mv.c:1.5 Sat Mar 15 13:33:48 2014
+++ src/sys/dev/marvell/ehci_mv.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_mv.c,v 1.5 2014/03/15 13:33:48 kiyohara Exp $ */
+/* $NetBSD: ehci_mv.c,v 1.5.6.1 2014/12/03 11:24:44 skrll Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.5 2014/03/15 13:33:48 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_mv.c,v 1.5.6.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -316,7 +316,7 @@ mvusb_init(struct mvusb_softc *sc, enum
/* bits[8:9] - (DISCON_THRESHOLD ) */
/*
* Orion1-A0/A1/B0=11, Orion2-A0=10,
- * Orion1-B1 and Orion2-B0 later=00
+ * Orion1-B1 and Orion2-B0 later=00
*/
reg &= ~(3 << 8);
if (sc->sc_model == MARVELL_ORION_1_88F5181 && sc->sc_rev <= 2)
Index: src/sys/dev/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.59 src/sys/dev/pci/ehci_pci.c:1.59.2.1
--- src/sys/dev/pci/ehci_pci.c:1.59 Sun Sep 21 14:30:22 2014
+++ src/sys/dev/pci/ehci_pci.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.59 2014/09/21 14:30:22 christos Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.59.2.1 2014/12/03 11:24:44 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.59 2014/09/21 14:30:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.59.2.1 2014/12/03 11:24:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -463,7 +463,7 @@ static int
ehci_apply_amd_quirks(struct ehci_pci_softc *sc)
{
pcireg_t value;
-
+
aprint_normal_dev(sc->sc.sc_dev,
"applying AMD SB600/SB700 USB freeze workaround\n");
value = pci_conf_read(sc->sc_pc, sc->sc_tag, EHCI_SBx00_WORKAROUND_REG);
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.34.4.1 src/sys/dev/usb/if_urtwn.c:1.34.4.2
--- src/sys/dev/usb/if_urtwn.c:1.34.4.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_urtwn.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.34.4.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.34.4.2 2014/12/03 11:24:44 skrll Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.4.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.4.2 2014/12/03 11:24:44 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -97,9 +97,9 @@ u_int urtwn_debug = 0;
#define DPRINTFN(n, s)
#endif
-#define URTWN_DEV(v,p) { { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }, 0 }
+#define URTWN_DEV(v,p) { { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }, 0 }
#define URTWN_RTL8188E_DEV(v,p) \
- { { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }, FLAG_RTL8188E }
+ { { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }, FLAG_RTL8188E }
static const struct urtwn_dev {
struct usb_devno dev;
uint32_t flags;
Index: src/sys/dev/usb/if_urtwnreg.h
diff -u src/sys/dev/usb/if_urtwnreg.h:1.7 src/sys/dev/usb/if_urtwnreg.h:1.7.4.1
--- src/sys/dev/usb/if_urtwnreg.h:1.7 Sun Jul 20 13:25:23 2014
+++ src/sys/dev/usb/if_urtwnreg.h Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwnreg.h,v 1.7 2014/07/20 13:25:23 nonaka Exp $ */
+/* $NetBSD: if_urtwnreg.h,v 1.7.4.1 2014/12/03 11:24:44 skrll Exp $ */
/* $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $ */
/*-
@@ -530,7 +530,7 @@
/* Bits for R92C_BCNDMATIM */
#define R92C_DMA_ATIME_INT_TIME 0x02
-
+
/* Bits for R92C_APSD_CTRL. */
#define R92C_APSD_CTRL_OFF 0x40
#define R92C_APSD_CTRL_OFF_STATUS 0x80
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32.2.3 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.4
--- src/sys/external/bsd/dwc2/dwc2.c:1.32.2.3 Tue Dec 2 09:00:34 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Wed Dec 3 11:24:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.32.2.3 2014/12/02 09:00:34 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.32.2.4 2014/12/03 11:24:44 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.3 2014/12/02 09:00:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.4 2014/12/03 11:24:44 skrll Exp $");
#include "opt_usb.h"
@@ -313,7 +313,7 @@ dwc2_softintr(void *v)
mutex_spin_enter(&hsotg->lock);
while ((dxfer = TAILQ_FIRST(&sc->sc_complete)) != NULL) {
- KASSERTMSG(!callout_pending(&dxfer->xfer.timeout_handle),
+ KASSERTMSG(!callout_pending(&dxfer->xfer.timeout_handle),
"xfer %p pipe %p\n", dxfer, dxfer->xfer.pipe);
/*
