summaryrefslogtreecommitdiff
path: root/sys/arch/sgi/include
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-07-26 18:48:56 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-07-26 18:48:56 +0000
commit7458aafff0569577b463f9c368e66cb25262aa6c (patch)
tree70cdb126d1cfdb8654412193beda18a7118700fc /sys/arch/sgi/include
parent7499c0ea68ce760474e8b4e98e74f2e0f120cc77 (diff)
Make sure all platforms understand the flags argument of bus_space_map() and
bus_space_alloc() as a bitmask of flags, and not a boolean controlling cacheability; and make sure the three MI BUS_SPACE_MAP_xxx values documented in the manual page are defined on all platforms as well.
Diffstat (limited to 'sys/arch/sgi/include')
-rw-r--r--sys/arch/sgi/include/bus.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h
index 9b859b9caec..c6c2dda82ea 100644
--- a/sys/arch/sgi/include/bus.h
+++ b/sys/arch/sgi/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.19 2009/07/23 19:24:56 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.20 2009/07/26 18:48:55 miod Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved.
@@ -114,6 +114,10 @@ struct mips_bus_space {
#define bus_space_subregion(t, h, o, s, p) \
(*(t)->_space_subregion)((t), (h), (o), (s), (p))
+#define BUS_SPACE_MAP_CACHEABLE 0x01
+#define BUS_SPACE_MAP_LINEAR 0x02
+#define BUS_SPACE_MAP_PREFETCHABLE 0x04
+
#define bus_space_vaddr(t, h) (*(t)->_space_vaddr)((t), (h))
/*----------------------------------------------------------------------------*/
@@ -298,9 +302,6 @@ bus_space_copy_8(void *v, bus_space_handle_t h1, bus_size_t o1,
#define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ
#define BUS_BARRIER_WRITE BUS_SPACE_BARRIER_WRITE
-#define BUS_SPACE_MAP_CACHEABLE 0x01
-#define BUS_SPACE_MAP_LINEAR 0x02
-
#define BUS_DMA_WAITOK 0x000
#define BUS_DMA_NOWAIT 0x001
#define BUS_DMA_ALLOCNOW 0x002