Module Name: src
Committed By: mrg
Date: Sun Jul 21 10:27:56 UTC 2019
Modified Files:
src/sys/dev/usb: if_auereg.h if_axe.c if_cdce.c if_cuereg.h if_kuereg.h
if_udavreg.h if_upl.c if_url.c if_urlreg.h
Log Message:
remove unused structure members. this brings most <foo>_chain and
<foo>_cdata structures into being identical for usb ethernet drivers.
upl(4) and url(4) need more work.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/if_auereg.h
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/if_cuereg.h \
src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/if_udavreg.h \
src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/if_url.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_auereg.h
diff -u src/sys/dev/usb/if_auereg.h:1.28 src/sys/dev/usb/if_auereg.h:1.29
--- src/sys/dev/usb/if_auereg.h:1.28 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_auereg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_auereg.h,v 1.28 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_auereg.h,v 1.29 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -220,9 +220,7 @@ struct aue_cdata {
struct aue_chain aue_rx_chain[AUE_RX_LIST_CNT];
struct aue_intrpkt aue_ibuf;
int aue_tx_prod;
- int aue_tx_cons;
int aue_tx_cnt;
- int aue_rx_prod;
};
struct aue_softc {
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.101 src/sys/dev/usb/if_axe.c:1.102
--- src/sys/dev/usb/if_axe.c:1.101 Sun Jul 21 09:38:28 2019
+++ src/sys/dev/usb/if_axe.c Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.101 2019/07/21 09:38:28 mrg Exp $ */
+/* $NetBSD: if_axe.c,v 1.102 2019/07/21 10:27:56 mrg Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.101 2019/07/21 09:38:28 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.102 2019/07/21 10:27:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -144,9 +144,7 @@ struct axe_cdata {
struct axe_chain axe_tx_chain[AXE_TX_LIST_CNT];
struct axe_chain axe_rx_chain[AXE_RX_LIST_CNT];
int axe_tx_prod;
- int axe_tx_cons;
int axe_tx_cnt;
- int axe_rx_prod;
};
struct axe_softc {
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.52 src/sys/dev/usb/if_cdce.c:1.53
--- src/sys/dev/usb/if_cdce.c:1.52 Sat Jun 29 07:46:19 2019
+++ src/sys/dev/usb/if_cdce.c Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.52 2019/06/29 07:46:19 skrll Exp $ */
+/* $NetBSD: if_cdce.c,v 1.53 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.52 2019/06/29 07:46:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.53 2019/07/21 10:27:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -100,9 +100,7 @@ struct cdce_cdata {
struct cdce_chain cdce_rx_chain[CDCE_RX_LIST_CNT];
struct cdce_chain cdce_tx_chain[CDCE_TX_LIST_CNT];
int cdce_tx_prod;
- int cdce_tx_cons;
int cdce_tx_cnt;
- int cdce_rx_prod;
};
struct cdce_softc {
Index: src/sys/dev/usb/if_cuereg.h
diff -u src/sys/dev/usb/if_cuereg.h:1.21 src/sys/dev/usb/if_cuereg.h:1.22
--- src/sys/dev/usb/if_cuereg.h:1.21 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_cuereg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cuereg.h,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_cuereg.h,v 1.22 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -159,9 +159,7 @@ struct cue_cdata {
struct cue_chain cue_tx_chain[CUE_TX_LIST_CNT];
struct cue_chain cue_rx_chain[CUE_RX_LIST_CNT];
int cue_tx_prod;
- int cue_tx_cons;
int cue_tx_cnt;
- int cue_rx_prod;
};
struct cue_softc {
Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.21 src/sys/dev/usb/if_kuereg.h:1.22
--- src/sys/dev/usb/if_kuereg.h:1.21 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_kuereg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kuereg.h,v 1.21 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_kuereg.h,v 1.22 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -154,9 +154,7 @@ struct kue_cdata {
struct kue_chain kue_tx_chain[KUE_TX_LIST_CNT];
struct kue_chain kue_rx_chain[KUE_RX_LIST_CNT];
int kue_tx_prod;
- int kue_tx_cons;
int kue_tx_cnt;
- int kue_rx_prod;
};
struct kue_softc {
Index: src/sys/dev/usb/if_udavreg.h
diff -u src/sys/dev/usb/if_udavreg.h:1.12 src/sys/dev/usb/if_udavreg.h:1.13
--- src/sys/dev/usb/if_udavreg.h:1.12 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_udavreg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.12 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.13 2019/07/21 10:27:56 mrg Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -160,9 +160,7 @@ struct udav_cdata {
struct udav_intrpkg udav_ibuf;
#endif
int udav_tx_prod;
- int udav_tx_cons;
int udav_tx_cnt;
- int udav_rx_prod;
};
struct udav_softc {
Index: src/sys/dev/usb/if_urlreg.h
diff -u src/sys/dev/usb/if_urlreg.h:1.12 src/sys/dev/usb/if_urlreg.h:1.13
--- src/sys/dev/usb/if_urlreg.h:1.12 Tue Mar 5 08:25:03 2019
+++ src/sys/dev/usb/if_urlreg.h Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.12 2019/03/05 08:25:03 msaitoh Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.13 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <n...@nabechan.org>. All rights reserved.
@@ -135,7 +135,6 @@ struct url_chain {
struct usbd_xfer *url_xfer;
char *url_buf;
struct mbuf *url_mbuf;
- int url_idx;
};
struct url_cdata {
@@ -146,9 +145,7 @@ struct url_cdata {
struct url_intrpkg url_ibuf;
#endif
int url_tx_prod;
- int url_tx_cons;
int url_tx_cnt;
- int url_rx_prod;
};
struct url_softc {
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.63 src/sys/dev/usb/if_upl.c:1.64
--- src/sys/dev/usb/if_upl.c:1.63 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/if_upl.c Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.63 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: if_upl.c,v 1.64 2019/07/21 10:27:56 mrg 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.63 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.64 2019/07/21 10:27:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -117,16 +117,13 @@ struct upl_chain {
struct usbd_xfer *upl_xfer;
char *upl_buf;
struct mbuf *upl_mbuf;
- int upl_idx;
};
struct upl_cdata {
struct upl_chain upl_tx_chain[UPL_TX_LIST_CNT];
struct upl_chain upl_rx_chain[UPL_RX_LIST_CNT];
int upl_tx_prod;
- int upl_tx_cons;
int upl_tx_cnt;
- int upl_rx_prod;
};
struct upl_softc {
@@ -437,7 +434,6 @@ upl_rx_list_init(struct upl_softc *sc)
for (i = 0; i < UPL_RX_LIST_CNT; i++) {
c = &cd->upl_rx_chain[i];
c->upl_sc = sc;
- c->upl_idx = i;
if (upl_newbuf(sc, c, NULL) == ENOBUFS)
return ENOBUFS;
if (c->upl_xfer == NULL) {
@@ -465,7 +461,6 @@ upl_tx_list_init(struct upl_softc *sc)
for (i = 0; i < UPL_TX_LIST_CNT; i++) {
c = &cd->upl_tx_chain[i];
c->upl_sc = sc;
- c->upl_idx = i;
c->upl_mbuf = NULL;
if (c->upl_xfer == NULL) {
int error = usbd_create_xfer(sc->sc_ep[UPL_ENDPT_TX],
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.65 src/sys/dev/usb/if_url.c:1.66
--- src/sys/dev/usb/if_url.c:1.65 Tue May 28 07:41:50 2019
+++ src/sys/dev/usb/if_url.c Sun Jul 21 10:27:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.65 2019/05/28 07:41:50 msaitoh Exp $ */
+/* $NetBSD: if_url.c,v 1.66 2019/07/21 10:27:56 mrg Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.65 2019/05/28 07:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.66 2019/07/21 10:27:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -822,7 +822,6 @@ url_rx_list_init(struct url_softc *sc)
for (i = 0; i < URL_RX_LIST_CNT; i++) {
c = &cd->url_rx_chain[i];
c->url_sc = sc;
- c->url_idx = i;
if (url_newbuf(sc, c, NULL) == ENOBUFS)
return ENOBUFS;
if (c->url_xfer == NULL) {
@@ -850,7 +849,6 @@ url_tx_list_init(struct url_softc *sc)
for (i = 0; i < URL_TX_LIST_CNT; i++) {
c = &cd->url_tx_chain[i];
c->url_sc = sc;
- c->url_idx = i;
c->url_mbuf = NULL;
if (c->url_xfer == NULL) {
int error = usbd_create_xfer(sc->sc_pipe_tx, URL_BUFSZ,
