From 59af791344c0dc6cbea0edeafc20bf4b4f47db9b Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Tue, 21 Jul 2009 21:20:06 +0000 Subject: Change the rbus md_space_{map,unmap} signature to take a rbus_tag_t instead of the bus_space_tag_t it contains; an upcoming implementation will need to know the rbus_tag_t for which it works at this point. All callers updated accordingly; no functional change intended. --- sys/arch/macppc/include/rbus_machdep.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/arch/macppc/include') diff --git a/sys/arch/macppc/include/rbus_machdep.h b/sys/arch/macppc/include/rbus_machdep.h index 69efb48cb08..a371dc209a9 100644 --- a/sys/arch/macppc/include/rbus_machdep.h +++ b/sys/arch/macppc/include/rbus_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.h,v 1.3 2007/12/09 17:02:56 kettenis Exp $ */ +/* $OpenBSD: rbus_machdep.h,v 1.4 2009/07/21 21:20:05 miod Exp $ */ /* $NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $ */ /* @@ -40,18 +40,18 @@ struct pci_attach_args; /* XXX */ void _bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_addr_t *); -#define md_space_map(bt, physaddr, size, flags, bshp) \ - bus_space_map((bt), (physaddr), (size), (flags), (bshp)) +#define md_space_map(rbt, physaddr, size, flags, bshp) \ + bus_space_map((rbt)->rb_bt, (physaddr), (size), (flags), (bshp)) /* XXX */ bus_addr_t bus_space_unmap_p(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size); -#define md_space_unmap(bt, bsh, size, adrp) \ +#define md_space_unmap(rbt, bsh, size, adrp) \ do { \ - *adrp = bus_space_unmap_p((bt), (bsh), (size)); \ - if (bt->bus_io) { \ + *adrp = bus_space_unmap_p((rbt)->rb_bt, (bsh), (size)); \ + if ((rbt)->rb_bt->bus_io) { \ *adrp = *adrp & 0xffff; \ } \ } while (0) -- cgit v1.2.3