[src/trunk]: src/sys/arch EHCI_USBINTR is 4 bytes long so use EOWRITE4

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b39b21d6eb1
branches:  trunk
changeset: 780313:9b39b21d6eb1
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jul 20 02:14:01 2012 +0000

description:
EHCI_USBINTR is 4 bytes long so use EOWRITE4

diffstat:

 sys/arch/arm/gemini/obio_ehci.c        |  6 +++---
 sys/arch/arm/imx/imxusb.c              |  6 +++---
 sys/arch/arm/omap/omap3_ehci.c         |  8 ++++----
 sys/arch/mips/atheros/dev/ehci_arbus.c |  6 +++---
 sys/arch/mips/ralink/ralink_ehci.c     |  6 +++---
 sys/arch/mips/rmi/rmixl_ehci.c         |  6 +++---
 sys/arch/powerpc/booke/dev/pq3ehci.c   |  6 +++---
 7 files changed, 22 insertions(+), 22 deletions(-)

diffs (193 lines):

diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/arm/gemini/obio_ehci.c
--- a/sys/arch/arm/gemini/obio_ehci.c   Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/arm/gemini/obio_ehci.c   Fri Jul 20 02:14:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obio_ehci.c,v 1.2 2008/10/24 17:31:24 matt Exp $       */
+/*     $NetBSD: obio_ehci.c,v 1.3 2012/07/20 02:14:01 matt 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.2 2008/10/24 17:31:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ehci.c,v 1.3 2012/07/20 02:14:01 matt Exp $");
 
 #include "locators.h"
 
@@ -122,7 +122,7 @@
        /* Disable interrupts, so we don't get any spurious ones. */
        sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
        DPRINTF(("%s: offs=%d\n", devname, sc->sc_offs));
-       EOWRITE2(sc, EHCI_USBINTR, 0);
+       EOWRITE4(sc, EHCI_USBINTR, 0);
        bus_space_write_4(sc->iot, sc->ioh, EHCI_HCOTGDEV_INTR_MASK,
            OTG_INT|DEV_INT);
 
diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/arm/imx/imxusb.c
--- a/sys/arch/arm/imx/imxusb.c Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/arm/imx/imxusb.c Fri Jul 20 02:14:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imxusb.c,v 1.1 2010/11/30 13:05:27 bsh Exp $   */
+/*     $NetBSD: imxusb.c,v 1.2 2012/07/20 02:14:01 matt 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.1 2010/11/30 13:05:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.2 2012/07/20 02:14:01 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -186,7 +186,7 @@
        }
 
        /* Disable interrupts, so we don't get any spurious ones. */
-       EOWRITE2(hsc, EHCI_USBINTR, 0);
+       EOWRITE4(hsc, EHCI_USBINTR, 0);
 
        intr_establish(aa->aa_irq, IPL_USB, IST_LEVEL, ehci_intr, hsc);
 
diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/arm/omap/omap3_ehci.c
--- a/sys/arch/arm/omap/omap3_ehci.c    Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/arm/omap/omap3_ehci.c    Fri Jul 20 02:14:01 2012 +0000
@@ -1,7 +1,7 @@
-/*     $Id: omap3_ehci.c,v 1.1 2012/07/12 03:38:50 matt Exp $  */
+/*     $Id: omap3_ehci.c,v 1.2 2012/07/20 02:14:01 matt Exp $  */
 
 /* adapted from: */
-/*     $NetBSD: omap3_ehci.c,v 1.1 2012/07/12 03:38:50 matt Exp $      */
+/*     $NetBSD: omap3_ehci.c,v 1.2 2012/07/20 02:14:01 matt Exp $      */
 /*     $OpenBSD: pxa2x0_ehci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
 
 /*
@@ -23,7 +23,7 @@
 #include "opt_omap.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.1 2012/07/12 03:38:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.2 2012/07/20 02:14:01 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -136,7 +136,7 @@
        sc->sc.sc_offs = EREAD1(&sc->sc, EHCI_CAPLENGTH);
 
        /* Disable interrupts, so we don't get any spurious ones. */
-       EOWRITE2(&sc->sc, EHCI_USBINTR, 0);
+       EOWRITE4(&sc->sc, EHCI_USBINTR, 0);
 
 #if 1
        sc->sc_ih = intr_establish(obio->obio_intr, IPL_USB, IST_LEVEL,
diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/mips/atheros/dev/ehci_arbus.c
--- a/sys/arch/mips/atheros/dev/ehci_arbus.c    Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/mips/atheros/dev/ehci_arbus.c    Fri Jul 20 02:14:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci_arbus.c,v 1.1 2011/07/10 06:26:02 matt Exp $      */
+/*     $NetBSD: ehci_arbus.c,v 1.2 2012/07/20 02:14:02 matt Exp $      */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.1 2011/07/10 06:26:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.2 2012/07/20 02:14:02 matt Exp $");
 
 #include "locators.h"
 
@@ -110,7 +110,7 @@
        aprint_normal("\n");
 
        /* Disable EHCI interrupts */
-       EOWRITE2(sc, EHCI_USBINTR, 0);
+       EOWRITE4(sc, EHCI_USBINTR, 0);
 
        /* establish interrupt */
        ih = arbus_intr_establish(aa->aa_cirq, aa->aa_mirq, ehci_intr, sc);
diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/mips/ralink/ralink_ehci.c
--- a/sys/arch/mips/ralink/ralink_ehci.c        Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/mips/ralink/ralink_ehci.c        Fri Jul 20 02:14:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ralink_ehci.c,v 1.2 2011/07/28 15:38:49 matt Exp $     */
+/*     $NetBSD: ralink_ehci.c,v 1.3 2012/07/20 02:14:02 matt Exp $     */
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
 /* ralink_ehci.c -- Ralink EHCI USB Driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.2 2011/07/28 15:38:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_ehci.c,v 1.3 2012/07/20 02:14:02 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -147,7 +147,7 @@
 
        /* Disable EHCI interrupts. */
        sc->sc_ehci.sc_offs = EREAD1(&sc->sc_ehci, EHCI_CAPLENGTH);
-       EOWRITE2(&sc->sc_ehci, EHCI_USBINTR, 0);
+       EOWRITE4(&sc->sc_ehci, EHCI_USBINTR, 0);
 
 #ifdef RALINK_EHCI_DEBUG
        printf("%s: EHCI USBCMD=0x%x\n", devname,
diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/mips/rmi/rmixl_ehci.c
--- a/sys/arch/mips/rmi/rmixl_ehci.c    Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/mips/rmi/rmixl_ehci.c    Fri Jul 20 02:14:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rmixl_ehci.c,v 1.4 2011/07/01 19:01:30 dyoung Exp $    */
+/*     $NetBSD: rmixl_ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $      */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.4 2011/07/01 19:01:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $");
 
 #include "locators.h"
 
@@ -119,7 +119,7 @@
        sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
 
        /* Disable EHCI interrupts */
-       EOWRITE2(sc, EHCI_USBINTR, 0);
+       EOWRITE4(sc, EHCI_USBINTR, 0);
 
        /* establish interrupt */
        if (usbi->usbi_intr != RMIXL_USBICF_INTR_DEFAULT) {
diff -r 233babad8ba7 -r 9b39b21d6eb1 sys/arch/powerpc/booke/dev/pq3ehci.c
--- a/sys/arch/powerpc/booke/dev/pq3ehci.c      Fri Jul 20 02:04:13 2012 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3ehci.c      Fri Jul 20 02:14:01 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pq3ehci.c,v 1.4 2011/06/12 05:29:13 matt Exp $ */
+/*     $NetBSD: pq3ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $ */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.4 2011/06/12 05:29:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $");
 
 #include "opt_usb.h"
 
@@ -138,7 +138,7 @@
 
        /* Disable interrupts, so we don't get any spurious ones. */
        DPRINTF(("%s: offs=%d\n", device_xname(self), sc->sc.sc_offs));
-       EOWRITE2(&sc->sc, EHCI_USBINTR, 0);
+       EOWRITE4(&sc->sc, EHCI_USBINTR, 0);
 
        error = ehci_init(&sc->sc);
        if (error != USBD_NORMAL_COMPLETION) {