diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2001-06-10 15:20:18 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2001-06-10 15:20:18 +0000 |
| commit | 2da9b20fdb43a825b5c1b99f3d73e13ff88ebe87 (patch) | |
| tree | b9678b6eb87e77af08fbbede5965f2079d42fd8b | |
| parent | 05848b74115fce1a382958504ef55f5d6fa1e4c5 (diff) | |
Post pmap_extract() changes cleanup.
bus_addr_t vs vaddr_t/paddr_t
Return correct value for poalloc();
| -rw-r--r-- | sys/arch/powerpc/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/pci/vgafb_pci.c | 5 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/pmap.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/powerpc/include/bus.h b/sys/arch/powerpc/include/bus.h index 180a4b5742c..540c07fe24b 100644 --- a/sys/arch/powerpc/include/bus.h +++ b/sys/arch/powerpc/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.11 2001/03/29 18:50:11 drahn Exp $ */ +/* $OpenBSD: bus.h,v 1.12 2001/06/10 15:20:16 drahn Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom. All rights reserved. @@ -47,7 +47,7 @@ /* * Bus access types. */ -typedef u_int32_t bus_addr_t; +typedef u_long bus_addr_t; typedef u_int32_t bus_size_t; typedef u_int32_t bus_space_handle_t; typedef struct ppc_bus_space *bus_space_tag_t; diff --git a/sys/arch/powerpc/pci/vgafb_pci.c b/sys/arch/powerpc/pci/vgafb_pci.c index 8fc7dd82ebd..132b7e1e360 100644 --- a/sys/arch/powerpc/pci/vgafb_pci.c +++ b/sys/arch/powerpc/pci/vgafb_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb_pci.c,v 1.2 2000/11/21 02:03:44 deraadt Exp $ */ +/* $OpenBSD: vgafb_pci.c,v 1.3 2001/06/10 15:20:17 drahn Exp $ */ /* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */ /* @@ -90,7 +90,8 @@ vgafb_pci_probe(pa, id, ioaddr, iosize, memaddr, memsize, cacheable, mmioaddr, m u_int32_t *memaddr, *memsize, *cacheable; u_int32_t *mmioaddr, *mmiosize; { - u_int32_t addr, size, tcacheable; + u_long addr; + u_int32_t size, tcacheable; pci_chipset_tag_t pc = pa->pa_pc; int retval; int i; diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index 486e2bf48f5..18a699b4447 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.30 2001/06/08 08:09:22 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.31 2001/06/10 15:20:16 drahn Exp $ */ /* $NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -1053,6 +1053,7 @@ poalloc() splx(s); if (po == NULL) panic("poalloc: failed to alloc po"); + return po; } static void |