Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7-nhusb]: src/sys First pass at netbsd-7 updated with USB code fr...



details:   https://anonhg.NetBSD.org/src/rev/420b783cf31b
branches:  netbsd-7-nhusb
changeset: 801020:420b783cf31b
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Sep 06 20:33:05 2016 +0000

description:
First pass at netbsd-7 updated with USB code from HEAD

diffstat:

 sys/arch/amd64/conf/GENERIC                                    |     9 +-
 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/files.imx23                                   |     6 +-
 sys/arch/arm/imx/imxusb.c                                      |    34 +-
 sys/arch/arm/imx/imxusbreg.h                                   |    10 +-
 sys/arch/arm/omap/obio_ohci.c                                  |    10 +-
 sys/arch/arm/omap/omap3_ehci.c                                 |    10 +-
 sys/arch/arm/omap/omapl1x_ohci.c                               |    16 +-
 sys/arch/arm/omap/tiotg.c                                      |    33 +-
 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/arm/zynq/zynq_usb.c                                   |    12 +-
 sys/arch/hpcarm/dev/nbp_slhci.c                                |     6 +-
 sys/arch/hpcmips/dev/plumohci.c                                |     8 +-
 sys/arch/i386/conf/GENERIC                                     |     9 +-
 sys/arch/i386/pci/gcscehci.c                                   |    10 +-
 sys/arch/mips/adm5120/dev/ahci.c                               |    14 +-
 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/conf/files                                                 |    21 +-
 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                                           |  1356 +-
 sys/dev/ic/sl811hsvar.h                                        |     4 +-
 sys/dev/isa/slhci_isa.c                                        |     6 +-
 sys/dev/marvell/ehci_mv.c                                      |    10 +-
 sys/dev/pci/ehci_pci.c                                         |    16 +-
 sys/dev/pci/ohci_pci.c                                         |     8 +-
 sys/dev/pci/uhci_pci.c                                         |    16 +-
 sys/dev/pci/xhci_pci.c                                         |    94 +-
 sys/dev/pcmcia/slhci_pcmcia.c                                  |     6 +-
 sys/dev/usb/Makefile.usbdevs                                   |    24 +-
 sys/dev/usb/TODO.usbmp                                         |    38 +-
 sys/dev/usb/aubtfwl.c                                          |    61 +-
 sys/dev/usb/auvitek.c                                          |    40 +-
 sys/dev/usb/auvitek_audio.c                                    |    64 +-
 sys/dev/usb/auvitek_dtv.c                                      |    64 +-
 sys/dev/usb/auvitek_video.c                                    |    41 +-
 sys/dev/usb/auvitekvar.h                                       |    16 +-
 sys/dev/usb/ehci.c                                             |  4436 +++++----
 sys/dev/usb/ehcireg.h                                          |   260 +-
 sys/dev/usb/ehcivar.h                                          |   116 +-
 sys/dev/usb/emdtv.c                                            |    13 +-
 sys/dev/usb/emdtv_dtv.c                                        |    72 +-
 sys/dev/usb/emdtv_ir.c                                         |     8 +-
 sys/dev/usb/emdtvvar.h                                         |    12 +-
 sys/dev/usb/ezload.c                                           |    24 +-
 sys/dev/usb/ezload.h                                           |    14 +-
 sys/dev/usb/files.usb                                          |    96 +-
 sys/dev/usb/hid.c                                              |    87 +-
 sys/dev/usb/hid.h                                              |    18 +-
 sys/dev/usb/if_athn_usb.c                                      |   209 +-
 sys/dev/usb/if_athn_usb.h                                      |    20 +-
 sys/dev/usb/if_atu.c                                           |   273 +-
 sys/dev/usb/if_atureg.h                                        |    80 +-
 sys/dev/usb/if_aue.c                                           |   243 +-
 sys/dev/usb/if_auereg.h                                        |    34 +-
 sys/dev/usb/if_axe.c                                           |   178 +-
 sys/dev/usb/if_axen.c                                          |   197 +-
 sys/dev/usb/if_axenreg.h                                       |    22 +-
 sys/dev/usb/if_axereg.h                                        |    10 +-
 sys/dev/usb/if_cdce.c                                          |   162 +-
 sys/dev/usb/if_cdcereg.h                                       |    18 +-
 sys/dev/usb/if_cue.c                                           |   234 +-
 sys/dev/usb/if_cuereg.h                                        |    22 +-
 sys/dev/usb/if_kue.c                                           |   219 +-
 sys/dev/usb/if_kuereg.h                                        |    10 +-
 sys/dev/usb/if_otus.c                                          |   125 +-
 sys/dev/usb/if_otusvar.h                                       |    31 +-
 sys/dev/usb/if_rum.c                                           |   161 +-
 sys/dev/usb/if_rumreg.h                                        |     6 +-
 sys/dev/usb/if_rumvar.h                                        |    16 +-
 sys/dev/usb/if_run.c                                           |   267 +-
 sys/dev/usb/if_runvar.h                                        |    26 +-
 sys/dev/usb/if_smsc.c                                          |   193 +-
 sys/dev/usb/if_smscreg.h                                       |    27 +-
 sys/dev/usb/if_smscvar.h                                       |    10 +-
 sys/dev/usb/if_udav.c                                          |   275 +-
 sys/dev/usb/if_udavreg.h                                       |    16 +-
 sys/dev/usb/if_upgt.c                                          |   104 +-
 sys/dev/usb/if_upgtvar.h                                       |    12 +-
 sys/dev/usb/if_upl.c                                           |   221 +-
 sys/dev/usb/if_ural.c                                          |   196 +-
 sys/dev/usb/if_uralreg.h                                       |     6 +-
 sys/dev/usb/if_uralvar.h                                       |    16 +-
 sys/dev/usb/if_url.c                                           |   243 +-
 sys/dev/usb/if_urlreg.h                                        |    16 +-
 sys/dev/usb/if_urndis.c                                        |   204 +-
 sys/dev/usb/if_urndisreg.h                                     |    14 +-
 sys/dev/usb/if_urtw.c                                          |   375 +-
 sys/dev/usb/if_urtwn.c                                         |   382 +-
 sys/dev/usb/if_urtwnreg.h                                      |     4 +-
 sys/dev/usb/if_urtwnvar.h                                      |    20 +-
 sys/dev/usb/if_urtwreg.h                                       |    22 +-
 sys/dev/usb/if_zyd.c                                           |   168 +-
 sys/dev/usb/if_zydreg.h                                        |    21 +-
 sys/dev/usb/irmce.c                                            |   131 +-
 sys/dev/usb/moscom.c                                           |   120 +-
 sys/dev/usb/motg.c                                             |  1332 +-
 sys/dev/usb/motgvar.h                                          |    22 +-
 sys/dev/usb/ohci.c                                             |  3141 +++---
 sys/dev/usb/ohcireg.h                                          |    23 +-
 sys/dev/usb/ohcivar.h                                          |    69 +-
 sys/dev/usb/pseye.c                                            |    78 +-
 sys/dev/usb/slurm.c                                            |    32 +-
 sys/dev/usb/stuirda.c                                          |   108 +-
 sys/dev/usb/u3g.c                                              |   235 +-
 sys/dev/usb/uark.c                                             |    81 +-
 sys/dev/usb/uatp.c                                             |   127 +-
 sys/dev/usb/uaudio.c                                           |   261 +-
 sys/dev/usb/uberry.c                                           |    15 +-
 sys/dev/usb/ubsa.c                                             |    80 +-
 sys/dev/usb/ubsa_common.c                                      |    28 +-
 sys/dev/usb/ubsavar.h                                          |    16 +-
 sys/dev/usb/ubt.c                                              |   419 +-
 sys/dev/usb/uchcom.c                                           |    74 +-
 sys/dev/usb/ucom.c                                             |   716 +-
 sys/dev/usb/ucomvar.h                                          |    59 +-
 sys/dev/usb/ucycom.c                                           |   105 +-
 sys/dev/usb/udl.c                                              |    45 +-
 sys/dev/usb/udl.h                                              |    10 +-
 sys/dev/usb/udsbr.c                                            |    66 +-
 sys/dev/usb/udsir.c                                            |   128 +-
 sys/dev/usb/uep.c                                              |    36 +-
 sys/dev/usb/uftdi.c                                            |   156 +-
 sys/dev/usb/uftdireg.h                                         |     4 +-
 sys/dev/usb/ugen.c                                             |   630 +-
 sys/dev/usb/ugensa.c                                           |    97 +-
 sys/dev/usb/uhci.c                                             |  3330 +++---
 sys/dev/usb/uhcireg.h                                          |   199 +-
 sys/dev/usb/uhcivar.h                                          |    77 +-
 sys/dev/usb/uhid.c                                             |    64 +-
 sys/dev/usb/uhidev.c                                           |   157 +-
 sys/dev/usb/uhidev.h                                           |    20 +-
 sys/dev/usb/uhmodem.c                                          |   173 +-
 sys/dev/usb/uhso.c                                             |   252 +-
 sys/dev/usb/uhub.c                                             |   653 +-
 sys/dev/usb/uipad.c                                            |    13 +-
 sys/dev/usb/uipaq.c                                            |   109 +-
 sys/dev/usb/uirda.c                                            |   263 +-
 sys/dev/usb/uirdavar.h                                         |    41 +-
 sys/dev/usb/ukbd.c                                             |    89 +-
 sys/dev/usb/ukbdmap.c                                          |     6 +-
 sys/dev/usb/ukyopon.c                                          |    65 +-
 sys/dev/usb/ukyopon.h                                          |     4 +-
 sys/dev/usb/ulpt.c                                             |   184 +-
 sys/dev/usb/umass.c                                            |   669 +-
 sys/dev/usb/umass_isdata.c                                     |    94 +-
 sys/dev/usb/umass_isdata.h                                     |     4 +-
 sys/dev/usb/umass_quirks.c                                     |    58 +-
 sys/dev/usb/umass_quirks.h                                     |    12 +-
 sys/dev/usb/umass_scsipi.c                                     |   117 +-
 sys/dev/usb/umass_scsipi.h                                     |     6 +-
 sys/dev/usb/umassvar.h                                         |    80 +-
 sys/dev/usb/umcs.c                                             |    98 +-
 sys/dev/usb/umct.c                                             |   143 +-
 sys/dev/usb/umidi.c                                            |   252 +-
 sys/dev/usb/umidi_quirks.c                                     |     7 +-
 sys/dev/usb/umidi_quirks.h                                     |     6 +-
 sys/dev/usb/umodem.c                                           |    71 +-
 sys/dev/usb/umodem_common.c                                    |    92 +-
 sys/dev/usb/umodemvar.h                                        |    18 +-
 sys/dev/usb/ums.c                                              |    79 +-
 sys/dev/usb/uplcom.c                                           |   183 +-
 sys/dev/usb/urio.c                                             |   130 +-
 sys/dev/usb/urio.h                                             |     4 +-
 sys/dev/usb/usb.c                                              |   392 +-
 sys/dev/usb/usb.h                                              |   385 +-
 sys/dev/usb/usb_mem.c                                          |   328 +-
 sys/dev/usb/usb_mem.h                                          |    50 +-
 sys/dev/usb/usb_quirks.c                                       |    28 +-
 sys/dev/usb/usb_quirks.h                                       |     4 +-
 sys/dev/usb/usb_subr.c                                         |  1231 +-
 sys/dev/usb/usbdevices.config                                  |     6 +-
 sys/dev/usb/usbdevs                                            |   116 +-
 sys/dev/usb/usbdi.c                                            |  1316 +-
 sys/dev/usb/usbdi.h                                            |   234 +-
 sys/dev/usb/usbdi_util.c                                       |   349 +-
 sys/dev/usb/usbdi_util.h                                       |    93 +-
 sys/dev/usb/usbdivar.h                                         |   381 +-
 sys/dev/usb/usbhid.h                                           |     8 +-
 sys/dev/usb/usbroothub_subr.c                                  |    66 -
 sys/dev/usb/usbroothub_subr.h                                  |     4 -
 sys/dev/usb/uscanner.c                                         |   177 +-
 sys/dev/usb/uslsa.c                                            |    87 +-
 sys/dev/usb/usscanner.c                                        |   220 +-
 sys/dev/usb/ustir.c                                            |   184 +-
 sys/dev/usb/uthum.c                                            |    44 +-
 sys/dev/usb/utoppy.c                                           |   349 +-
 sys/dev/usb/uts.c                                              |    17 +-
 sys/dev/usb/uvideo.c                                           |   149 +-
 sys/dev/usb/uvisor.c                                           |   111 +-
 sys/dev/usb/uvscom.c                                           |   144 +-
 sys/dev/usb/uyap.c                                             |    27 +-
 sys/dev/usb/uyap_firmware.h                                    |     4 +-
 sys/dev/usb/uyurex.c                                           |    28 +-
 sys/dev/usb/x1input_rdesc.h                                    |    12 +-
 sys/dev/usb/xhci.c                                             |  3631 +++++--
 sys/dev/usb/xhcireg.h                                          |   307 +-
 sys/dev/usb/xhcivar.h                                          |    28 +-
 sys/dev/usb/xinput_rdesc.h                                     |    10 +-
 sys/external/bsd/common/conf/files.linux                       |     7 +
 sys/external/bsd/common/include/linux/kernel.h                 |     4 +-
 sys/external/bsd/common/linux/linux_work.c                     |   858 +
 sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c      |     2 +-
 sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c |     2 +-
 sys/external/bsd/drm2/drm/files.drmkms                         |     8 +-
 sys/external/bsd/drm2/i915drm/files.i915drmkms                 |     5 +-
 sys/external/bsd/drm2/include/linux/err.h                      |    87 -
 sys/external/bsd/drm2/include/linux/workqueue.h                |   120 -
 sys/external/bsd/drm2/linux/files.drmkms_linux                 |     3 +-
 sys/external/bsd/drm2/linux/linux_work.c                       |   857 -
 sys/external/bsd/dwc2/conf/files.dwc2                          |     9 +-
 sys/external/bsd/dwc2/dist/dwc2_core.c                         |   981 +-
 sys/external/bsd/dwc2/dist/dwc2_core.h                         |   483 +-
 sys/external/bsd/dwc2/dist/dwc2_coreintr.c                     |   129 +-
 sys/external/bsd/dwc2/dist/dwc2_hcd.c                          |   339 +-
 sys/external/bsd/dwc2/dist/dwc2_hcd.h                          |    74 +-
 sys/external/bsd/dwc2/dist/dwc2_hcdddma.c                      |   195 +-
 sys/external/bsd/dwc2/dist/dwc2_hcdintr.c                      |   231 +-
 sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c                     |    82 +-
 sys/external/bsd/dwc2/dist/dwc2_hw.h                           |    21 +-
 sys/external/bsd/dwc2/dwc2.c                                   |  1042 +-
 sys/external/bsd/dwc2/dwc2.h                                   |   103 +-
 sys/external/bsd/dwc2/dwc2var.h                                |    26 +-
 sys/external/bsd/dwc2/dwctwo2netbsd                            |     4 +-
 sys/rump/dev/lib/libugenhc/ugenhc.c                            |   484 +-
 sys/rump/dev/lib/libusb/USB.ioconf                             |    18 +-
 sys/rump/dev/lib/libusb/opt/opt_usb.h                          |     2 -
 sys/rump/dev/lib/libusb/opt/opt_usbverbose.h                   |     3 -
 sys/rump/dev/lib/libusb/usb_at_ugenhc.c                        |    22 -
 sys/sys/mbuf.h                                                 |     3 +-
 249 files changed, 24581 insertions(+), 20965 deletions(-)

diffs (truncated from 84735 to 300 lines):

diff -r e1e40fae7503 -r 420b783cf31b sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Sep 06 20:33:05 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.7 2015/05/15 03:44:17 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.7.4.1 2016/09/06 20:33:05 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.392.2.7 $"
+#ident                 "GENERIC-$Revision: 1.392.2.7.4.1 $"
 
 maxusers       64              # estimated number of users
 
@@ -830,8 +830,7 @@
 # USB Controller and Devices
 
 # PCI USB controllers
-# xhci*        at pci? dev ? function ?        # eXtensible Host Controller
-                                       # xhci is at best experimental
+xhci*  at pci? dev ? function ?        # eXtensible Host Controller
 ehci*  at pci? dev ? function ?        # Enhanced Host Controller
 ohci*  at pci? dev ? function ?        # Open Host Controller
 uhci*  at pci? dev ? function ?        # Universal Host Controller (Intel)
@@ -848,7 +847,7 @@
 slhci* at pcmcia? function ?           # ScanLogic SL811HS
 
 # USB bus support
-# usb* at xhci?
+usb*   at xhci?
 usb*   at ehci?
 usb*   at ohci?
 usb*   at uhci?
diff -r e1e40fae7503 -r 420b783cf31b sys/arch/arm/allwinner/awin_otg.c
--- a/sys/arch/arm/allwinner/awin_otg.c Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/allwinner/awin_otg.c Tue Sep 06 20:33:05 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_otg.c,v 1.5.2.2 2014/11/09 14:42:33 martin Exp $ */
+/* $NetBSD: awin_otg.c,v 1.5.2.2.4.1 2016/09/06 20:33:05 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.2.2 2014/11/09 14:42:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_otg.c,v 1.5.2.2.4.1 2016/09/06 20:33:05 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 e1e40fae7503 -r 420b783cf31b sys/arch/arm/allwinner/awin_usb.c
--- a/sys/arch/arm/allwinner/awin_usb.c Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/allwinner/awin_usb.c Tue Sep 06 20:33:05 2016 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12.2.3 2015/03/15 22:59:39 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_usb.c,v 1.12.2.3.4.1 2016/09/06 20:33:05 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 e1e40fae7503 -r 420b783cf31b sys/arch/arm/at91/at91ohci.c
--- a/sys/arch/arm/at91/at91ohci.c      Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/at91/at91ohci.c      Tue Sep 06 20:33:05 2016 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91ohci.c,v 1.5 2011/11/04 17:13:15 aymeric Exp $ */
-/*     $NetBSD: at91ohci.c,v 1.5 2011/11/04 17:13:15 aymeric Exp $     */
+/*     $Id: at91ohci.c,v 1.5.32.1 2016/09/06 20:33:05 skrll Exp $      */
+/*     $NetBSD: at91ohci.c,v 1.5.32.1 2016/09/06 20:33: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 2011/11/04 17:13:15 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v 1.5.32.1 2016/09/06 20:33: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 e1e40fae7503 -r 420b783cf31b sys/arch/arm/broadcom/bcm2835_dwctwo.c
--- a/sys/arch/arm/broadcom/bcm2835_dwctwo.c    Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_dwctwo.c    Tue Sep 06 20:33:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835_dwctwo.c,v 1.1 2013/09/05 20:49:25 skrll Exp $ */
+/*     $NetBSD: bcm2835_dwctwo.c,v 1.1.14.1 2016/09/06 20:33: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.1 2013/09/05 20:49:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.1.14.1 2016/09/06 20:33: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 e1e40fae7503 -r 420b783cf31b sys/arch/arm/broadcom/bcm53xx_usb.c
--- a/sys/arch/arm/broadcom/bcm53xx_usb.c       Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_usb.c       Tue Sep 06 20:33:05 2016 +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.8.1 2016/09/06 20:33: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 e1e40fae7503 -r 420b783cf31b sys/arch/arm/ep93xx/epohci.c
--- a/sys/arch/arm/ep93xx/epohci.c      Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/ep93xx/epohci.c      Tue Sep 06 20:33:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epohci.c,v 1.7 2012/11/12 18:00:36 skrll Exp $ */
+/*     $NetBSD: epohci.c,v 1.7.18.1 2016/09/06 20:33:06 skrll Exp $ */
 
 /*-
  * Copyright (c) 2004 Jesse Off
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.7 2012/11/12 18:00:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1.7.18.1 2016/09/06 20:33:06 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_hcpriv = sa->sa_dmat;
        sc->sc_intr = sa->sa_intr;
 
        /* Map I/O space */
diff -r e1e40fae7503 -r 420b783cf31b sys/arch/arm/gemini/obio_ehci.c
--- a/sys/arch/arm/gemini/obio_ehci.c   Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/gemini/obio_ehci.c   Tue Sep 06 20:33:05 2016 +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.20.1 2016/09/06 20:33:06 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.20.1 2016/09/06 20:33:06 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 e1e40fae7503 -r 420b783cf31b sys/arch/arm/imx/files.imx23
--- a/sys/arch/arm/imx/files.imx23      Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/imx/files.imx23      Tue Sep 06 20:33:05 2016 +0000
@@ -1,8 +1,12 @@
-# $Id: files.imx23,v 1.2 2013/10/07 17:36:40 matt Exp $
+# $Id: files.imx23,v 1.2.10.1 2016/09/06 20:33:06 skrll Exp $
 #
 # Freescale i.MX23 applications processor configuration info.
 #
 
+defparam opt_imx.h                     MEMSIZE
+
+defflag opt_imx.h                               IMX23
+
 file   arch/arm/arm32/irq_dispatch.S   icoll
 file   arch/arm/imx/imx23_space.c      ahb|apbh|apbx
 file   arch/arm/imx/imx23_dma.c        ahb|apbh|apbx
diff -r e1e40fae7503 -r 420b783cf31b sys/arch/arm/imx/imxusb.c
--- a/sys/arch/arm/imx/imxusb.c Sun Aug 28 04:37:17 2016 +0000
+++ b/sys/arch/arm/imx/imxusb.c Tue Sep 06 20:33:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imxusb.c,v 1.6 2014/07/25 07:49:56 hkenken Exp $       */
+/*     $NetBSD: imxusb.c,v 1.6.6.1 2016/09/06 20:33:06 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>



Home | Main Index | Thread Index | Old Index