Source-Changes-HG archive

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

[src/trunk]: src/sys PCI_FLAGS_IO_ENABLED and PCI_FLAGS_MEM_ENABLED changed t...



details:   https://anonhg.NetBSD.org/src/rev/bbc7a626bdf4
branches:  trunk
changeset: 765049:bbc7a626bdf4
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue May 17 17:34:47 2011 +0000

description:
PCI_FLAGS_IO_ENABLED and PCI_FLAGS_MEM_ENABLED changed their functional
role in NetBSD (drivers are no longer supposed to write these to
pa_flags) without changing name.  Correct that.

Rename PCI_FLAGS_IO_ENABLED to PCI_FLAGS_IO_OKAY and
PCI_FLAGS_MEM_ENABLED to PCI_FLAGS_MEM_OKAY, thus making their names
consistent with the other PCI flags and poisoning 3rd-party driver
sources that use the flags in the old bad way.

This patch produces no binary changes in this set of PCI kernels when
they are compiled w/o 'options DIAGNOSTIC' and w/ -V MKREPRO=yes:

algor P4032 P5064 P6032
alpha GENERIC
amd64 GENERIC XEN3_DOM0
arc GENERIC
atari HADES MILAN-PCIIDE
bebox GENERIC
cats GENERIC
cobalt GENERIC
evbarm-el ADI_BRH ARMADILLO9 CP3100 GEMINI GEMINI_MASTER GEMINI_SLAVE
evbarm-el GUMSTIX HDL_G IMX31LITE INTEGRATOR IQ31244 IQ80310 IQ80321
evbarm-el IXDP425 IXM1200 KUROBOX_PRO
evbarm-el LUBBOCK MARVELL_NAS NAPPI NSLU2 SHEEVAPLUG SMDK2800 TEAMASA_NPWR
evbarm-el TEAMASA_NPWR_FC TS7200 TWINTAIL ZAO425
evbmips-el AP30 DBAU1500 DBAU1550 MALTA MERAKI MTX-1 OMSAL400 RB153 WGT624V3
evbmips64-el XLSATX
evbppc EV64260 MPC8536DS MPC8548CDS OPENBLOCKS200 OPENBLOCKS266
evbppc OPENBLOCKS266_OPT P2020RDB PMPPC RB800 WALNUT
hp700 GENERIC
i386 ALL XEN3_DOM0 XEN3_DOMU
ibmnws GENERIC
iyonix GENERIC
landisk GENERIC
macppc GENERIC
mvmeppc GENERIC
netwinder GENERIC
ofppc GENERIC
prep GENERIC
sandpoint GENERIC
sbmips-el GENERIC
sgimips GENERIC32_IP2x GENERIC32_IP3x
sparc GENERIC_SUN4U KRUPS
sparc64 GENERIC

diffstat:

 sys/arch/algor/dev/bonito_mainbus.c     |   6 +++---
 sys/arch/algor/dev/vtpbc_mainbus.c      |   8 ++++----
 sys/arch/alpha/pci/a12c.c               |   8 ++++----
 sys/arch/alpha/pci/apecs.c              |   6 +++---
 sys/arch/alpha/pci/cia.c                |   6 +++---
 sys/arch/alpha/pci/dwlpx.c              |   6 +++---
 sys/arch/alpha/pci/irongate.c           |   6 +++---
 sys/arch/alpha/pci/lca.c                |   6 +++---
 sys/arch/alpha/pci/mcpcia.c             |   6 +++---
 sys/arch/alpha/pci/tsc.c                |   6 +++---
 sys/arch/alpha/pci/ttwoga.c             |   6 +++---
 sys/arch/amd64/amd64/mainbus.c          |   6 +++---
 sys/arch/arc/pci/necpb.c                |   6 +++---
 sys/arch/arm/footbridge/footbridge.c    |   6 +++---
 sys/arch/arm/gemini/gemini_obio.c       |   6 +++---
 sys/arch/arm/ixp12x0/ixp12x0.c          |   6 +++---
 sys/arch/arm/s3c2xx0/s3c2800_pci.c      |   6 +++---
 sys/arch/arm/xscale/becc.c              |   6 +++---
 sys/arch/arm/xscale/i80312.c            |   6 +++---
 sys/arch/arm/xscale/i80321.c            |   6 +++---
 sys/arch/arm/xscale/ixp425.c            |   6 +++---
 sys/arch/atari/pci/pci_machdep.c        |   6 +++---
 sys/arch/bebox/bebox/mainbus.c          |   6 +++---
 sys/arch/cobalt/dev/gt.c                |   6 +++---
 sys/arch/dreamcast/dev/g2/gapspci.c     |   6 +++---
 sys/arch/evbarm/ifpga/ifpga.c           |   6 +++---
 sys/arch/evbmips/gdium/bonito_mainbus.c |   6 +++---
 sys/arch/evbmips/malta/dev/gt.c         |   6 +++---
 sys/arch/evbppc/walnut/pci/pchb.c       |   6 +++---
 sys/arch/hp700/dev/dino.c               |   6 +++---
 sys/arch/hp700/dev/elroy.c              |   4 ++--
 sys/arch/hpcmips/vr/vrc4172pci.c        |   6 +++---
 sys/arch/hpcmips/vr/vrpciu.c            |   6 +++---
 sys/arch/i386/i386/mainbus.c            |   6 +++---
 sys/arch/ia64/ia64/mainbus.c            |   6 +++---
 sys/arch/ibmnws/ibmnws/mainbus.c        |   4 ++--
 sys/arch/macppc/pci/bandit.c            |   6 +++---
 sys/arch/macppc/pci/grackle.c           |   6 +++---
 sys/arch/macppc/pci/u3.c                |   4 ++--
 sys/arch/macppc/pci/uninorth.c          |   6 +++---
 sys/arch/mips/adm5120/dev/admpci.c      |   6 +++---
 sys/arch/mips/alchemy/dev/aupci.c       |   6 +++---
 sys/arch/mips/rmi/rmixl_pcie.c          |   6 +++---
 sys/arch/mips/rmi/rmixl_pcix.c          |   6 +++---
 sys/arch/mips/sibyte/pci/sbbrz.c        |   4 ++--
 sys/arch/mvmeppc/mvmeppc/mainbus.c      |   6 +++---
 sys/arch/ofppc/pci/ofwpci.c             |   6 +++---
 sys/arch/powerpc/booke/pci/pq3pci.c     |  10 +++++-----
 sys/arch/powerpc/ibm4xx/pci/pchb.c      |   6 +++---
 sys/arch/prep/prep/mainbus.c            |   6 +++---
 sys/arch/sandpoint/sandpoint/mainbus.c  |   6 +++---
 sys/arch/sgimips/gio/pci_gio.c          |   6 +++---
 sys/arch/sgimips/mace/pci_mace.c        |   8 ++++----
 sys/arch/sh3/dev/shpcic.c               |   6 +++---
 sys/arch/sparc/sparc/msiiep.c           |   6 +++---
 sys/arch/sparc64/dev/psycho.c           |   8 ++++----
 sys/arch/sparc64/dev/pyro.c             |   6 +++---
 sys/arch/sparc64/dev/schizo.c           |   6 +++---
 sys/arch/x86/pci/pchb.c                 |  18 +++++++++---------
 sys/arch/x86/pci/pci_machdep.c          |   8 ++++----
 sys/arch/xen/xen/hypervisor.c           |   8 ++++----
 sys/arch/xen/xen/xpci_xenbus.c          |   6 +++---
 sys/dev/cardbus/rbus_ppb.c              |   6 +++---
 sys/dev/ic/cpc700.c                     |   6 +++---
 sys/dev/marvell/gtpci.c                 |  10 +++++-----
 sys/dev/marvell/mvpex.c                 |   6 +++---
 sys/dev/pci/if_fxp_pci.c                |   8 ++++----
 sys/dev/pci/if_ne_pci.c                 |   6 +++---
 sys/dev/pci/pci.c                       |  12 ++++++------
 sys/dev/pci/pci_map.c                   |   8 ++++----
 sys/dev/pci/pciide_common.c             |   6 +++---
 sys/dev/pci/pcivar.h                    |   6 +++---
 sys/dev/pci/viaide.c                    |   6 +++---
 73 files changed, 236 insertions(+), 236 deletions(-)

diffs (truncated from 2037 to 300 lines):

diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/algor/dev/bonito_mainbus.c
--- a/sys/arch/algor/dev/bonito_mainbus.c       Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/algor/dev/bonito_mainbus.c       Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $       */
+/*     $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $       */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $");
 
 #include "opt_algor_p6032.h"
 
@@ -94,7 +94,7 @@
            BONITO_REV_FPGA(rev) ? "FPGA" : "ASIC",
            BONITO_REV_MAJOR(rev), BONITO_REV_MINOR(rev));
 
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
 
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/algor/dev/vtpbc_mainbus.c
--- a/sys/arch/algor/dev/vtpbc_mainbus.c        Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/algor/dev/vtpbc_mainbus.c        Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vtpbc_mainbus.c,v 1.15 2008/04/28 20:23:10 martin Exp $        */
+/*     $NetBSD: vtpbc_mainbus.c,v 1.16 2011/05/17 17:34:47 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.15 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbus.c,v 1.16 2011/05/17 17:34:47 dyoung Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -100,12 +100,12 @@
        printf("%s: PCI DMA window base: 0x%08lx\n", sc->sc_dev.dv_xname,
            (u_long) vt->vt_dma_winbase);
 
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
 
        if (vt->vt_pci_iobase == (bus_addr_t) -1)
-               pba.pba_flags &= ~PCI_FLAGS_IO_ENABLED;
+               pba.pba_flags &= ~PCI_FLAGS_IO_OKAY;
 
 #if defined(ALGOR_P4032)
            {
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/a12c.c
--- a/sys/arch/alpha/pci/a12c.c Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/a12c.c Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c.c,v 1.22 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: a12c.c,v 1.23 2011/05/17 17:34:47 dyoung Exp $ */
 
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
 #include "opt_avalon_a12.h"            /* Config options headers */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.22 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.23 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -132,7 +132,7 @@
        a12c_init(ccp, 1);
 
        /* XXX print chipset information */
-       printf(": driver %s over logic %x\n", "$Revision: 1.22 $", 
+       printf(": driver %s over logic %x\n", "$Revision: 1.23 $", 
                A12_ALL_EXTRACT(REGVAL(A12_VERS)));
 
        pci_a12_pickintr(ccp);
@@ -146,7 +146,7 @@
        pba.pba_pc = &ccp->ac_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
 
        config_found_ia(self, "pcibus", &pba, pcibusprint);
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/apecs.c
--- a/sys/arch/alpha/pci/apecs.c        Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/apecs.c        Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs.c,v 1.51 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: apecs.c,v 1.52 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.51 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.52 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -228,7 +228,7 @@
        pba.pba_pc = &acp->ac_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
        config_found_ia(self, "pcibus", &pba, pcibusprint);
 }
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/cia.c
--- a/sys/arch/alpha/pci/cia.c  Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/cia.c  Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.70 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: cia.c,v 1.71 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.70 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.71 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -400,7 +400,7 @@
        pba.pba_pc = &ccp->cc_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
        if ((ccp->cc_flags & CCF_PYXISBUG) == 0)
                pba.pba_flags |= PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
                    PCI_FLAGS_MWI_OKAY;
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/dwlpx.c
--- a/sys/arch/alpha/pci/dwlpx.c        Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/dwlpx.c        Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx.c,v 1.35 2010/12/15 01:27:18 matt Exp $ */
+/* $NetBSD: dwlpx.c,v 1.36 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.35 2010/12/15 01:27:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.36 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -175,7 +175,7 @@
        pba.pba_pc = &sc->dwlpx_cc.cc_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
        config_found_ia(self, "pcibus", &pba, pcibusprint);
 }
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/irongate.c
--- a/sys/arch/alpha/pci/irongate.c     Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/irongate.c     Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate.c,v 1.14 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: irongate.c,v 1.15 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.14 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.15 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -177,7 +177,7 @@
        pba.pba_pc = &icp->ic_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
 
        if (pci_get_capability(&icp->ic_pc, tag, PCI_CAP_AGP,
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/lca.c
--- a/sys/arch/alpha/pci/lca.c  Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/lca.c  Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lca.c,v 1.48 2010/12/15 01:27:19 matt Exp $ */
+/* $NetBSD: lca.c,v 1.49 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.48 2010/12/15 01:27:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.49 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -234,7 +234,7 @@
        pba.pba_pc = &lcp->lc_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
        config_found_ia(self, "pcibus", &pba, pcibusprint);
 }
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/mcpcia.c
--- a/sys/arch/alpha/pci/mcpcia.c       Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/mcpcia.c       Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia.c,v 1.26 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: mcpcia.c,v 1.27 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.26 2009/03/18 10:22:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.27 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -187,7 +187,7 @@
        pba.pba_pc = &ccp->cc_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
        (void) config_found_ia(self, "pcibus", &pba, pcibusprint);
 
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/tsc.c
--- a/sys/arch/alpha/pci/tsc.c  Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/tsc.c  Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tsc.c,v 1.18 2010/10/07 19:55:02 hans Exp $ */
+/* $NetBSD: tsc.c,v 1.19 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999 by Ross Harvey.  All rights reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.18 2010/10/07 19:55:02 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.19 2011/05/17 17:34:47 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -183,7 +183,7 @@
        pba.pba_pc = &pcp->pc_pc;
        pba.pba_bus = 0;
        pba.pba_bridgetag = NULL;
-       pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED |
+       pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
            PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
        config_found_ia(self, "pcibus", &pba, pcibusprint);
 }
diff -r 0600ca882cd7 -r bbc7a626bdf4 sys/arch/alpha/pci/ttwoga.c
--- a/sys/arch/alpha/pci/ttwoga.c       Tue May 17 12:56:44 2011 +0000
+++ b/sys/arch/alpha/pci/ttwoga.c       Tue May 17 17:34:47 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga.c,v 1.11 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: ttwoga.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.11 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $");



Home | Main Index | Thread Index | Old Index