[src/trunk]: src/sys/dev/pci avoid namespace collision with IMASK

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

details:   https://anonhg.NetBSD.org/src/rev/36b765e5c72b
branches:  trunk
changeset: 538625:36b765e5c72b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Oct 23 14:57:15 2002 +0000

description:
avoid namespace collision with IMASK

diffstat:

 sys/dev/pci/iwic_pci.c |  10 +++++-----
 sys/dev/pci/iwicreg.h  |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 94c055a9afce -r 36b765e5c72b sys/dev/pci/iwic_pci.c
--- a/sys/dev/pci/iwic_pci.c    Wed Oct 23 14:35:28 2002 +0000
+++ b/sys/dev/pci/iwic_pci.c    Wed Oct 23 14:57:15 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iwic_pci.c,v 1.4 2002/10/02 16:51:42 thorpej Exp $     */
+/*     $NetBSD: iwic_pci.c,v 1.5 2002/10/23 14:57:15 pooka Exp $       */
 
 /*
  * Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.4 2002/10/02 16:51:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.5 2002/10/23 14:57:15 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -260,7 +260,7 @@
        printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
 
        /* disable interrupts */
-       IWIC_WRITE(sc, IMASK, 0xff);
+       IWIC_WRITE(sc, IWIC_IMASK, 0xff);
        IWIC_READ(sc, ISTA);
 
        iwic_dchan_init(sc);
@@ -399,12 +399,12 @@
        switch (command) {
        case CMR_DOPEN: /* Daemon running */
                NDBGL1(L1_PRIM, "CMR_DOPEN");
-               IWIC_WRITE(sc, IMASK, IMASK_XINT0 | IMASK_XINT1);
+               IWIC_WRITE(sc, IWIC_IMASK, IMASK_XINT0 | IMASK_XINT1);
                break;
 
        case CMR_DCLOSE:        /* Daemon not running */
                NDBGL1(L1_PRIM, "CMR_DCLOSE");
-               IWIC_WRITE(sc, IMASK, 0xff);
+               IWIC_WRITE(sc, IWIC_IMASK, 0xff);
                break;
 
        case CMR_SETTRACE:
diff -r 94c055a9afce -r 36b765e5c72b sys/dev/pci/iwicreg.h
--- a/sys/dev/pci/iwicreg.h     Wed Oct 23 14:35:28 2002 +0000
+++ b/sys/dev/pci/iwicreg.h     Wed Oct 23 14:57:15 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iwicreg.h,v 1.1 2002/09/24 22:05:20 pooka Exp $        */
+/*     $NetBSD: iwicreg.h,v 1.2 2002/10/23 14:57:15 pooka Exp $        */
 
 /*
  * Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -96,7 +96,7 @@
  *     Remaining control register offsets.
  *---------------------------------------------------------------------------*/
 #define ISTA           0x14    /* Interrupt status register */
-#define IMASK          0x18    /* Interrupt mask register */
+#define IWIC_IMASK     0x18    /* Interrupt mask register */
 #define TIMR2          0x4c    /* Timer 2 */
 #define L1_RC          0x50    /* GCI layer 1 ready code */
 #define CIR            0x58    /* Command/Indication receive */