Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert to [pv]addr_t.

This commit is contained in:
pk 1998-08-21 14:07:37 +00:00
parent 5bcec15811
commit f318f15bc3
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/sparc/dev/if_ie_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie_obio.c,v 1.6 1998/03/29 22:10:33 pk Exp $ */
/* $NetBSD: if_ie_obio.c,v 1.7 1998/08/21 14:07:37 pk Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -281,7 +281,7 @@ ie_obio_attach(parent, self, aux)
bus_space_handle_t bh;
struct bootpath *bp;
volatile struct ieob *ieo;
vm_offset_t pa;
paddr_t pa;
struct intrhand *ih;
u_int8_t myaddr[ETHER_ADDR_LEN];
extern void myetheraddr(u_char *); /* should be elsewhere */
@ -315,11 +315,11 @@ extern void myetheraddr(u_char *); /* should be elsewhere */
*/
#ifdef UVM
ie_map = uvm_map_create(pmap_kernel(), (vm_offset_t)IEOB_ADBASE,
(vm_offset_t)IEOB_ADBASE + sc->sc_msize, TRUE);
ie_map = uvm_map_create(pmap_kernel(), (vaddr_t)IEOB_ADBASE,
(vaddr_t)IEOB_ADBASE + sc->sc_msize, TRUE);
#else
ie_map = vm_map_create(pmap_kernel(), (vm_offset_t)IEOB_ADBASE,
(vm_offset_t)IEOB_ADBASE + sc->sc_msize, 1);
ie_map = vm_map_create(pmap_kernel(), (vaddr_t)IEOB_ADBASE,
(vaddr_t)IEOB_ADBASE + sc->sc_msize, 1);
#endif
if (ie_map == NULL)
panic("ie_map");
@ -367,12 +367,12 @@ extern void myetheraddr(u_char *); /* should be elsewhere */
*
*/
pa = pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_maddr);
pa = pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_maddr);
if (pa == 0)
panic("ie pmap_extract");
pmap_enter(pmap_kernel(), trunc_page(IEOB_ADBASE+IE_SCP_ADDR),
(vm_offset_t)pa | PMAP_NC /*| PMAP_IOC*/,
pa | PMAP_NC /*| PMAP_IOC*/,
VM_PROT_READ | VM_PROT_WRITE, 1);
/* Map iscp at location zero */

6
sys/arch/sparc/dev/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.43 1998/04/07 20:20:03 pk Exp $ */
/* $NetBSD: obio.c,v 1.44 1998/08/21 14:07:37 pk Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@ static int obio_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
int, bus_space_handle_t *));
static int _obio_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
bus_size_t, int,
vm_offset_t, bus_space_handle_t *));
vaddr_t, bus_space_handle_t *));
static struct sparc_bus_space_tag obio_space_tag = {
NULL, /* cookie */
@ -204,7 +204,7 @@ _obio_bus_map(t, btype, paddr, size, flags, vaddr, hp)
bus_addr_t paddr;
bus_size_t size;
int flags;
vm_offset_t vaddr;
vaddr_t vaddr;
bus_space_handle_t *hp;
{
struct obio4_softc *sc = t->cookie;

6
sys/arch/sparc/dev/sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbus.c,v 1.26 1998/07/29 18:42:32 pk Exp $ */
/* $NetBSD: sbus.c,v 1.27 1998/08/21 14:07:37 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -112,7 +112,7 @@ static int _sbus_bus_map __P((
bus_addr_t, /*offset*/
bus_size_t, /*size*/
int, /*flags*/
vm_offset_t, /*preferred virtual address */
vaddr_t, /*preferred virtual address */
bus_space_handle_t *));
static void *sbus_intr_establish __P((
bus_space_tag_t,
@ -514,7 +514,7 @@ _sbus_bus_map(t, btype, offset, size, flags, vaddr, hp)
bus_addr_t offset;
bus_size_t size;
int flags;
vm_offset_t vaddr;
vaddr_t vaddr;
bus_space_handle_t *hp;
{
struct sbus_softc *sc = t->cookie;