Module Name: src
Committed By: skrll
Date: Sun Mar 20 09:15:07 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: emdtv_dtv.c if_athn_usb.c uchcom.c
udsir.c uhso.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.10.14.5 -r1.10.14.6 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.6.8.8 -r1.6.8.9 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.13.6.6 -r1.13.6.7 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.1.14.8 -r1.1.14.9 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.7 -r1.17.2.8 src/sys/dev/usb/uhso.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_dtv.c
diff -u src/sys/dev/usb/emdtv_dtv.c:1.10.14.5 src/sys/dev/usb/emdtv_dtv.c:1.10.14.6
--- src/sys/dev/usb/emdtv_dtv.c:1.10.14.5 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/emdtv_dtv.c Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.10.14.5 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.10.14.6 2016/03/20 09:15:07 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_dtv.c,v 1.10.14.5 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.10.14.6 2016/03/20 09:15:07 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -408,7 +408,7 @@ emdtv_dtv_isoc(struct usbd_xfer *xfer, v
struct emdtv_isoc_xfer *ix = priv;
struct emdtv_softc *sc = ix->ix_sc;
struct dtv_payload payload;
- struct usbd_pipe * isoc = sc->sc_isoc_pipe;
+ struct usbd_pipe *isoc = sc->sc_isoc_pipe;
uint32_t len;
uint8_t *buf;
int i;
Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.6.8.8 src/sys/dev/usb/if_athn_usb.c:1.6.8.9
--- src/sys/dev/usb/if_athn_usb.c:1.6.8.8 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/if_athn_usb.c Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.6.8.8 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.6.8.9 2016/03/20 09:15:07 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.6.8.8 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.8.9 2016/03/20 09:15:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -562,9 +562,9 @@ athn_usb_open_pipes(struct athn_usb_soft
}
static inline void
-athn_usb_kill_pipe(struct usbd_pipe * *pipeptr)
+athn_usb_kill_pipe(struct usbd_pipe **pipeptr)
{
- struct usbd_pipe * pipe;
+ struct usbd_pipe *pipe;
CTASSERT(sizeof(pipe) == sizeof(void *));
pipe = atomic_swap_ptr(pipeptr, NULL);
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.13.6.6 src/sys/dev/usb/uchcom.c:1.13.6.7
--- src/sys/dev/usb/uchcom.c:1.13.6.6 Tue Sep 29 11:38:29 2015
+++ src/sys/dev/usb/uchcom.c Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.13.6.6 2015/09/29 11:38:29 skrll Exp $ */
+/* $NetBSD: uchcom.c,v 1.13.6.7 2016/03/20 09:15:07 skrll Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.6 2015/09/29 11:38:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.7 2016/03/20 09:15:07 skrll Exp $");
/*
* driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -188,7 +188,7 @@ Static void uchcom_intr(struct usbd_xfer
usbd_status);
static int set_config(struct uchcom_softc *);
-static int find_ifaces(struct uchcom_softc *, struct usbd_interface * *);
+static int find_ifaces(struct uchcom_softc *, struct usbd_interface **);
static int find_endpoints(struct uchcom_softc *,
struct uchcom_endpoints *);
static void close_intr_pipe(struct uchcom_softc *);
@@ -369,7 +369,7 @@ set_config(struct uchcom_softc *sc)
}
static int
-find_ifaces(struct uchcom_softc *sc, struct usbd_interface * *riface)
+find_ifaces(struct uchcom_softc *sc, struct usbd_interface **riface)
{
usbd_status err;
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.1.14.8 src/sys/dev/usb/udsir.c:1.1.14.9
--- src/sys/dev/usb/udsir.c:1.1.14.8 Sun Mar 20 08:42:19 2016
+++ src/sys/dev/usb/udsir.c Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.1.14.8 2016/03/20 08:42:19 skrll Exp $ */
+/* $NetBSD: udsir.c,v 1.1.14.9 2016/03/20 09:15:07 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.8 2016/03/20 08:42:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.9 2016/03/20 09:15:07 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -175,7 +175,7 @@ udsir_attach(device_t parent, device_t s
struct udsir_softc *sc = device_private(self);
struct usbif_attach_arg *uiaa = aux;
struct usbd_device *dev = uiaa->uiaa_device;
- struct usbd_interface * iface = uiaa->uiaa_iface;
+ struct usbd_interface *iface = uiaa->uiaa_iface;
char *devinfop;
usb_endpoint_descriptor_t *ed;
uint8_t epcount;
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.17.2.7 src/sys/dev/usb/uhso.c:1.17.2.8
--- src/sys/dev/usb/uhso.c:1.17.2.7 Sun Mar 20 08:42:19 2016
+++ src/sys/dev/usb/uhso.c Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.17.2.7 2016/03/20 08:42:19 skrll Exp $ */
+/* $NetBSD: uhso.c,v 1.17.2.8 2016/03/20 09:15:07 skrll Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.17.2.7 2016/03/20 08:42:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.17.2.8 2016/03/20 09:15:07 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -453,7 +453,7 @@ uhso_attach(device_t parent, device_t se
{
struct uhso_softc *sc = device_private(self);
struct usb_attach_arg *uaa = aux;
- struct usbd_interface * ifh;
+ struct usbd_interface *ifh;
char *devinfop;
uint8_t count, i, spec;
usbd_status status;
@@ -581,8 +581,8 @@ uhso_switch_mode(struct usbd_device *ude
{
umass_bbb_cbw_t cmd;
usb_endpoint_descriptor_t *ed;
- struct usbd_interface * ifh;
- struct usbd_pipe * pipe;
+ struct usbd_interface *ifh;
+ struct usbd_pipe *pipe;
struct usbd_xfer *xfer;
usbd_status status;
@@ -682,7 +682,7 @@ uhso_get_iface_spec(struct usb_attach_ar
}
Static usb_endpoint_descriptor_t *
-uhso_get_endpoint(struct usbd_interface * ifh, int type, int dir)
+uhso_get_endpoint(struct usbd_interface *ifh, int type, int dir)
{
usb_endpoint_descriptor_t *ed;
uint8_t count, i;
@@ -719,12 +719,12 @@ Static const int uhso_mux_port[] = {
};
Static void
-uhso_mux_attach(struct uhso_softc *sc, struct usbd_interface * ifh, int index)
+uhso_mux_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index)
{
usbd_desc_iter_t iter;
const usb_descriptor_t *desc;
usb_endpoint_descriptor_t *ed;
- struct usbd_pipe * pipe;
+ struct usbd_pipe *pipe;
struct uhso_port *hp;
uint8_t *buf;
size_t size;
@@ -1030,7 +1030,7 @@ uhso_mux_intr(struct usbd_xfer *xfer, vo
*/
Static void
-uhso_bulk_attach(struct uhso_softc *sc, struct usbd_interface * ifh, int index)
+uhso_bulk_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index)
{
usb_endpoint_descriptor_t *ed;
usb_interface_descriptor_t *id;
@@ -1890,7 +1890,7 @@ uhso_tty_control(struct uhso_port *hp, u
*/
Static void
-uhso_ifnet_attach(struct uhso_softc *sc, struct usbd_interface * ifh, int index)
+uhso_ifnet_attach(struct uhso_softc *sc, struct usbd_interface *ifh, int index)
{
usb_endpoint_descriptor_t *ed;
struct uhso_port *hp;
