diff options
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/pci_map.c | 11 | ||||
| -rw-r--r-- | sys/dev/pci/pcireg.h | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c index 7fc81130bb2..37ff92e32b7 100644 --- a/sys/dev/pci/pci_map.c +++ b/sys/dev/pci/pci_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_map.c,v 1.9 2003/02/28 15:26:23 mickey Exp $ */ +/* $OpenBSD: pci_map.c,v 1.10 2003/08/27 20:59:15 mickey Exp $ */ /* $NetBSD: pci_map.c,v 1.7 2000/05/10 16:58:42 thorpej Exp $ */ /*- @@ -208,11 +208,12 @@ nbsd_pci_mem_find(pc, tag, reg, type, basep, sizep, flagsp) *sizep = PCI_MAPREG_MEM64_SIZE(wmask); } if (flagsp != 0) - *flagsp = PCI_MAPREG_MEM_CACHEABLE(address) -#ifndef __OpenBSD__ - ? BUS_SPACE_MAP_CACHEABLE : 0 + *flagsp = +#ifdef BUS_SPACE_MAP_PREFETCHABLE + PCI_MAPREG_MEM_PREFETCHABLE(address) ? + BUS_SPACE_MAP_PREFETCHABLE : #endif - ; + 0; return (0); } diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index 36b9e042ce1..8b305462bb2 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcireg.h,v 1.22 2003/04/02 21:40:35 grange Exp $ */ +/* $OpenBSD: pcireg.h,v 1.23 2003/08/27 20:59:15 mickey Exp $ */ /* $NetBSD: pcireg.h,v 1.26 2000/05/10 16:58:42 thorpej Exp $ */ /* @@ -399,9 +399,9 @@ typedef u_int8_t pci_revision_t; #define PCI_MAPREG_MEM_TYPE_32BIT_1M 0x00000002 #define PCI_MAPREG_MEM_TYPE_64BIT 0x00000004 -#define PCI_MAPREG_MEM_CACHEABLE(mr) \ - (((mr) & PCI_MAPREG_MEM_CACHEABLE_MASK) != 0) -#define PCI_MAPREG_MEM_CACHEABLE_MASK 0x00000008 +#define PCI_MAPREG_MEM_PREFETCHABLE(mr) \ + (((mr) & PCI_MAPREG_MEM_PREFETCHABLE_MASK) != 0) +#define PCI_MAPREG_MEM_PREFETCHABLE_MASK 0x00000008 #define PCI_MAPREG_MEM_ADDR(mr) \ ((mr) & PCI_MAPREG_MEM_ADDR_MASK) |