Module Name: src
Committed By: skrll
Date: Fri Mar 31 10:05:07 UTC 2017
Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: if_urtwn_data.h motg.c uberry.c
ugen.c uipad.c uplcom.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 src/sys/dev/usb/if_urtwn_data.h
cvs rdiff -u -r1.6.4.2.4.2 -r1.6.4.2.4.3 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.9.18.3 -r1.9.18.4 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.124.2.2.2.2 -r1.124.2.2.2.3 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.1.32.2 -r1.1.32.3 src/sys/dev/usb/uipad.c
cvs rdiff -u -r1.74.2.2.2.2 -r1.74.2.2.2.3 src/sys/dev/usb/uplcom.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/if_urtwn_data.h
diff -u src/sys/dev/usb/if_urtwn_data.h:1.3.10.1 src/sys/dev/usb/if_urtwn_data.h:1.3.10.2
--- src/sys/dev/usb/if_urtwn_data.h:1.3.10.1 Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/if_urtwn_data.h Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn_data.h,v 1.3.10.1 2017/01/26 21:54:24 skrll Exp $ */
+/* $NetBSD: if_urtwn_data.h,v 1.3.10.2 2017/03/31 10:05:07 skrll Exp $ */
/* $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $ */
/*-
@@ -50,7 +50,7 @@ static const struct {
{ 0x640, 0x40 }, { 0x642, 0x40 }, { 0x643, 0x00 }, { 0x652, 0xc8 },
{ 0x66e, 0x05 }, { 0x700, 0x21 }, { 0x701, 0x43 }, { 0x702, 0x65 },
{ 0x703, 0x87 }, { 0x708, 0x21 }, { 0x709, 0x43 }, { 0x70a, 0x65 },
- { 0x70b, 0x87 },
+ { 0x70b, 0x87 },
}, rtl8188eu_mac[] = {
{ 0x026, 0x41 }, { 0x027, 0x35 }, { 0x040, 0x00 }, { 0x428, 0x0a },
{ 0x429, 0x10 }, { 0x430, 0x00 }, { 0x431, 0x01 }, { 0x432, 0x02 },
@@ -548,7 +548,7 @@ static const uint16_t rtl8192eu_bb_regs[
0xe38, 0xe3c, 0xe40, 0xe44, 0xe48, 0xe4c, 0xe50, 0xe54,
0xe58, 0xe5c, 0xe60, 0xe68, 0xe6c, 0xe70, 0xe74, 0xe78,
0xe7c, 0xe80, 0xe84, 0xe88, 0xe8c, 0xed0, 0xed4, 0xed8,
- 0xedc, 0xee0, 0xeec, 0xee4, 0xee8, 0xf14, 0xf4c, 0xf00,
+ 0xedc, 0xee0, 0xeec, 0xee4, 0xee8, 0xf14, 0xf4c, 0xf00,
};
static const uint32_t rtl8192eu_bb_vals[] = {
@@ -910,7 +910,7 @@ static const uint8_t rtl8192eu_rf_regs[]
0x34, 0x34, 0x34, 0x34, 0x34, 0x00, 0x84, 0x86, 0x87, 0x8e,
0x8f, 0xef, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
- 0xef, 0xfe, 0x18, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00,
+ 0xef, 0xfe, 0x18, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00,
};
static const uint32_t rtl8192eu_rf_vals[] = {
@@ -929,7 +929,7 @@ static const uint32_t rtl8192eu_rf_vals[
0xef7b0, 0xd4fb0, 0xcf060, 0xb0090, 0xa0080, 0x90080, 0x8f780,
0x787b0, 0x78730, 0x60fb0, 0x5ffa0, 0x40620, 0x37090, 0x20080,
0x1f060, 0x0ffb0, 0x000a0, 0x00000, 0x0fc07, 0x00000, 0x00000,
- 0x00000, 0x00000, 0x00001, 0x80000, 0x33e70,
+ 0x00000, 0x00000, 0x00001, 0x80000, 0x33e70,
};
static const uint8_t rtl8192eu_rf2_regs[] = {
@@ -941,7 +941,7 @@ static const uint8_t rtl8192eu_rf2_regs[
0x34, 0x34, 0x34, 0x34, 0x34, 0x34, 0x00, 0x84, 0x86, 0x87,
0x8e, 0x8f, 0xef, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,
- 0x3b, 0xef, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00,
+ 0x3b, 0xef, 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0x1e, 0x1f, 0x00,
};
static const uint32_t rtl8192eu_rf2_vals[] = {
@@ -957,7 +957,7 @@ static const uint32_t rtl8192eu_rf2_vals
0xf07b0, 0xf02b0, 0xef7b0, 0xd4fb0, 0xcf060, 0xb0090, 0xa0080,
0x90080, 0x8f780, 0x787b0, 0x78730, 0x60fb0, 0x5ffa0, 0x40620,
0x37090, 0x20080, 0x1f060, 0x0ffb0, 0x000a0, 0x10159, 0x00000,
- 0x00000, 0x00000, 0x00000, 0x00001, 0x80000, 0x33e70,
+ 0x00000, 0x00000, 0x00000, 0x00001, 0x80000, 0x33e70,
};
static const struct urtwn_rf_prog rtl8192eu_rf_prog[] = {
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.6.4.2.4.2 src/sys/dev/usb/motg.c:1.6.4.2.4.3
--- src/sys/dev/usb/motg.c:1.6.4.2.4.2 Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/motg.c Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.6.4.2.4.2 2017/01/26 21:54:24 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.6.4.2.4.3 2017/03/31 10:05:07 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.2.4.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.6.4.2.4.3 2017/03/31 10:05:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_motg.h"
@@ -2087,7 +2087,7 @@ motg_device_intr_tx(struct motg_softc *s
complete:
DPRINTFN(MD_BULK, "xfer %p complete, status %d", xfer,
(xfer != NULL) ? xfer->ux_status : 0, 0, 0);
- KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS &&
+ KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS &&
ep->phase == DATA_OUT, "xfer %p status %d phase %d",
xfer, xfer->ux_status, ep->phase);
ep->phase = IDLE;
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.9.18.3 src/sys/dev/usb/uberry.c:1.9.18.4
--- src/sys/dev/usb/uberry.c:1.9.18.3 Fri Mar 31 09:38:05 2017
+++ src/sys/dev/usb/uberry.c Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.9.18.3 2017/03/31 09:38:05 skrll Exp $ */
+/* $NetBSD: uberry.c,v 1.9.18.4 2017/03/31 10:05:07 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.9.18.3 2017/03/31 09:38:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.9.18.4 2017/03/31 10:05:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -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/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.124.2.2.2.2 src/sys/dev/usb/ugen.c:1.124.2.2.2.3
--- src/sys/dev/usb/ugen.c:1.124.2.2.2.2 Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/ugen.c Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.124.2.2.2.2 2017/01/26 21:54:24 skrll Exp $ */
+/* $NetBSD: ugen.c,v 1.124.2.2.2.3 2017/03/31 10:05:07 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.124.2.2.2.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.124.2.2.2.3 2017/03/31 10:05:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1054,7 +1054,7 @@ ugen_detach(device_t self, int flags)
cv_signal(&sc->sc_endpoints[i][IN].cv);
/* Wait for processes to go away. */
if (cv_timedwait(&sc->sc_detach_cv, &sc->sc_lock, hz * 60)) {
- printf("%s: %s didn't detach\n", __func__,
+ printf("%s: %s didn't detach\n", __func__,
device_xname(sc->sc_dev));
}
}
Index: src/sys/dev/usb/uipad.c
diff -u src/sys/dev/usb/uipad.c:1.1.32.2 src/sys/dev/usb/uipad.c:1.1.32.3
--- src/sys/dev/usb/uipad.c:1.1.32.2 Thu Jan 26 21:54:24 2017
+++ src/sys/dev/usb/uipad.c Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uipad.c,v 1.1.32.2 2017/01/26 21:54:24 skrll Exp $ */
+/* $NetBSD: uipad.c,v 1.1.32.3 2017/03/31 10:05:07 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.1.32.2 2017/01/26 21:54:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.1.32.3 2017/03/31 10:05:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -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/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.74.2.2.2.2 src/sys/dev/usb/uplcom.c:1.74.2.2.2.3
--- src/sys/dev/usb/uplcom.c:1.74.2.2.2.2 Thu Jan 26 21:54:25 2017
+++ src/sys/dev/usb/uplcom.c Fri Mar 31 10:05:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.74.2.2.2.2 2017/01/26 21:54:25 skrll Exp $ */
+/* $NetBSD: uplcom.c,v 1.74.2.2.2.3 2017/03/31 10:05:07 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.74.2.2.2.2 2017/01/26 21:54:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.2.2.2.3 2017/03/31 10:05:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
#endif
-
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
