Module Name: src
Committed By: skrll
Date: Sun Dec 4 10:12:35 UTC 2016
Modified Files:
src/sys/dev/usb: emdtv.c if_athn_usb.c if_aue.c if_urndisreg.h
if_urtw.c if_urtwn.c ohci.c uberry.c ubsa.c ucom.c udl.c udsbr.c
uhci.c uhidev.c uipad.c uirdavar.h uplcom.c urio.c usb_quirks.c
usb_subr.c usbdi.c uscanner.c usscanner.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/emdtv.c src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.138 -r1.139 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/if_urndisreg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.264 -r1.265 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/udl.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.273 -r1.274 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uipad.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/uirdavar.h
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/usb/uplcom.c \
src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/urio.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.216 -r1.217 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/usscanner.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/dev/usb/emdtv.c
diff -u src/sys/dev/usb/emdtv.c:1.11 src/sys/dev/usb/emdtv.c:1.12
--- src/sys/dev/usb/emdtv.c:1.11 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/emdtv.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.11 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: emdtv.c,v 1.12 2016/12/04 10:12:35 skrll Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.11 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.12 2016/12/04 10:12:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,7 @@ emdtv_detach(device_t self, int flags)
emdtv_dtv_detach(sc, flags);
if (sc->sc_iface != NULL) {
- status = usbd_set_interface(sc->sc_iface, 0);
+ status = usbd_set_interface(sc->sc_iface, 0);
if (status != USBD_NORMAL_COMPLETION)
aprint_error_dev(sc->sc_dev,
"couldn't stop stream: %s\n", usbd_errstr(status));
@@ -383,7 +383,7 @@ emdtv_gpio_ctl(struct emdtv_softc *sc, e
if (sc->sc_board->eb_manual_gpio == false) {
val = eeprom_offset + gpioreg;
- emdtv_write_1(sc, 0x03, 0xa0, val);
+ emdtv_write_1(sc, 0x03, 0xa0, val);
gpio_value = emdtv_read_1(sc, 0x02, 0xa0);
} else {
const struct emdtv_gpio_regs *r = &eb->eb_gpio_regs;
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.11 src/sys/dev/usb/uberry.c:1.12
--- src/sys/dev/usb/uberry.c:1.11 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uberry.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.11 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uberry.c,v 1.12 2016/12/04 10:12:35 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.11 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.12 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -73,7 +73,7 @@ int uberrydebug = 0;
#endif
struct uberry_softc {
- device_t sc_dev;
+ device_t sc_dev;
struct usbd_device * sc_udev;
};
@@ -103,15 +103,15 @@ uberry_cmd(struct uberry_softc *sc, uint
{
usb_device_request_t req;
usbd_status err;
-
+
DPRINTF(("berry cmd type=%x, number=%x, value=%d, index=%d, len=%d\n",
requestType, reqno, value, index, length));
req.bmRequestType = requestType;
req.bRequest = reqno;
- USETW(req.wValue, value);
+ USETW(req.wValue, value);
USETW(req.wIndex, index);
USETW(req.wLength, length);
-
+
if ((err = usbd_do_request(sc->sc_udev, &req, data)) != 0)
aprint_error_dev(sc->sc_dev, "sending command failed %d\n",
err);
@@ -156,7 +156,7 @@ uberry_dual_mode(struct uberry_softc *sc
}
-int
+int
uberry_match(device_t parent, cfdata_t match, void *aux)
{
struct usb_attach_arg *uaa = aux;
@@ -166,7 +166,7 @@ uberry_match(device_t parent, cfdata_t m
UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
}
-void
+void
uberry_attach(device_t parent, device_t self, void *aux)
{
struct uberry_softc *sc = device_private(self);
@@ -199,7 +199,7 @@ uberry_attach(device_t parent, device_t
return;
}
-int
+int
uberry_detach(device_t self, int flags)
{
struct uberry_softc *sc = device_private(self);
Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.13 src/sys/dev/usb/if_athn_usb.c:1.14
--- src/sys/dev/usb/if_athn_usb.c:1.13 Mon Sep 5 20:58:51 2016
+++ src/sys/dev/usb/if_athn_usb.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.13 2016/09/05 20:58:51 skrll Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.14 2016/12/04 10:12:35 skrll Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.13 2016/09/05 20:58:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.14 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2279,7 +2279,7 @@ athn_usb_txeof(struct usbd_xfer *xfer, v
Static int
athn_usb_tx(struct athn_softc *sc, struct mbuf *m, struct ieee80211_node *ni,
- struct athn_usb_tx_data *data)
+ struct athn_usb_tx_data *data)
{
struct athn_usb_softc *usc = ATHN_USB_SOFTC(sc);
struct athn_node *an = ATHN_NODE(ni);
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.138 src/sys/dev/usb/if_aue.c:1.139
--- src/sys/dev/usb/if_aue.c:1.138 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/if_aue.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.138 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: if_aue.c,v 1.139 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.138 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.139 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -662,7 +662,7 @@ aue_reset(struct aue_softc *sc)
*
* Note: We force all of the GPIO pins low first, *then*
* enable the ones we want.
- */
+ */
if (sc->aue_flags & LSYS) {
/* Grrr. LinkSys has to be different from everyone else. */
aue_csr_write_1(sc, AUE_GPIO0,
@@ -671,7 +671,7 @@ aue_reset(struct aue_softc *sc)
aue_csr_write_1(sc, AUE_GPIO0,
AUE_GPIO_OUT0 | AUE_GPIO_SEL0);
}
- aue_csr_write_1(sc, AUE_GPIO0,
+ aue_csr_write_1(sc, AUE_GPIO0,
AUE_GPIO_OUT0 | AUE_GPIO_SEL0 | AUE_GPIO_SEL1);
if (sc->aue_flags & PII)
Index: src/sys/dev/usb/if_urndisreg.h
diff -u src/sys/dev/usb/if_urndisreg.h:1.2 src/sys/dev/usb/if_urndisreg.h:1.3
--- src/sys/dev/usb/if_urndisreg.h:1.2 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/if_urndisreg.h Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndisreg.h,v 1.2 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: if_urndisreg.h,v 1.3 2016/12/04 10:12:35 skrll Exp $ */
/* $OpenBSD: if_urndisreg.h,v 1.14 2010/07/08 18:22:01 ckuethe Exp $ */
/*
@@ -303,5 +303,5 @@ struct urndis_keepalive_comp {
/* Rndis offsets */
#define RNDIS_HEADER_OFFSET (sizeof(uint32_t) * 2)
#define RNDIS_DATA_OFFSET (sizeof(struct urndis_packet_msg) - \
- offsetof(struct urndis_packet_msg, \
- rm_dataoffset))
+ offsetof(struct urndis_packet_msg, \
+ rm_dataoffset))
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.12 src/sys/dev/usb/if_urtw.c:1.13
--- src/sys/dev/usb/if_urtw.c:1.12 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/if_urtw.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.12 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: if_urtw.c,v 1.13 2016/12/04 10:12:35 skrll Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.12 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.13 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2208,7 +2208,7 @@ urtw_tx_enable(struct urtw_softc *sc)
URTW_CW_CONF_PERPACKET_RETRY);
urtw_write8_m(sc, URTW_CW_CONF, data8);
- urtw_read8_m(sc, URTW_TX_AGC_CTL, &data8);
+ urtw_read8_m(sc, URTW_TX_AGC_CTL, &data8);
data8 &= ~URTW_TX_AGC_CTL_PERPACKET_GAIN;
data8 &= ~URTW_TX_AGC_CTL_PERPACKET_ANTSEL;
data8 &= ~URTW_TX_AGC_CTL_FEEDBACK_ANT;
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.51 src/sys/dev/usb/if_urtwn.c:1.52
--- src/sys/dev/usb/if_urtwn.c:1.51 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/if_urtwn.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.51 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.52 2016/12/04 10:12:35 skrll Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.51 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.52 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -191,7 +191,7 @@ static const struct urtwn_dev {
URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),
URTWN_RTL8188E_DEV(ABOCOM, RTL8188EU),
-
+
/* URTWN_RTL8192EU */
URTWN_RTL8192EU_DEV(REALTEK, RTL8192EU),
};
@@ -3079,7 +3079,7 @@ urtwn_r92e_power_on(struct urtwn_softc *
if (urtwn_read_4(sc, R92E_SYS_CFG1_8192E) & R92E_SPSLDO_SEL){
/* LDO. */
- urtwn_write_1(sc, R92E_LDO_SWR_CTRL, 0xc3);
+ urtwn_write_1(sc, R92E_LDO_SWR_CTRL, 0xc3);
}
else {
urtwn_write_2(sc, R92C_SYS_SWR_CTRL2, urtwn_read_2(sc,
@@ -3127,7 +3127,7 @@ urtwn_r92e_power_on(struct urtwn_softc *
"timeout waiting for chip power up\n");
return ETIMEDOUT;
}
-
+
urtwn_write_2(sc, R92C_CR, 0x00);
reg = urtwn_read_2(sc, R92C_CR);
reg |= R92C_CR_HCI_TXDMA_EN | R92C_CR_HCI_RXDMA_EN |
@@ -3209,9 +3209,9 @@ urtwn_llt_init(struct urtwn_softc *sc)
KASSERT(mutex_owned(&sc->sc_write_mtx));
- if (sc->chip & URTWN_CHIP_88E)
+ if (sc->chip & URTWN_CHIP_88E)
page_count = R88E_TX_PAGE_COUNT;
- else if (sc->chip & URTWN_CHIP_92EU)
+ else if (sc->chip & URTWN_CHIP_92EU)
page_count = R92E_TX_PAGE_COUNT;
else
page_count = R92C_TX_PAGE_COUNT;
@@ -3425,7 +3425,7 @@ urtwn_load_firmware(struct urtwn_softc *
/* Reset the FWDL checksum. */
urtwn_write_1(sc, R92C_MCUFWDL,
- urtwn_read_1(sc, R92C_MCUFWDL) | R92C_MCUFWDL_CHKSUM_RPT);
+ urtwn_read_1(sc, R92C_MCUFWDL) | R92C_MCUFWDL_CHKSUM_RPT);
DELAY(50);
/* download firmware */
@@ -3646,7 +3646,7 @@ urtwn_mac_init(struct urtwn_softc *sc)
for (i = 0; i < __arraycount(rtl8188eu_mac); i++)
urtwn_write_1(sc, rtl8188eu_mac[i].reg,
rtl8188eu_mac[i].val);
- } else if (ISSET(sc->chip, URTWN_CHIP_92EU)) {
+ } else if (ISSET(sc->chip, URTWN_CHIP_92EU)) {
for (i = 0; i < __arraycount(rtl8192eu_mac); i++)
urtwn_write_1(sc, rtl8192eu_mac[i].reg,
rtl8192eu_mac[i].val);
@@ -4413,7 +4413,7 @@ urtwn_iq_calib(struct urtwn_softc *sc, b
reg0 = urtwn_bb_read(sc, R92C_OFDM0_TRXPATHENA);
reg1 = urtwn_bb_read(sc, R92C_OFDM0_TRMUXPAR);
reg2 = urtwn_bb_read(sc, R92C_FPGA0_RFIFACESW(1));
-
+
/* Save adda regs to be restored when finished. */
for (i = 0; i < __arraycount(addaReg); i++)
addaBackup[i] = urtwn_bb_read(sc, addaReg[i]);
@@ -4443,7 +4443,7 @@ urtwn_iq_calib(struct urtwn_softc *sc, b
urtwn_bb_read(sc, R92C_HSSI_PARAM1(1))|
R92C_HSSI_PARAM1_PI);
}
-
+
attempt = 1;
next_attempt:
@@ -4462,7 +4462,7 @@ next_attempt:
if (sc->ntxchains > 1)
urtwn_bb_write(sc, R92C_LSSI_PARAM(1), R92C_IQK_LSSI_PARAM);
-
+
urtwn_write_1(sc, R92C_TXPAUSE, (~TP_STOPBECON) & TP_STOPALL);
urtwn_write_1(sc, R92C_BCN_CTRL, (iqkBackup[1] &
~R92C_BCN_CTRL_EN_BCN));
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.264 src/sys/dev/usb/ohci.c:1.265
--- src/sys/dev/usb/ohci.c:1.264 Sun Aug 14 14:42:22 2016
+++ src/sys/dev/usb/ohci.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.264 2016/08/14 14:42:22 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.265 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.264 2016/08/14 14:42:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.265 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3538,7 +3538,7 @@ ohci_device_isoc_enter(struct usbd_xfer
tail = opipe->tail.itd;
memset(&tail->itd, 0, sizeof(tail->itd));
tail->nextitd = NULL;
- tail->xfer = NULL;
+ tail->xfer = NULL;
usb_syncmem(&tail->dma, tail->offs, sizeof(tail->itd),
BUS_DMASYNC_PREWRITE);
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.33 src/sys/dev/usb/ubsa.c:1.34
--- src/sys/dev/usb/ubsa.c:1.33 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/ubsa.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.33 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: ubsa.c,v 1.34 2016/12/04 10:12:35 skrll Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.33 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.34 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -289,7 +289,7 @@ ubsa_attach(device_t parent, device_t se
ucaa.ucaa_arg = sc;
ucaa.ucaa_info = NULL;
DPRINTF(("ubsa: int#=%d, in = 0x%x, out = 0x%x, intr = 0x%x\n",
- i, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number));
+ i, ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number));
sc->sc_subdevs[0] = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
ucomprint, ucomsubmatch);
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.116 src/sys/dev/usb/ucom.c:1.117
--- src/sys/dev/usb/ucom.c:1.116 Tue Nov 29 07:26:53 2016
+++ src/sys/dev/usb/ucom.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.116 2016/11/29 07:26:53 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.117 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.116 2016/11/29 07:26:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.117 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -82,29 +82,29 @@ int ucomdebug = 0;
SYSCTL_SETUP(sysctl_hw_ucom_setup, "sysctl hw.ucom setup")
{
- int err;
- const struct sysctlnode *rnode;
- const struct sysctlnode *cnode;
-
- err = sysctl_createv(clog, 0, NULL, &rnode,
- CTLFLAG_PERMANENT, CTLTYPE_NODE, "ucom",
- SYSCTL_DESCR("ucom global controls"),
- NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
-
- if (err)
- goto fail;
-
- /* control debugging printfs */
- err = sysctl_createv(clog, 0, &rnode, &cnode,
- CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
- "debug", SYSCTL_DESCR("Enable debugging output"),
- NULL, 0, &ucomdebug, sizeof(ucomdebug), CTL_CREATE, CTL_EOL);
- if (err)
- goto fail;
+ int err;
+ const struct sysctlnode *rnode;
+ const struct sysctlnode *cnode;
+
+ err = sysctl_createv(clog, 0, NULL, &rnode,
+ CTLFLAG_PERMANENT, CTLTYPE_NODE, "ucom",
+ SYSCTL_DESCR("ucom global controls"),
+ NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
+
+ if (err)
+ goto fail;
+
+ /* control debugging printfs */
+ err = sysctl_createv(clog, 0, &rnode, &cnode,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
+ "debug", SYSCTL_DESCR("Enable debugging output"),
+ NULL, 0, &ucomdebug, sizeof(ucomdebug), CTL_CREATE, CTL_EOL);
+ if (err)
+ goto fail;
- return;
+ return;
fail:
- aprint_error("%s: sysctl_createv failed (err = %d)\n", __func__, err);
+ aprint_error("%s: sysctl_createv failed (err = %d)\n", __func__, err);
}
#endif /* UCOM_DEBUG */
@@ -1129,7 +1129,7 @@ ucom_status_change(struct ucom_softc *sc
struct tty *tp = sc->sc_tty;
if (sc->sc_methods->ucom_get_status != NULL) {
- u_char msr, lsr;
+ u_char msr, lsr;
sc->sc_methods->ucom_get_status(sc->sc_parent, sc->sc_portno,
&lsr, &msr);
Index: src/sys/dev/usb/udl.c
diff -u src/sys/dev/usb/udl.c:1.18 src/sys/dev/usb/udl.c:1.19
--- src/sys/dev/usb/udl.c:1.18 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/udl.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.c,v 1.18 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: udl.c,v 1.19 2016/12/04 10:12:35 skrll Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.18 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.19 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -516,7 +516,7 @@ udl_detach(device_t self, int flags)
* Free framebuffer memory.
*/
udl_fbmem_free(sc);
-
+
mutex_enter(&sc->sc_thread_mtx);
sc->sc_dying = true;
cv_broadcast(&sc->sc_thread_cv);
@@ -1415,9 +1415,9 @@ udl_cmd_add_buf_comp(struct udl_softc *s
}
/*
- * If we have bits left in our last byte, round up to the next
- * byte, so we don't overwrite them.
- */
+ * If we have bits left in our last byte, round up to the next
+ * byte, so we don't overwrite them.
+ */
if (bit_pos > 0) {
sc->sc_cmd_buf++;
sc->sc_cmd_cblen++;
@@ -1881,7 +1881,7 @@ udl_update_thread(void *v)
fb = (uint16_t *)sc->sc_fbmem;
for (offs = 0; offs < sc->sc_height * sc->sc_width; offs += stride)
udl_draw_line(sc, &fb[offs], offs, stride);
-
+
#endif
kpause("udlslp", false, (40 * hz)/1000 + 1, &sc->sc_thread_mtx);
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.25 src/sys/dev/usb/udsbr.c:1.26
--- src/sys/dev/usb/udsbr.c:1.25 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/udsbr.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.25 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: udsbr.c,v 1.26 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.25 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.26 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -82,7 +82,7 @@ const struct radio_hw_if udsbr_hw_if = {
};
struct udsbr_softc {
- device_t sc_dev;
+ device_t sc_dev;
struct usbd_device * sc_udev;
char sc_mute;
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.273 src/sys/dev/usb/uhci.c:1.274
--- src/sys/dev/usb/uhci.c:1.273 Tue May 10 15:14:03 2016
+++ src/sys/dev/usb/uhci.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.273 2016/05/10 15:14:03 pooka Exp $ */
+/* $NetBSD: uhci.c,v 1.274 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.273 2016/05/10 15:14:03 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.274 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -804,7 +804,7 @@ uhci_dump_td(uhci_soft_td_t *p)
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
DPRINTF("TD(%p) at 0x%08x", p, p->physaddr, 0, 0);
- DPRINTF(" link=0x%08x status=0x%08x "
+ DPRINTF(" link=0x%08x status=0x%08x "
"token=0x%08x buffer=0x%08x",
le32toh(p->td.td_link),
le32toh(p->td.td_status),
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.68 src/sys/dev/usb/uhidev.c:1.69
--- src/sys/dev/usb/uhidev.c:1.68 Thu Jul 7 06:55:42 2016
+++ src/sys/dev/usb/uhidev.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.68 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: uhidev.c,v 1.69 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.68 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.69 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -103,7 +103,7 @@ uhidev_match(device_t parent, cfdata_t m
if (USBIF_IS_XINPUT(uiaa))
return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO;
/* Xbox One controllers */
- if (USBIF_IS_X1INPUT(uiaa) && uiaa->uiaa_ifaceno == 0)
+ if (USBIF_IS_X1INPUT(uiaa) && uiaa->uiaa_ifaceno == 0)
return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO;
if (uiaa->uiaa_class != UICLASS_HID)
Index: src/sys/dev/usb/uipad.c
diff -u src/sys/dev/usb/uipad.c:1.3 src/sys/dev/usb/uipad.c:1.4
--- src/sys/dev/usb/uipad.c:1.3 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uipad.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uipad.c,v 1.3 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uipad.c,v 1.4 2016/12/04 10:12:35 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.3 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.4 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -73,7 +73,7 @@ int uipaddebug = 0;
#endif
struct uipad_softc {
- device_t sc_dev;
+ device_t sc_dev;
struct usbd_device * sc_udev;
};
@@ -102,15 +102,15 @@ uipad_cmd(struct uipad_softc *sc, uint8_
{
usb_device_request_t req;
usbd_status err;
-
+
DPRINTF(("ipad cmd type=%x, number=%x, value=%d, index=%d\n",
requestType, reqno, value, index));
req.bmRequestType = requestType;
req.bRequest = reqno;
- USETW(req.wValue, value);
+ USETW(req.wValue, value);
USETW(req.wIndex, index);
USETW(req.wLength, 0);
-
+
if ((err = usbd_do_request(sc->sc_udev, &req, NULL)) != 0)
aprint_error_dev(sc->sc_dev, "sending command failed %d\n",
err);
@@ -123,7 +123,7 @@ uipad_charge(struct uipad_softc *sc)
uipad_cmd(sc, UT_VENDOR | UT_WRITE, 0x40, 0x6400, 0x6400);
}
-int
+int
uipad_match(device_t parent, cfdata_t match, void *aux)
{
struct usb_attach_arg *uaa = aux;
@@ -133,7 +133,7 @@ uipad_match(device_t parent, cfdata_t ma
UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
}
-void
+void
uipad_attach(device_t parent, device_t self, void *aux)
{
struct uipad_softc *sc = device_private(self);
@@ -164,7 +164,7 @@ uipad_attach(device_t parent, device_t s
return;
}
-int
+int
uipad_detach(device_t self, int flags)
{
struct uipad_softc *sc = device_private(self);
Index: src/sys/dev/usb/uirdavar.h
diff -u src/sys/dev/usb/uirdavar.h:1.6 src/sys/dev/usb/uirdavar.h:1.7
--- src/sys/dev/usb/uirdavar.h:1.6 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uirdavar.h Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uirdavar.h,v 1.6 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: uirdavar.h,v 1.7 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -117,7 +117,7 @@ typedef struct {
struct uirda_softc {
- device_t sc_dev;
+ device_t sc_dev;
struct usbd_device *sc_udev;
struct usbd_interface *sc_iface;
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.79 src/sys/dev/usb/uplcom.c:1.80
--- src/sys/dev/usb/uplcom.c:1.79 Thu Jul 7 06:55:42 2016
+++ src/sys/dev/usb/uplcom.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.79 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: uplcom.c,v 1.80 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.79 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.80 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
#endif
-
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -339,7 +339,7 @@ uplcom_attach(device_t parent, device_t
* USB-RSAQ1 has two interface
*
* USB-RSAQ1 | USB-RSAQ2
- * -----------------+-----------------
+ * -----------------+-----------------
* Interface 0 |Interface 0
* Interrupt(0x81) | Interrupt(0x81)
* -----------------+ BulkIN(0x02)
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.79 src/sys/dev/usb/uscanner.c:1.80
--- src/sys/dev/usb/uscanner.c:1.79 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uscanner.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.79 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uscanner.c,v 1.80 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.79 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.80 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -377,7 +377,7 @@ uscanneropen(dev_t dev, int flag, int mo
if (sc == NULL)
return ENXIO;
- DPRINTFN(5, ("uscanneropen: flag=%d, mode=%d, unit=%d\n",
+ DPRINTFN(5, ("uscanneropen: flag=%d, mode=%d, unit=%d\n",
flag, mode, unit));
if (sc->sc_dying)
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.45 src/sys/dev/usb/urio.c:1.46
--- src/sys/dev/usb/urio.c:1.45 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/urio.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.45 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: urio.c,v 1.46 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.45 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.46 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -101,7 +101,7 @@ const struct cdevsw urio_cdevsw = {
struct urio_softc {
- device_t sc_dev;
+ device_t sc_dev;
struct usbd_device * sc_udev;
struct usbd_interface * sc_iface;
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.85 src/sys/dev/usb/usb_quirks.c:1.86
--- src/sys/dev/usb/usb_quirks.c:1.85 Sun Oct 16 18:47:49 2016
+++ src/sys/dev/usb/usb_quirks.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.85 2016/10/16 18:47:49 nat Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.86 2016/12/04 10:12:35 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.85 2016/10/16 18:47:49 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.86 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -72,7 +72,7 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, 0x100, { UQ_NO_SET_PROTO}},
{ USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
- 0x094, { UQ_SWAP_UNICODE}},
+ 0x094, { UQ_SWAP_UNICODE}},
{ USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, { UQ_BAD_ADC }},
{ USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, 0x0a2, { UQ_AU_NO_XU }},
{ USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0x103, { UQ_BAD_ADC }},
@@ -89,22 +89,22 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, 0x110, { UQ_SPUR_BUT_UP }},
{ USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB, 0x001, { UQ_SPUR_BUT_UP }},
{ USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
- 0x100, { UQ_ASSUME_CM_OVER_DATA }},
+ 0x100, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900,
- 0x000, { UQ_ASSUME_CM_OVER_DATA }},
+ 0x000, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_T720C,
- 0x001, { UQ_ASSUME_CM_OVER_DATA }},
+ 0x001, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852,
0x100, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_MC75,
0x000, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0x009, { UQ_AU_NO_FRAC }},
{ USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE,
- 0x100, { UQ_AU_INP_ASYNC }},
+ 0x100, { UQ_AU_INP_ASYNC }},
{ USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO,
- 0x101, { UQ_AU_INP_ASYNC }},
+ 0x101, { UQ_AU_INP_ASYNC }},
{ USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
- 0x004, { UQ_AU_INP_ASYNC }},
+ 0x004, { UQ_AU_INP_ASYNC }},
{ USB_VENDOR_CMEDIA, USB_PRODUCT_CMEDIA_USBAUDIO, ANY, { UQ_AU_INP_ASYNC }},
/* XXX These should have a revision number, but I don't know what they are. */
{ USB_VENDOR_HP, USB_PRODUCT_HP_895C, ANY, { UQ_BROKEN_BIDIR }},
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.216 src/sys/dev/usb/usb_subr.c:1.217
--- src/sys/dev/usb/usb_subr.c:1.216 Tue Sep 6 06:46:15 2016
+++ src/sys/dev/usb/usb_subr.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.216 2016/09/06 06:46:15 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.217 2016/12/04 10:12:35 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.216 2016/09/06 06:46:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.217 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -138,8 +138,8 @@ usbd_get_string_desc(struct usbd_device
return USBD_SHORT_XFER;
USETW(req.wLength, sdesc->bLength); /* the whole string */
- err = usbd_do_request_flags(dev, &req, sdesc, USBD_SHORT_XFER_OK,
- &actlen, USBD_DEFAULT_TIMEOUT);
+ err = usbd_do_request_flags(dev, &req, sdesc, USBD_SHORT_XFER_OK,
+ &actlen, USBD_DEFAULT_TIMEOUT);
if (err)
return err;
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.171 src/sys/dev/usb/usbdi.c:1.172
--- src/sys/dev/usb/usbdi.c:1.171 Tue May 17 11:37:50 2016
+++ src/sys/dev/usb/usbdi.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.171 2016/05/17 11:37:50 pooka Exp $ */
+/* $NetBSD: usbdi.c,v 1.172 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.171 2016/05/17 11:37:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.172 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -893,7 +893,7 @@ void
usb_transfer_complete(struct usbd_xfer *xfer)
{
struct usbd_pipe *pipe = xfer->ux_pipe;
- struct usbd_bus *bus = pipe->up_dev->ud_bus;
+ struct usbd_bus *bus = pipe->up_dev->ud_bus;
int sync = xfer->ux_flags & USBD_SYNCHRONOUS;
int erred =
xfer->ux_status == USBD_CANCELLED ||
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.41 src/sys/dev/usb/usscanner.c:1.42
--- src/sys/dev/usb/usscanner.c:1.41 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/usscanner.c Sun Dec 4 10:12:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.41 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.42 2016/12/04 10:12:35 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.41 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.42 2016/12/04 10:12:35 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -96,7 +96,7 @@ int usscannerdebug = 0;
#define USSCANNER_TIMEOUT 2000
struct usscanner_softc {
- device_t sc_dev;
+ device_t sc_dev;
struct usbd_device *sc_udev;
struct usbd_interface *sc_iface;
