Module Name: src
Committed By: skrll
Date: Tue Dec 23 11:10:41 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: moscom.c umodem.c uvscom.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.8.14.1 -r1.8.14.2 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.66.4.1 -r1.66.4.2 src/sys/dev/usb/umodem.c
cvs rdiff -u -r1.28.16.2 -r1.28.16.3 src/sys/dev/usb/uvscom.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/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.8.14.1 src/sys/dev/usb/moscom.c:1.8.14.2
--- src/sys/dev/usb/moscom.c:1.8.14.1 Sat Dec 6 08:37:30 2014
+++ src/sys/dev/usb/moscom.c Tue Dec 23 11:10:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.8.14.1 2014/12/06 08:37:30 skrll Exp $ */
+/* $NetBSD: moscom.c,v 1.8.14.2 2014/12/23 11:10:41 skrll Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.1 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.8.14.2 2014/12/23 11:10:41 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,11 +67,11 @@ __KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1
#define MOSCOM_INT_RXEN 0x01
#define MOSCOM_INT_TXEN 0x02
-#define MOSCOM_INT_RSEN 0x04
+#define MOSCOM_INT_RSEN 0x04
#define MOSCOM_INT_MDMEM 0x08
#define MOSCOM_INT_SLEEP 0x10
#define MOSCOM_INT_XOFF 0x20
-#define MOSCOM_INT_RTS 0x40
+#define MOSCOM_INT_RTS 0x40
#define MOSCOM_FIFO_EN 0x01
#define MOSCOM_FIFO_RXCLR 0x02
@@ -153,7 +153,7 @@ void moscom_get_status(void *, int, u_ch
void moscom_set(void *, int, int, int);
int moscom_param(void *, int, struct termios *);
int moscom_open(void *, int);
-int moscom_cmd(struct moscom_softc *, int, int);
+int moscom_cmd(struct moscom_softc *, int, int);
struct ucom_methods moscom_methods = {
.ucom_get_status = NULL,
@@ -173,16 +173,16 @@ static const struct usb_devno moscom_dev
};
#define moscom_lookup(v, p) usb_lookup(moscom_devs, v, p)
-int moscom_match(device_t, cfdata_t, void *);
-void moscom_attach(device_t, device_t, void *);
+int moscom_match(device_t, cfdata_t, void *);
+void moscom_attach(device_t, device_t, void *);
void moscom_childdet(device_t, device_t);
-int moscom_detach(device_t, int);
-int moscom_activate(device_t, enum devact);
+int moscom_detach(device_t, int);
+int moscom_activate(device_t, enum devact);
CFATTACH_DECL2_NEW(moscom, sizeof(struct moscom_softc), moscom_match,
moscom_attach, moscom_detach, moscom_activate, NULL, moscom_childdet);
-int
+int
moscom_match(device_t parent, cfdata_t match, void *aux)
{
struct usb_attach_arg *uaa = aux;
@@ -191,7 +191,7 @@ moscom_match(device_t parent, cfdata_t m
UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
}
-void
+void
moscom_attach(device_t parent, device_t self, void *aux)
{
struct moscom_softc *sc = device_private(self);
@@ -269,7 +269,7 @@ moscom_attach(device_t parent, device_t
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
sc->sc_dev);
-
+
sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &uca,
ucomprint, ucomsubmatch);
@@ -285,7 +285,7 @@ moscom_childdet(device_t self, device_t
sc->sc_subdev = NULL;
}
-int
+int
moscom_detach(device_t self, int flags)
{
struct moscom_softc *sc = device_private(self);
@@ -327,10 +327,10 @@ moscom_open(void *vsc, int portno)
/* Purge FIFOs or odd things happen */
if (moscom_cmd(sc, MOSCOM_FIFO, 0x00) != 0)
return (EIO);
-
+
if (moscom_cmd(sc, MOSCOM_FIFO, MOSCOM_FIFO_EN |
MOSCOM_FIFO_RXCLR | MOSCOM_FIFO_TXCLR |
- MOSCOM_FIFO_DMA_BLK | MOSCOM_FIFO_RXLVL_MASK) != 0)
+ MOSCOM_FIFO_DMA_BLK | MOSCOM_FIFO_RXLVL_MASK) != 0)
return (EIO);
/* Magic tell device we're ready for data command */
@@ -436,7 +436,7 @@ void
moscom_get_status(void *vsc, int portno, u_char *lsr, u_char *msr)
{
struct moscom_softc *sc = vsc;
-
+
if (msr != NULL)
*msr = sc->sc_msr;
if (lsr != NULL)
@@ -448,7 +448,7 @@ moscom_cmd(struct moscom_softc *sc, int
{
usb_device_request_t req;
usbd_status err;
-
+
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = MOSCOM_WRITE;
USETW(req.wValue, val + MOSCOM_UART_REG);
Index: src/sys/dev/usb/umodem.c
diff -u src/sys/dev/usb/umodem.c:1.66.4.1 src/sys/dev/usb/umodem.c:1.66.4.2
--- src/sys/dev/usb/umodem.c:1.66.4.1 Sat Dec 6 08:37:30 2014
+++ src/sys/dev/usb/umodem.c Tue Dec 23 11:10:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.66.4.1 2014/12/06 08:37:30 skrll Exp $ */
+/* $NetBSD: umodem.c,v 1.66.4.2 2014/12/23 11:10:41 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.1 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66.4.2 2014/12/23 11:10:41 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@ extern struct cfdriver umodem_cd;
CFATTACH_DECL_NEW(umodem, sizeof(struct umodem_softc), umodem_match,
umodem_attach, umodem_detach, umodem_activate);
-int
+int
umodem_match(device_t parent, cfdata_t match, void *aux)
{
struct usbif_attach_arg *uaa = aux;
@@ -115,7 +115,7 @@ umodem_match(device_t parent, cfdata_t m
return (UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO);
}
-void
+void
umodem_attach(device_t parent, device_t self, void *aux)
{
struct umodem_softc *sc = device_private(self);
@@ -142,7 +142,7 @@ umodem_activate(device_t self, enum deva
return umodem_common_activate(sc, act);
}
-int
+int
umodem_detach(device_t self, int flags)
{
struct umodem_softc *sc = device_private(self);
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.28.16.2 src/sys/dev/usb/uvscom.c:1.28.16.3
--- src/sys/dev/usb/uvscom.c:1.28.16.2 Sat Dec 6 08:37:30 2014
+++ src/sys/dev/usb/uvscom.c Tue Dec 23 11:10:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.28.16.2 2014/12/06 08:37:30 skrll Exp $ */
+/* $NetBSD: uvscom.c,v 1.28.16.3 2014/12/23 11:10:41 skrll Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <[email protected]>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.2 2014/12/06 08:37:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.16.3 2014/12/23 11:10:41 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -218,7 +218,7 @@ extern struct cfdriver uvscom_cd;
CFATTACH_DECL2_NEW(uvscom, sizeof(struct uvscom_softc), uvscom_match,
uvscom_attach, uvscom_detach, uvscom_activate, NULL, uvscom_childdet);
-int
+int
uvscom_match(device_t parent, cfdata_t match, void *aux)
{
struct usb_attach_arg *uaa = aux;
@@ -227,7 +227,7 @@ uvscom_match(device_t parent, cfdata_t m
UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
}
-void
+void
uvscom_attach(device_t parent, device_t self, void *aux)
{
struct uvscom_softc *sc = device_private(self);
@@ -375,7 +375,7 @@ uvscom_childdet(device_t self, device_t
sc->sc_subdev = NULL;
}
-int
+int
uvscom_detach(device_t self, int flags)
{
struct uvscom_softc *sc = device_private(self);
