Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nick-nhusb]: src/sys The grand renaming of structure members.
details: https://anonhg.NetBSD.org/src/rev/525b8b96fa78
branches: nick-nhusb
changeset: 804205:525b8b96fa78
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Dec 03 12:52:04 2014 +0000
description:
The grand renaming of structure members.
No functional change.
diffstat:
sys/arch/amiga/dev/slhci_zbus.c | 6 +-
sys/arch/arm/allwinner/awin_otg.c | 6 +-
sys/arch/arm/allwinner/awin_usb.c | 12 +-
sys/arch/arm/at91/at91ohci.c | 10 +-
sys/arch/arm/broadcom/bcm2835_dwctwo.c | 6 +-
sys/arch/arm/broadcom/bcm53xx_usb.c | 12 +-
sys/arch/arm/ep93xx/epohci.c | 8 +-
sys/arch/arm/gemini/obio_ehci.c | 10 +-
sys/arch/arm/imx/imxusb.c | 10 +-
sys/arch/arm/omap/obio_ohci.c | 10 +-
sys/arch/arm/omap/omap3_ehci.c | 10 +-
sys/arch/arm/omap/omapl1x_ohci.c | 6 +-
sys/arch/arm/omap/tiotg.c | 6 +-
sys/arch/arm/s3c2xx0/ohci_s3c24x0.c | 8 +-
sys/arch/arm/samsung/exynos_usb.c | 14 +-
sys/arch/arm/xscale/pxa2x0_ohci.c | 10 +-
sys/arch/hpcarm/dev/nbp_slhci.c | 6 +-
sys/arch/hpcmips/dev/plumohci.c | 8 +-
sys/arch/i386/pci/gcscehci.c | 10 +-
sys/arch/mips/adm5120/dev/ahci.c | 194 +++++-----
sys/arch/mips/alchemy/dev/ohci_aubus.c | 8 +-
sys/arch/mips/atheros/dev/ehci_arbus.c | 10 +-
sys/arch/mips/atheros/dev/ohci_arbus.c | 8 +-
sys/arch/mips/ralink/ralink_ehci.c | 10 +-
sys/arch/mips/ralink/ralink_ohci.c | 8 +-
sys/arch/mips/rmi/rmixl_ehci.c | 10 +-
sys/arch/mips/rmi/rmixl_ohci.c | 8 +-
sys/arch/playstation2/dev/ohci_sbus.c | 8 +-
sys/arch/powerpc/booke/dev/pq3ehci.c | 10 +-
sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c | 6 +-
sys/arch/x68k/dev/slhci_intio.c | 6 +-
sys/dev/cardbus/ehci_cardbus.c | 8 +-
sys/dev/cardbus/ohci_cardbus.c | 8 +-
sys/dev/cardbus/uhci_cardbus.c | 16 +-
sys/dev/ic/sl811hs.c | 286 +++++++-------
sys/dev/isa/slhci_isa.c | 6 +-
sys/dev/marvell/ehci_mv.c | 10 +-
sys/dev/pci/ehci_pci.c | 14 +-
sys/dev/pci/ohci_pci.c | 8 +-
sys/dev/pci/uhci_pci.c | 16 +-
sys/dev/pci/xhci_pci.c | 10 +-
sys/dev/pcmcia/slhci_pcmcia.c | 6 +-
sys/dev/usb/aubtfwl.c | 6 +-
sys/dev/usb/auvitek_audio.c | 20 +-
sys/dev/usb/auvitek_video.c | 6 +-
sys/dev/usb/ehci.c | 584 +++++++++++++++---------------
sys/dev/usb/if_atu.c | 6 +-
sys/dev/usb/if_axe.c | 10 +-
sys/dev/usb/if_axen.c | 8 +-
sys/dev/usb/if_smsc.c | 6 +-
sys/dev/usb/motg.c | 356 +++++++++---------
sys/dev/usb/ohci.c | 439 +++++++++++-----------
sys/dev/usb/pseye.c | 6 +-
sys/dev/usb/u3g.c | 6 +-
sys/dev/usb/uaudio.c | 6 +-
sys/dev/usb/uberry.c | 6 +-
sys/dev/usb/uhci.c | 462 ++++++++++++------------
sys/dev/usb/uhub.c | 138 +++---
sys/dev/usb/uipad.c | 6 +-
sys/dev/usb/ukyopon.c | 8 +-
sys/dev/usb/usb.c | 134 +++---
sys/dev/usb/usb_mem.c | 80 ++--
sys/dev/usb/usb_mem.h | 4 +-
sys/dev/usb/usb_subr.c | 482 ++++++++++++------------
sys/dev/usb/usbdi.c | 566 +++++++++++++++---------------
sys/dev/usb/usbdivar.h | 212 +++++-----
sys/dev/usb/uvideo.c | 6 +-
sys/dev/usb/xhci.c | 356 +++++++++---------
sys/external/bsd/dwc2/dwc2.c | 250 ++++++------
sys/external/bsd/dwc2/dwc2var.h | 12 +-
sys/rump/dev/lib/libugenhc/ugenhc.c | 126 +++---
71 files changed, 2575 insertions(+), 2574 deletions(-)
diffs (truncated from 14335 to 300 lines):
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/amiga/dev/slhci_zbus.c
--- a/sys/arch/amiga/dev/slhci_zbus.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/amiga/dev/slhci_zbus.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_zbus.c,v 1.1 2013/04/27 22:27:33 rkujawa Exp $ */
+/* $NetBSD: slhci_zbus.c,v 1.1.16.1 2014/12/03 12:52:04 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_zbus.c,v 1.1 2013/04/27 22:27:33 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_zbus.c,v 1.1.16.1 2014/12/03 12:52:04 skrll Exp $");
/*
* Thylacine driver.
@@ -100,7 +100,7 @@
zsc = device_private(self);
sc = &zsc->sc_sc;
sc->sc_dev = self;
- sc->sc_bus.hci_private = sc;
+ sc->sc_bus.ub_hcpriv = sc;
zsc->sc_bst.base = (bus_addr_t)zap->va;
zsc->sc_bst.absm = &amiga_bus_stride_1;
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/allwinner/awin_otg.c
--- a/sys/arch/arm/allwinner/awin_otg.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_otg.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_otg.c,v 1.5 2014/10/16 00:02:47 jmcneill Exp $ */
+/* $NetBSD: awin_otg.c,v 1.5.4.1 2014/12/03 12:52:04 skrll Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_otg.c,v 1.5 2014/10/16 00:02:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_otg.c,v 1.5.4.1 2014/12/03 12:52:04 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -125,7 +125,7 @@
}
sc->sc_motg.sc_dev = self;
- sc->sc_motg.sc_bus.dmatag = aio->aio_dmat;
+ sc->sc_motg.sc_bus.ub_dmatag = aio->aio_dmat;
sc->sc_motg.sc_iot = aio->aio_core_bst;
bus_space_subregion(sc->sc_motg.sc_iot, aio->aio_core_bsh,
loc->loc_offset, loc->loc_size, &sc->sc_motg.sc_ioh);
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/allwinner/awin_usb.c
--- a/sys/arch/arm/allwinner/awin_usb.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_usb.c Wed Dec 03 12:52:04 2014 +0000
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.17.2.1 2014/12/03 11:24:43 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.17.2.2 2014/12/03 12:52:04 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -130,8 +130,8 @@
sc->iot = usbaa->usbaa_bst;
sc->ioh = usbaa->usbaa_bsh;
sc->sc_size = usbaa->usbaa_size;
- sc->sc_bus.dmatag = usbaa->usbaa_dmat;
- sc->sc_bus.hci_private = sc;
+ sc->sc_bus.ub_dmatag = usbaa->usbaa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
//sc->sc_id_vendor = PCI_VENDOR_ALLWINNER;
strlcpy(sc->sc_vendor, "Allwinner", sizeof(sc->sc_vendor));
@@ -203,9 +203,9 @@
sc->iot = usbaa->usbaa_bst;
sc->ioh = usbaa->usbaa_bsh;
sc->sc_size = usbaa->usbaa_size;
- sc->sc_bus.dmatag = usbaa->usbaa_dmat;
- sc->sc_bus.hci_private = sc;
- sc->sc_bus.usbrev = USBREV_2_0;
+ sc->sc_bus.ub_dmatag = usbaa->usbaa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
+ sc->sc_bus.ub_revision = USBREV_2_0;
sc->sc_ncomp = 0;
if (usbsc->usbsc_ohci_dev != NULL) {
sc->sc_comps[sc->sc_ncomp++] = usbsc->usbsc_ohci_dev;
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/at91/at91ohci.c
--- a/sys/arch/arm/at91/at91ohci.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/at91/at91ohci.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91ohci.c,v 1.5.28.1 2014/12/03 11:24:43 skrll Exp $ */
-/* $NetBSD: at91ohci.c,v 1.5.28.1 2014/12/03 11:24:43 skrll Exp $ */
+/* $Id: at91ohci.c,v 1.5.28.2 2014/12/03 12:52:05 skrll Exp $ */
+/* $NetBSD: at91ohci.c,v 1.5.28.2 2014/12/03 12:52:05 skrll Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.5.28.1 2014/12/03 11:24:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.5.28.2 2014/12/03 12:52:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,8 +94,8 @@
struct at91bus_attach_args *sa = aux;
sc->sc.sc_dev = self;
- sc->sc.sc_bus.hci_private = sc;
- sc->sc.sc_bus.dmatag = sa->sa_dmat;
+ sc->sc.sc_bus.ub_hcpriv = sc;
+ sc->sc.sc_bus.ub_dmatag = sa->sa_dmat;
sc->sc.iot = sa->sa_iot;
sc->sc_pid = sa->sa_pid;
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/broadcom/bcm2835_dwctwo.c
--- a/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $ */
+/* $NetBSD: bcm2835_dwctwo.c,v 1.2.2.1 2014/12/03 12:52:05 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.2.2.1 2014/12/03 12:52:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,7 +116,7 @@
sc->sc_dwc2.sc_dev = self;
sc->sc_dwc2.sc_iot = aaa->aaa_iot;
- sc->sc_dwc2.sc_bus.dmatag = aaa->aaa_dmat;
+ sc->sc_dwc2.sc_bus.ub_dmatag = aaa->aaa_dmat;
sc->sc_dwc2.sc_params = &bcmdwc2_params;
error = bus_space_map(aaa->aaa_iot, aaa->aaa_addr, aaa->aaa_size, 0,
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/broadcom/bcm53xx_usb.c
--- a/sys/arch/arm/broadcom/bcm53xx_usb.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_usb.c Wed Dec 03 12:52:04 2014 +0000
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.6 2014/06/24 05:07:31 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_usb.c,v 1.6.4.1 2014/12/03 12:52:05 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -113,8 +113,8 @@
sc->iot = usbaa->usbaa_bst;
sc->ioh = usbaa->usbaa_bsh;
sc->sc_size = usbaa->usbaa_size;
- sc->sc_bus.dmatag = usbaa->usbaa_dmat;
- sc->sc_bus.hci_private = sc;
+ sc->sc_bus.ub_dmatag = usbaa->usbaa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
sc->sc_id_vendor = PCI_VENDOR_BROADCOM;
strlcpy(sc->sc_vendor, "Broadcom", sizeof(sc->sc_vendor));
@@ -168,9 +168,9 @@
sc->iot = usbaa->usbaa_bst;
sc->ioh = usbaa->usbaa_bsh;
sc->sc_size = usbaa->usbaa_size;
- sc->sc_bus.dmatag = usbaa->usbaa_dmat;
- sc->sc_bus.hci_private = sc;
- sc->sc_bus.usbrev = USBREV_2_0;
+ sc->sc_bus.ub_dmatag = usbaa->usbaa_dmat;
+ sc->sc_bus.ub_hcpriv = sc;
+ sc->sc_bus.ub_revision = USBREV_2_0;
sc->sc_ncomp = 0;
if (usbsc->usbsc_ohci_dev != NULL) {
sc->sc_comps[sc->sc_ncomp++] = usbsc->usbsc_ohci_dev;
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/ep93xx/epohci.c
--- a/sys/arch/arm/ep93xx/epohci.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/ep93xx/epohci.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: epohci.c,v 1.7.14.1 2014/12/03 11:24:43 skrll Exp $ */
+/* $NetBSD: epohci.c,v 1.7.14.2 2014/12/03 12:52:05 skrll Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.7.14.1 2014/12/03 11:24:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.7.14.2 2014/12/03 12:52:05 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,10 +91,10 @@
bus_space_handle_t syscon_ioh;
sc->sc.sc_dev = self;
- sc->sc.sc_bus.hci_private = sc;
+ sc->sc.sc_bus.ub_hcpriv = sc;
sc->sc.iot = sa->sa_iot;
- sc->sc.sc_bus.dmatag = sa->sa_dmat;
+ sc->sc.sc_bus.ub_dmatag = sa->sa_dmat;
sc->sc_intr = sa->sa_intr;
/* Map I/O space */
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/gemini/obio_ehci.c
--- a/sys/arch/arm/gemini/obio_ehci.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/gemini/obio_ehci.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_ehci.c,v 1.3 2012/07/20 02:14:01 matt Exp $ */
+/* $NetBSD: obio_ehci.c,v 1.3.16.1 2014/12/03 12:52:05 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ehci.c,v 1.3 2012/07/20 02:14:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ehci.c,v 1.3.16.1 2014/12/03 12:52:05 skrll Exp $");
#include "locators.h"
@@ -104,7 +104,7 @@
usbd_status r;
sc->sc_dev = self;
- sc->sc_bus.hci_private = sc;
+ sc->sc_bus.ub_hcpriv = sc;
sc->iot = obio->obio_iot;
aprint_naive(": EHCI USB controller\n");
@@ -117,7 +117,7 @@
return;
}
- sc->sc_bus.dmatag = obio->obio_dmat;
+ sc->sc_bus.ub_dmatag = obio->obio_dmat;
/* Disable interrupts, so we don't get any spurious ones. */
sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
@@ -131,7 +131,7 @@
ehci_obio_intr, sc);
}
- sc->sc_bus.usbrev = USBREV_2_0;
+ sc->sc_bus.ub_revision = USBREV_2_0;
/* Figure out vendor for root hub descriptor. */
sc->sc_id_vendor = PCI_VENDOR_FARADAY;
diff -r 3fd5d4ebd480 -r 525b8b96fa78 sys/arch/arm/imx/imxusb.c
--- a/sys/arch/arm/imx/imxusb.c Wed Dec 03 11:25:51 2014 +0000
+++ b/sys/arch/arm/imx/imxusb.c Wed Dec 03 12:52:04 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imxusb.c,v 1.7.2.1 2014/12/03 11:24:43 skrll Exp $ */
+/* $NetBSD: imxusb.c,v 1.7.2.2 2014/12/03 12:52:05 skrll Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi and Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.7.2.1 2014/12/03 11:24:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.7.2.2 2014/12/03 12:52:05 skrll Exp $");
#include "opt_imx.h"
@@ -96,7 +96,7 @@
iot = sc->sc_iot = sc->sc_hsc.iot = aa->aa_iot;
sc->sc_unit = aa->aa_unit;
sc->sc_usbc = usbc;
- hsc->sc_bus.hci_private = sc;
+ hsc->sc_bus.ub_hcpriv = sc;
hsc->sc_flags |= EHCIF_ETTF;
aprint_naive("\n");
@@ -145,7 +145,7 @@
}
aprint_normal("\n");
- sc->sc_hsc.sc_bus.dmatag = aa->aa_dmat;
+ sc->sc_hsc.sc_bus.ub_dmatag = aa->aa_dmat;
sc->sc_hsc.sc_offs = bus_space_read_1(iot, sc->sc_hsc.ioh,
EHCI_CAPLENGTH);
@@ -179,7 +179,7 @@
if (sc->sc_iftype == IMXUSBC_IF_ULPI) {
#if 0
Home |
Main Index |
Thread Index |
Old Index