Module Name: src
Committed By: skrll
Date: Sun Mar 20 08:42:19 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: if_axereg.h if_cdcereg.h if_cuereg.h
if_kuereg.h if_otusvar.h if_rumvar.h if_runvar.h if_smscvar.h
if_udavreg.h if_upgtvar.h if_upl.c if_uralvar.h if_urlreg.h
if_urndisreg.h if_urtwnvar.h if_urtwreg.h if_zydreg.h ubt.c udl.h
udsir.c uhso.c uirdavar.h umassvar.h uscanner.c usscanner.c ustir.c
uvideo.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/sys/dev/usb/if_axereg.h
cvs rdiff -u -r1.7.24.3 -r1.7.24.4 src/sys/dev/usb/if_cdcereg.h
cvs rdiff -u -r1.18.24.3 -r1.18.24.4 src/sys/dev/usb/if_cuereg.h
cvs rdiff -u -r1.18.24.2 -r1.18.24.3 src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.7.12.3 -r1.7.12.4 src/sys/dev/usb/if_otusvar.h
cvs rdiff -u -r1.9.34.1 -r1.9.34.2 src/sys/dev/usb/if_rumvar.h
cvs rdiff -u -r1.1.20.2 -r1.1.20.3 src/sys/dev/usb/if_runvar.h
cvs rdiff -u -r1.3.4.2 -r1.3.4.3 src/sys/dev/usb/if_smscvar.h
cvs rdiff -u -r1.9.16.3 -r1.9.16.4 src/sys/dev/usb/if_udavreg.h \
src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.1.44.1 -r1.1.44.2 src/sys/dev/usb/if_upgtvar.h \
src/sys/dev/usb/udl.h
cvs rdiff -u -r1.47.4.10 -r1.47.4.11 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.11.38.1 -r1.11.38.2 src/sys/dev/usb/if_uralvar.h
cvs rdiff -u -r1.1.32.1 -r1.1.32.2 src/sys/dev/usb/if_urndisreg.h
cvs rdiff -u -r1.8.4.2 -r1.8.4.3 src/sys/dev/usb/if_urtwnvar.h
cvs rdiff -u -r1.1.22.2 -r1.1.22.3 src/sys/dev/usb/if_urtwreg.h
cvs rdiff -u -r1.7.16.3 -r1.7.16.4 src/sys/dev/usb/if_zydreg.h
cvs rdiff -u -r1.51.4.9 -r1.51.4.10 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.1.14.7 -r1.1.14.8 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.6 -r1.17.2.7 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.5.38.3 -r1.5.38.4 src/sys/dev/usb/uirdavar.h
cvs rdiff -u -r1.35.6.3 -r1.35.6.4 src/sys/dev/usb/umassvar.h
cvs rdiff -u -r1.75.4.9 -r1.75.4.10 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.38.6.11 -r1.38.6.12 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.33.10.10 -r1.33.10.11 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.41.2.10 -r1.41.2.11 src/sys/dev/usb/uvideo.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_axereg.h
diff -u src/sys/dev/usb/if_axereg.h:1.16.6.2 src/sys/dev/usb/if_axereg.h:1.16.6.3
--- src/sys/dev/usb/if_axereg.h:1.16.6.2 Sat Jun 6 14:40:13 2015
+++ src/sys/dev/usb/if_axereg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axereg.h,v 1.16.6.2 2015/06/06 14:40:13 skrll Exp $ */
+/* $NetBSD: if_axereg.h,v 1.16.6.3 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -220,7 +220,7 @@ struct axe_softc;
struct axe_chain {
struct axe_softc *axe_sc;
- struct usbd_xfer * axe_xfer;
+ struct usbd_xfer *axe_xfer;
uint8_t *axe_buf;
int axe_accum;
int axe_idx;
Index: src/sys/dev/usb/if_cdcereg.h
diff -u src/sys/dev/usb/if_cdcereg.h:1.7.24.3 src/sys/dev/usb/if_cdcereg.h:1.7.24.4
--- src/sys/dev/usb/if_cdcereg.h:1.7.24.3 Sat Jun 6 14:40:13 2015
+++ src/sys/dev/usb/if_cdcereg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdcereg.h,v 1.7.24.3 2015/06/06 14:40:13 skrll Exp $ */
+/* $NetBSD: if_cdcereg.h,v 1.7.24.4 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -51,7 +51,7 @@ struct cdce_softc;
struct cdce_chain {
struct cdce_softc *cdce_sc;
- struct usbd_xfer * cdce_xfer;
+ struct usbd_xfer *cdce_xfer;
char *cdce_buf;
struct mbuf *cdce_mbuf;
int cdce_accum;
Index: src/sys/dev/usb/if_cuereg.h
diff -u src/sys/dev/usb/if_cuereg.h:1.18.24.3 src/sys/dev/usb/if_cuereg.h:1.18.24.4
--- src/sys/dev/usb/if_cuereg.h:1.18.24.3 Sat Jun 6 14:40:13 2015
+++ src/sys/dev/usb/if_cuereg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cuereg.h,v 1.18.24.3 2015/06/06 14:40:13 skrll Exp $ */
+/* $NetBSD: if_cuereg.h,v 1.18.24.4 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -150,7 +150,7 @@ struct cue_softc;
struct cue_chain {
struct cue_softc *cue_sc;
- struct usbd_xfer * cue_xfer;
+ struct usbd_xfer *cue_xfer;
char *cue_buf;
struct mbuf *cue_mbuf;
int cue_idx;
Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.18.24.2 src/sys/dev/usb/if_kuereg.h:1.18.24.3
--- src/sys/dev/usb/if_kuereg.h:1.18.24.2 Sat Jun 6 14:40:13 2015
+++ src/sys/dev/usb/if_kuereg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kuereg.h,v 1.18.24.2 2015/06/06 14:40:13 skrll Exp $ */
+/* $NetBSD: if_kuereg.h,v 1.18.24.3 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -146,7 +146,7 @@ struct kue_softc;
struct kue_chain {
struct kue_softc *kue_sc;
- struct usbd_xfer * kue_xfer;
+ struct usbd_xfer *kue_xfer;
uint8_t *kue_buf;
int kue_idx;
};
Index: src/sys/dev/usb/if_otusvar.h
diff -u src/sys/dev/usb/if_otusvar.h:1.7.12.3 src/sys/dev/usb/if_otusvar.h:1.7.12.4
--- src/sys/dev/usb/if_otusvar.h:1.7.12.3 Thu Mar 19 17:26:42 2015
+++ src/sys/dev/usb/if_otusvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otusvar.h,v 1.7.12.3 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: if_otusvar.h,v 1.7.12.4 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_otusreg.h,v 1.6 2009/04/06 18:17:01 damien Exp $ */
/*-
@@ -111,7 +111,7 @@ struct otus_tx_radiotap_header {
struct otus_softc;
struct otus_tx_cmd {
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
void *odata;
uint16_t token;
@@ -120,13 +120,13 @@ struct otus_tx_cmd {
struct otus_rx_data {
struct otus_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
};
struct otus_tx_data {
struct otus_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
TAILQ_ENTRY(otus_tx_data) next;
};
Index: src/sys/dev/usb/if_rumvar.h
diff -u src/sys/dev/usb/if_rumvar.h:1.9.34.1 src/sys/dev/usb/if_rumvar.h:1.9.34.2
--- src/sys/dev/usb/if_rumvar.h:1.9.34.1 Thu Mar 19 17:26:42 2015
+++ src/sys/dev/usb/if_rumvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rumvar.h,v 1.9.34.1 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: if_rumvar.h,v 1.9.34.2 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_rumvar.h,v 1.7 2006/11/13 20:06:38 damien Exp $ */
/*-
@@ -57,7 +57,7 @@ struct rum_softc;
struct rum_tx_data {
struct rum_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct mbuf *m;
struct ieee80211_node *ni;
@@ -65,7 +65,7 @@ struct rum_tx_data {
struct rum_rx_data {
struct rum_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct mbuf *m;
};
Index: src/sys/dev/usb/if_runvar.h
diff -u src/sys/dev/usb/if_runvar.h:1.1.20.2 src/sys/dev/usb/if_runvar.h:1.1.20.3
--- src/sys/dev/usb/if_runvar.h:1.1.20.2 Tue Sep 29 11:38:28 2015
+++ src/sys/dev/usb/if_runvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_runvar.h,v 1.1.20.2 2015/09/29 11:38:28 skrll Exp $ */
+/* $NetBSD: if_runvar.h,v 1.1.20.3 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_runvar.h,v 1.8 2010/02/08 18:46:47 damien Exp $ */
/*-
@@ -78,14 +78,14 @@ struct run_softc;
struct run_tx_data {
struct run_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
uint8_t qid;
};
struct run_rx_data {
struct run_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
};
Index: src/sys/dev/usb/if_smscvar.h
diff -u src/sys/dev/usb/if_smscvar.h:1.3.4.2 src/sys/dev/usb/if_smscvar.h:1.3.4.3
--- src/sys/dev/usb/if_smscvar.h:1.3.4.2 Sat Jun 6 14:40:13 2015
+++ src/sys/dev/usb/if_smscvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smscvar.h,v 1.3.4.2 2015/06/06 14:40:13 skrll Exp $ */
+/* $NetBSD: if_smscvar.h,v 1.3.4.3 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $ */
/*-
@@ -36,7 +36,7 @@
struct smsc_chain {
struct smsc_softc *sc_sc;
- struct usbd_xfer * sc_xfer;
+ struct usbd_xfer *sc_xfer;
char *sc_buf;
struct mbuf *sc_mbuf;
int sc_accum;
Index: src/sys/dev/usb/if_udavreg.h
diff -u src/sys/dev/usb/if_udavreg.h:1.9.16.3 src/sys/dev/usb/if_udavreg.h:1.9.16.4
--- src/sys/dev/usb/if_udavreg.h:1.9.16.3 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/if_udavreg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.9.16.3 2015/06/06 14:40:14 skrll Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.9.16.4 2016/03/20 08:42:19 skrll Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -148,7 +148,7 @@
struct udav_chain {
struct udav_softc *udav_sc;
- struct usbd_xfer * udav_xfer;
+ struct usbd_xfer *udav_xfer;
char *udav_buf;
struct mbuf *udav_mbuf;
int udav_idx;
Index: src/sys/dev/usb/if_urlreg.h
diff -u src/sys/dev/usb/if_urlreg.h:1.9.16.3 src/sys/dev/usb/if_urlreg.h:1.9.16.4
--- src/sys/dev/usb/if_urlreg.h:1.9.16.3 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/if_urlreg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.9.16.3 2015/06/06 14:40:14 skrll Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.9.16.4 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -134,7 +134,7 @@ typedef uWord url_rxhdr_t; /* Recive Hea
struct url_chain {
struct url_softc *url_sc;
- struct usbd_xfer * url_xfer;
+ struct usbd_xfer *url_xfer;
char *url_buf;
struct mbuf *url_mbuf;
int url_idx;
Index: src/sys/dev/usb/if_upgtvar.h
diff -u src/sys/dev/usb/if_upgtvar.h:1.1.44.1 src/sys/dev/usb/if_upgtvar.h:1.1.44.2
--- src/sys/dev/usb/if_upgtvar.h:1.1.44.1 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/if_upgtvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgtvar.h,v 1.1.44.1 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: if_upgtvar.h,v 1.1.44.2 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_upgtvar.h,v 1.15 2009/08/10 20:02:19 deraadt Exp $ */
/*
@@ -77,7 +77,7 @@ struct upgt_tx_radiotap_header {
*/
struct upgt_data {
struct upgt_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct ieee80211_node *ni;
struct mbuf *m;
Index: src/sys/dev/usb/udl.h
diff -u src/sys/dev/usb/udl.h:1.1.44.1 src/sys/dev/usb/udl.h:1.1.44.2
--- src/sys/dev/usb/udl.h:1.1.44.1 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/udl.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.h,v 1.1.44.1 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: udl.h,v 1.1.44.2 2016/03/20 08:42:19 skrll Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -68,7 +68,7 @@
struct udl_cmdq {
TAILQ_ENTRY(udl_cmdq) cq_chain;
struct udl_softc *cq_sc;
- struct usbd_xfer * cq_xfer;
+ struct usbd_xfer *cq_xfer;
uint8_t *cq_buf;
};
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.47.4.10 src/sys/dev/usb/if_upl.c:1.47.4.11
--- src/sys/dev/usb/if_upl.c:1.47.4.10 Sat Mar 19 11:30:19 2016
+++ src/sys/dev/usb/if_upl.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.47.4.10 2016/03/19 11:30:19 skrll Exp $ */
+/* $NetBSD: if_upl.c,v 1.47.4.11 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47.4.10 2016/03/19 11:30:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47.4.11 2016/03/20 08:42:19 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -113,7 +113,7 @@ struct upl_softc;
struct upl_chain {
struct upl_softc *upl_sc;
- struct usbd_xfer * upl_xfer;
+ struct usbd_xfer *upl_xfer;
char *upl_buf;
struct mbuf *upl_mbuf;
int upl_idx;
Index: src/sys/dev/usb/if_uralvar.h
diff -u src/sys/dev/usb/if_uralvar.h:1.11.38.1 src/sys/dev/usb/if_uralvar.h:1.11.38.2
--- src/sys/dev/usb/if_uralvar.h:1.11.38.1 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/if_uralvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uralvar.h,v 1.11.38.1 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: if_uralvar.h,v 1.11.38.2 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_ralvar.h,v 1.2 2005/05/13 18:42:50 damien Exp $ */
/*-
@@ -57,7 +57,7 @@ struct ural_softc;
struct ural_tx_data {
struct ural_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct mbuf *m;
struct ieee80211_node *ni;
@@ -65,7 +65,7 @@ struct ural_tx_data {
struct ural_rx_data {
struct ural_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct mbuf *m;
};
Index: src/sys/dev/usb/if_urndisreg.h
diff -u src/sys/dev/usb/if_urndisreg.h:1.1.32.1 src/sys/dev/usb/if_urndisreg.h:1.1.32.2
--- src/sys/dev/usb/if_urndisreg.h:1.1.32.1 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/if_urndisreg.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndisreg.h,v 1.1.32.1 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: if_urndisreg.h,v 1.1.32.2 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_urndisreg.h,v 1.14 2010/07/08 18:22:01 ckuethe Exp $ */
/*
@@ -26,7 +26,7 @@
struct urndis_chain {
struct urndis_softc *sc_softc;
- struct usbd_xfer * sc_xfer;
+ struct usbd_xfer *sc_xfer;
char *sc_buf;
struct mbuf *sc_mbuf;
int sc_idx;
Index: src/sys/dev/usb/if_urtwnvar.h
diff -u src/sys/dev/usb/if_urtwnvar.h:1.8.4.2 src/sys/dev/usb/if_urtwnvar.h:1.8.4.3
--- src/sys/dev/usb/if_urtwnvar.h:1.8.4.2 Tue Oct 6 21:32:15 2015
+++ src/sys/dev/usb/if_urtwnvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwnvar.h,v 1.8.4.2 2015/10/06 21:32:15 skrll Exp $ */
+/* $NetBSD: if_urtwnvar.h,v 1.8.4.3 2016/03/20 08:42:19 skrll Exp $ */
/* $OpenBSD: if_urtwnreg.h,v 1.3 2010/11/16 18:02:59 damien Exp $ */
/*-
@@ -67,14 +67,14 @@ struct urtwn_softc;
struct urtwn_rx_data {
struct urtwn_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
};
struct urtwn_tx_data {
struct urtwn_softc *sc;
size_t pidx;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
TAILQ_ENTRY(urtwn_tx_data) next;
};
Index: src/sys/dev/usb/if_urtwreg.h
diff -u src/sys/dev/usb/if_urtwreg.h:1.1.22.2 src/sys/dev/usb/if_urtwreg.h:1.1.22.3
--- src/sys/dev/usb/if_urtwreg.h:1.1.22.2 Tue Oct 6 21:32:15 2015
+++ src/sys/dev/usb/if_urtwreg.h Sun Mar 20 08:42:19 2016
@@ -260,14 +260,14 @@
struct urtw_tx_data {
struct urtw_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct ieee80211_node *ni;
};
struct urtw_rx_data {
struct urtw_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct mbuf *m;
};
Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.7.16.3 src/sys/dev/usb/if_zydreg.h:1.7.16.4
--- src/sys/dev/usb/if_zydreg.h:1.7.16.3 Tue Sep 29 11:38:28 2015
+++ src/sys/dev/usb/if_zydreg.h Sun Mar 20 08:42:19 2016
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
-/* $NetBSD: if_zydreg.h,v 1.7.16.3 2015/09/29 11:38:28 skrll Exp $ */
+/* $NetBSD: if_zydreg.h,v 1.7.16.4 2016/03/20 08:42:19 skrll Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -1110,14 +1110,14 @@ struct zyd_mac_pair {
struct zyd_tx_data {
struct zyd_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
struct ieee80211_node *ni;
};
struct zyd_rx_data {
struct zyd_softc *sc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
const uint8_t *buf;
};
Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.51.4.9 src/sys/dev/usb/ubt.c:1.51.4.10
--- src/sys/dev/usb/ubt.c:1.51.4.9 Sat Mar 19 11:30:19 2016
+++ src/sys/dev/usb/ubt.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.51.4.9 2016/03/19 11:30:19 skrll Exp $ */
+/* $NetBSD: ubt.c,v 1.51.4.10 2016/03/20 08:42:19 skrll Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.51.4.9 2016/03/19 11:30:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.51.4.10 2016/03/20 08:42:19 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -160,7 +160,7 @@ SYSCTL_SETUP(sysctl_hw_ubt_debug_setup,
struct ubt_isoc_xfer {
struct ubt_softc *softc;
- struct usbd_xfer * xfer;
+ struct usbd_xfer *xfer;
uint8_t *buf;
uint16_t size[UBT_NFRAMES];
int busy;
@@ -168,7 +168,7 @@ struct ubt_isoc_xfer {
struct ubt_softc {
device_t sc_dev;
- struct usbd_device * sc_udev;
+ struct usbd_device *sc_udev;
int sc_refcnt;
int sc_dying;
int sc_enabled;
@@ -177,47 +177,47 @@ struct ubt_softc {
struct usbd_interface * sc_iface0;
/* Commands (control) */
- struct usbd_xfer * sc_cmd_xfer;
+ struct usbd_xfer *sc_cmd_xfer;
uint8_t *sc_cmd_buf;
int sc_cmd_busy; /* write active */
MBUFQ_HEAD() sc_cmd_queue; /* output queue */
/* Events (interrupt) */
int sc_evt_addr; /* endpoint address */
- struct usbd_pipe * sc_evt_pipe;
+ struct usbd_pipe *sc_evt_pipe;
uint8_t *sc_evt_buf;
/* ACL data (in) */
int sc_aclrd_addr; /* endpoint address */
- struct usbd_pipe * sc_aclrd_pipe; /* read pipe */
- struct usbd_xfer * sc_aclrd_xfer; /* read xfer */
+ struct usbd_pipe *sc_aclrd_pipe; /* read pipe */
+ struct usbd_xfer *sc_aclrd_xfer; /* read xfer */
uint8_t *sc_aclrd_buf; /* read buffer */
int sc_aclrd_busy; /* reading */
/* ACL data (out) */
int sc_aclwr_addr; /* endpoint address */
- struct usbd_pipe * sc_aclwr_pipe; /* write pipe */
- struct usbd_xfer * sc_aclwr_xfer; /* write xfer */
+ struct usbd_pipe *sc_aclwr_pipe; /* write pipe */
+ struct usbd_xfer *sc_aclwr_xfer; /* write xfer */
uint8_t *sc_aclwr_buf; /* write buffer */
int sc_aclwr_busy; /* write active */
MBUFQ_HEAD() sc_aclwr_queue;/* output queue */
/* ISOC interface */
- struct usbd_interface * sc_iface1; /* ISOC interface */
+ struct usbd_interface *sc_iface1; /* ISOC interface */
struct sysctllog *sc_log; /* sysctl log */
int sc_config; /* current config no */
int sc_alt_config; /* no of alternates */
/* SCO data (in) */
int sc_scord_addr; /* endpoint address */
- struct usbd_pipe * sc_scord_pipe; /* read pipe */
+ struct usbd_pipe *sc_scord_pipe; /* read pipe */
int sc_scord_size; /* frame length */
struct ubt_isoc_xfer sc_scord[UBT_NXFERS];
struct mbuf *sc_scord_mbuf; /* current packet */
/* SCO data (out) */
int sc_scowr_addr; /* endpoint address */
- struct usbd_pipe * sc_scowr_pipe; /* write pipe */
+ struct usbd_pipe *sc_scowr_pipe; /* write pipe */
int sc_scowr_size; /* frame length */
struct ubt_isoc_xfer sc_scowr[UBT_NXFERS];
struct mbuf *sc_scowr_mbuf; /* current packet */
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.1.14.7 src/sys/dev/usb/udsir.c:1.1.14.8
--- src/sys/dev/usb/udsir.c:1.1.14.7 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/udsir.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.1.14.7 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: udsir.c,v 1.1.14.8 2016/03/20 08:42:19 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.7 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.8 2016/03/20 08:42:19 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -67,8 +67,8 @@ int udsirdebug = 0;
struct udsir_softc {
device_t sc_dev;
- struct usbd_device * sc_udev;
- struct usbd_interface * sc_iface;
+ struct usbd_device *sc_udev;
+ struct usbd_interface *sc_iface;
uint8_t *sc_ur_buf; /* Unencapsulated frame */
u_int sc_ur_framelen;
@@ -77,8 +77,8 @@ struct udsir_softc {
int sc_rd_maxpsz;
size_t sc_rd_index;
int sc_rd_addr;
- struct usbd_pipe * sc_rd_pipe;
- struct usbd_xfer * sc_rd_xfer;
+ struct usbd_pipe *sc_rd_pipe;
+ struct usbd_xfer *sc_rd_xfer;
u_int sc_rd_count;
int sc_rd_readinprogress;
int sc_rd_expectdataticks;
@@ -91,8 +91,8 @@ struct udsir_softc {
int sc_wr_maxpsz;
int sc_wr_addr;
int sc_wr_stalewrite;
- struct usbd_xfer * sc_wr_xfer;
- struct usbd_pipe * sc_wr_pipe;
+ struct usbd_xfer *sc_wr_xfer;
+ struct usbd_pipe *sc_wr_pipe;
struct selinfo sc_wr_sel;
enum {
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.17.2.6 src/sys/dev/usb/uhso.c:1.17.2.7
--- src/sys/dev/usb/uhso.c:1.17.2.6 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/uhso.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.17.2.6 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: uhso.c,v 1.17.2.7 2016/03/20 08:42:19 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.6 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.17.2.7 2016/03/20 08:42:19 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -292,24 +292,24 @@ struct uhso_port {
usbd_callback hp_read_cb; /* read callback */
uhso_callback hp_control; /* set control lines */
- struct usbd_interface * hp_ifh; /* interface handle */
+ struct usbd_interface *hp_ifh; /* interface handle */
unsigned int hp_index; /* usb request index */
int hp_iaddr; /* interrupt endpoint */
- struct usbd_pipe * hp_ipipe; /* interrupt pipe */
+ struct usbd_pipe *hp_ipipe; /* interrupt pipe */
void *hp_ibuf; /* interrupt buffer */
size_t hp_isize; /* allocated size */
int hp_raddr; /* bulk in endpoint */
- struct usbd_pipe * hp_rpipe; /* bulk in pipe */
- struct usbd_xfer * hp_rxfer; /* input xfer */
+ struct usbd_pipe *hp_rpipe; /* bulk in pipe */
+ struct usbd_xfer *hp_rxfer; /* input xfer */
void *hp_rbuf; /* input buffer */
size_t hp_rlen; /* fill length */
size_t hp_rsize; /* allocated size */
int hp_waddr; /* bulk out endpoint */
- struct usbd_pipe * hp_wpipe; /* bulk out pipe */
- struct usbd_xfer * hp_wxfer; /* output xfer */
+ struct usbd_pipe *hp_wpipe; /* bulk out pipe */
+ struct usbd_xfer *hp_wxfer; /* output xfer */
void *hp_wbuf; /* output buffer */
size_t hp_wlen; /* fill length */
size_t hp_wsize; /* allocated size */
@@ -324,7 +324,7 @@ struct uhso_port {
struct uhso_softc {
device_t sc_dev; /* self */
- struct usbd_device * sc_udev;
+ struct usbd_device *sc_udev;
int sc_refcnt;
struct uhso_port *sc_port[UHSO_PORT_MAX];
};
Index: src/sys/dev/usb/uirdavar.h
diff -u src/sys/dev/usb/uirdavar.h:1.5.38.3 src/sys/dev/usb/uirdavar.h:1.5.38.4
--- src/sys/dev/usb/uirdavar.h:1.5.38.3 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/uirdavar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uirdavar.h,v 1.5.38.3 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: uirdavar.h,v 1.5.38.4 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -118,14 +118,14 @@ typedef struct {
struct uirda_softc {
device_t sc_dev;
- struct usbd_device * sc_udev;
- struct usbd_interface * sc_iface;
+ struct usbd_device *sc_udev;
+ struct usbd_interface *sc_iface;
kmutex_t sc_rd_buf_lk;
uint8_t *sc_rd_buf;
int sc_rd_addr;
- struct usbd_pipe * sc_rd_pipe;
- struct usbd_xfer * sc_rd_xfer;
+ struct usbd_pipe *sc_rd_pipe;
+ struct usbd_xfer *sc_rd_xfer;
struct selinfo sc_rd_sel;
u_int sc_rd_count;
u_char sc_rd_err;
@@ -133,8 +133,8 @@ struct uirda_softc {
kmutex_t sc_wr_buf_lk;
uint8_t *sc_wr_buf;
int sc_wr_addr;
- struct usbd_xfer * sc_wr_xfer;
- struct usbd_pipe * sc_wr_pipe;
+ struct usbd_xfer *sc_wr_xfer;
+ struct usbd_pipe *sc_wr_pipe;
int sc_wr_hdr;
struct selinfo sc_wr_sel;
Index: src/sys/dev/usb/umassvar.h
diff -u src/sys/dev/usb/umassvar.h:1.35.6.3 src/sys/dev/usb/umassvar.h:1.35.6.4
--- src/sys/dev/usb/umassvar.h:1.35.6.3 Tue Oct 6 21:32:15 2015
+++ src/sys/dev/usb/umassvar.h Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: umassvar.h,v 1.35.6.3 2015/10/06 21:32:15 skrll Exp $ */
+/* $NetBSD: umassvar.h,v 1.35.6.4 2016/03/20 08:42:19 skrll Exp $ */
/*-
* Copyright (c) 1999 MAEKAWA Masahide <bis...@rr.iij4u.or.jp>,
@@ -225,7 +225,7 @@ struct umass_softc {
#define XFER_NR 10 /* maximum number */
- struct usbd_xfer * transfer_xfer[XFER_NR]; /* for ctrl xfers */
+ struct usbd_xfer *transfer_xfer[XFER_NR]; /* for ctrl xfers */
void *datain_buffer;
void *dataout_buffer;
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.75.4.9 src/sys/dev/usb/uscanner.c:1.75.4.10
--- src/sys/dev/usb/uscanner.c:1.75.4.9 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/uscanner.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.75.4.9 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: uscanner.c,v 1.75.4.10 2016/03/20 08:42:19 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.75.4.9 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.4.10 2016/03/20 08:42:19 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,21 +204,21 @@ static const struct uscan_info uscanner_
struct uscanner_softc {
device_t sc_dev; /* base device */
- struct usbd_device * sc_udev;
- struct usbd_interface * sc_iface;
+ struct usbd_device *sc_udev;
+ struct usbd_interface *sc_iface;
u_int sc_dev_flags;
- struct usbd_pipe * sc_bulkin_pipe;
+ struct usbd_pipe *sc_bulkin_pipe;
int sc_bulkin;
- struct usbd_xfer * sc_bulkin_xfer;
+ struct usbd_xfer *sc_bulkin_xfer;
void *sc_bulkin_buffer;
int sc_bulkin_bufferlen;
int sc_bulkin_datalen;
- struct usbd_pipe * sc_bulkout_pipe;
+ struct usbd_pipe *sc_bulkout_pipe;
int sc_bulkout;
- struct usbd_xfer * sc_bulkout_xfer;
+ struct usbd_xfer *sc_bulkout_xfer;
void *sc_bulkout_buffer;
int sc_bulkout_bufferlen;
int sc_bulkout_datalen;
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.38.6.11 src/sys/dev/usb/usscanner.c:1.38.6.12
--- src/sys/dev/usb/usscanner.c:1.38.6.11 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/usscanner.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.38.6.11 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.38.6.12 2016/03/20 08:42:19 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.38.6.11 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.12 2016/03/20 08:42:19 skrll Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -93,25 +93,25 @@ int usscannerdebug = 0;
struct usscanner_softc {
device_t sc_dev;
- struct usbd_device * sc_udev;
- struct usbd_interface * sc_iface;
+ struct usbd_device *sc_udev;
+ struct usbd_interface *sc_iface;
int sc_in_addr;
- struct usbd_pipe * sc_in_pipe;
+ struct usbd_pipe *sc_in_pipe;
int sc_intr_addr;
- struct usbd_pipe * sc_intr_pipe;
- struct usbd_xfer * sc_intr_xfer;
+ struct usbd_pipe *sc_intr_pipe;
+ struct usbd_xfer *sc_intr_xfer;
u_char sc_status;
int sc_out_addr;
- struct usbd_pipe * sc_out_pipe;
+ struct usbd_pipe *sc_out_pipe;
- struct usbd_xfer * sc_cmd_xfer;
+ struct usbd_xfer *sc_cmd_xfer;
void *sc_cmd_buffer;
- struct usbd_xfer * sc_datain_xfer;
+ struct usbd_xfer *sc_datain_xfer;
void *sc_datain_buffer;
- struct usbd_xfer * sc_dataout_xfer;
+ struct usbd_xfer *sc_dataout_xfer;
void *sc_dataout_buffer;
int sc_state;
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.33.10.10 src/sys/dev/usb/ustir.c:1.33.10.11
--- src/sys/dev/usb/ustir.c:1.33.10.10 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/ustir.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.33.10.10 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: ustir.c,v 1.33.10.11 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.10.10 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.10.11 2016/03/20 08:42:19 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,8 +90,8 @@ Static struct ustir_speedrec const ustir
struct ustir_softc {
device_t sc_dev;
- struct usbd_device * sc_udev;
- struct usbd_interface * sc_iface;
+ struct usbd_device *sc_udev;
+ struct usbd_interface *sc_iface;
uint8_t *sc_ur_buf; /* Unencapsulated frame */
u_int sc_ur_framelen;
@@ -99,8 +99,8 @@ struct ustir_softc {
uint8_t *sc_rd_buf; /* Raw incoming data stream */
size_t sc_rd_index;
int sc_rd_addr;
- struct usbd_pipe * sc_rd_pipe;
- struct usbd_xfer * sc_rd_xfer;
+ struct usbd_pipe *sc_rd_pipe;
+ struct usbd_xfer *sc_rd_xfer;
u_int sc_rd_count;
int sc_rd_readinprogress;
u_int sc_rd_expectdataticks;
@@ -112,8 +112,8 @@ struct ustir_softc {
uint8_t *sc_wr_buf;
int sc_wr_addr;
int sc_wr_stalewrite;
- struct usbd_xfer * sc_wr_xfer;
- struct usbd_pipe * sc_wr_pipe;
+ struct usbd_xfer *sc_wr_xfer;
+ struct usbd_pipe *sc_wr_pipe;
struct selinfo sc_wr_sel;
enum {
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.41.2.10 src/sys/dev/usb/uvideo.c:1.41.2.11
--- src/sys/dev/usb/uvideo.c:1.41.2.10 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/uvideo.c Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.41.2.10 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: uvideo.c,v 1.41.2.11 2016/03/20 08:42:19 skrll Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.10 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.11 2016/03/20 08:42:19 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -182,14 +182,14 @@ struct uvideo_stream;
struct uvideo_isoc {
struct uvideo_isoc_xfer *i_ix;
struct uvideo_stream *i_vs;
- struct usbd_xfer * i_xfer;
+ struct usbd_xfer *i_xfer;
uint8_t *i_buf;
uint16_t *i_frlengths;
};
struct uvideo_isoc_xfer {
uint8_t ix_endpt;
- struct usbd_pipe * ix_pipe;
+ struct usbd_pipe *ix_pipe;
struct uvideo_isoc ix_i[UVIDEO_NXFERS];
uint32_t ix_nframes;
uint32_t ix_uframe_len;
@@ -199,8 +199,8 @@ struct uvideo_isoc_xfer {
struct uvideo_bulk_xfer {
uint8_t bx_endpt;
- struct usbd_pipe * bx_pipe;
- struct usbd_xfer * bx_xfer;
+ struct usbd_pipe *bx_pipe;
+ struct usbd_xfer *bx_xfer;
uint8_t *bx_buffer;
int bx_buflen;
bool bx_running;
@@ -210,7 +210,7 @@ struct uvideo_bulk_xfer {
struct uvideo_stream {
struct uvideo_softc *vs_parent;
- struct usbd_interface * vs_iface;
+ struct usbd_interface *vs_iface;
uint8_t vs_ifaceno;
uint8_t vs_subtype; /* input or output */
uint16_t vs_probelen; /* length of probe and
