diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-26 18:48:56 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-26 18:48:56 +0000 |
| commit | 7458aafff0569577b463f9c368e66cb25262aa6c (patch) | |
| tree | 70cdb126d1cfdb8654412193beda18a7118700fc /sys/arch/sgi/xbow | |
| parent | 7499c0ea68ce760474e8b4e98e74f2e0f120cc77 (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/xbow')
| -rw-r--r-- | sys/arch/sgi/xbow/xbow.c | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/xbow/xbridge.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/sgi/xbow/xbow.c b/sys/arch/sgi/xbow/xbow.c index b77bc88675b..3c180271b8d 100644 --- a/sys/arch/sgi/xbow/xbow.c +++ b/sys/arch/sgi/xbow/xbow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbow.c,v 1.15 2009/07/22 21:28:44 miod Exp $ */ +/* $OpenBSD: xbow.c,v 1.16 2009/07/26 18:48:55 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -597,7 +597,7 @@ xbow_write_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o, int xbow_space_map(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, - int cacheable, bus_space_handle_t *bshp) + int flags, bus_space_handle_t *bshp) { bus_addr_t bpa; diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c index 11ab79d30bc..c2e3636d83c 100644 --- a/sys/arch/sgi/xbow/xbridge.c +++ b/sys/arch/sgi/xbow/xbridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbridge.c,v 1.41 2009/07/23 19:24:03 miod Exp $ */ +/* $OpenBSD: xbridge.c,v 1.42 2009/07/26 18:48:55 miod Exp $ */ /* * Copyright (c) 2008, 2009 Miodrag Vallat. @@ -997,7 +997,7 @@ xbridge_write_raw_8(bus_space_tag_t t, bus_space_handle_t h, bus_addr_t o, int xbridge_space_map_devio(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, - int cacheable, bus_space_handle_t *bshp) + int flags, bus_space_handle_t *bshp) { struct xbridge_softc *sc = (struct xbridge_softc *)t->bus_private; bus_addr_t bpa; @@ -1040,7 +1040,7 @@ xbridge_space_map_devio(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, int xbridge_space_map_io(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, - int cacheable, bus_space_handle_t *bshp) + int flags, bus_space_handle_t *bshp) { struct xbridge_softc *sc = (struct xbridge_softc *)t->bus_private; @@ -1050,7 +1050,7 @@ xbridge_space_map_io(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, */ if ((offs >> 24) == sc->sc_devio_skew) - return xbridge_space_map_devio(t, offs, size, cacheable, bshp); + return xbridge_space_map_devio(t, offs, size, flags, bshp); *bshp = (t->bus_base + offs); return 0; @@ -1058,7 +1058,7 @@ xbridge_space_map_io(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, int xbridge_space_map_mem(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, - int cacheable, bus_space_handle_t *bshp) + int flags, bus_space_handle_t *bshp) { struct xbridge_softc *sc = (struct xbridge_softc *)t->bus_private; @@ -1070,7 +1070,7 @@ xbridge_space_map_mem(bus_space_tag_t t, bus_addr_t offs, bus_size_t size, if (sys_config.system_type != SGI_OCTANE && (offs >> 24) == sc->sc_devio_skew) - return xbridge_space_map_devio(t, offs, size, cacheable, bshp); + return xbridge_space_map_devio(t, offs, size, flags, bshp); *bshp = (t->bus_base + offs); return 0; |