diff options
author | Joel Sing <jsing@cvs.openbsd.org> | 2007-11-13 12:04:14 +0000 |
---|---|---|
committer | Joel Sing <jsing@cvs.openbsd.org> | 2007-11-13 12:04:14 +0000 |
commit | 702d81dfa15d178a286fef0859dceb880d3e0e32 (patch) | |
tree | 1a94d201690038eca61a7ee63821b7e4fa7ac98e | |
parent | 2af35b0ab57b9e434976760efc393d691283bf9a (diff) |
Expose mace_bus_dma_tag and extend the crimebus extent. This allows the
existing bus interfaces to be used to access the GBE hardware found in the
SGI O2.
ok miod@
-rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 4 | ||||
-rw-r--r-- | sys/arch/sgi/localbus/macebus.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index fe2633d42bf..83ba37479f3 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.30 2007/11/11 14:56:41 jsing Exp $ */ +/* $OpenBSD: macebus.c,v 1.31 2007/11/13 12:04:13 jsing Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -206,7 +206,7 @@ macebusattach(struct device *parent, struct device *self, void *aux) M_DEVBUF, NULL, 0, EX_NOCOALESCE | EX_NOWAIT); crimebus_tag.bus_extent = extent_create("crime_space", - crimebus_tag.bus_base, crimebus_tag.bus_base + 0x00400000, + crimebus_tag.bus_base, crimebus_tag.bus_base + 0x03000000, M_DEVBUF, NULL, 0, EX_NOCOALESCE | EX_NOWAIT); /* diff --git a/sys/arch/sgi/localbus/macebus.h b/sys/arch/sgi/localbus/macebus.h index d55e6508b9c..3a9b0199c7c 100644 --- a/sys/arch/sgi/localbus/macebus.h +++ b/sys/arch/sgi/localbus/macebus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.h,v 1.8 2007/10/18 18:59:29 jsing Exp $ */ +/* $OpenBSD: macebus.h,v 1.9 2007/11/13 12:04:13 jsing Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com). @@ -120,6 +120,7 @@ #define MACE_ISA_GAME_OFFS (MACE_ISAX_OFFS+0x00030000) extern bus_space_t macebus_tag; +extern struct machine_bus_dma_tag mace_bus_dma_tag; u_int8_t mace_read_1(bus_space_tag_t, bus_space_handle_t, bus_size_t); u_int16_t mace_read_2(bus_space_tag_t, bus_space_handle_t, bus_size_t); |