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

vm_offset_t --> [pv]addr_t.

This commit is contained in:
tsubai 1998-08-21 16:13:28 +00:00
parent f6dcf3f9c6
commit d4d7416198
8 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/macppc/dev/dbdma.c
View File

@ -1,5 +1,7 @@
/* $NetBSD: dbdma.c,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */
/*
* Copyright 1996 1995 by Open Software Foundation, Inc. 1997 1996 1995 1994 1993 1992 1991
* Copyright 1991-1998 by Open Software Foundation, Inc.
* All Rights Reserved
*
* Permission to use, copy, modify, and distribute this software and
@ -22,6 +24,9 @@
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <vm/vm.h>
#include <machine/pio.h>
#include <macppc/dev/dbdma.h>
@ -37,7 +42,7 @@ dbdma_start(dmap, commands)
dbdma_regmap_t *dmap;
dbdma_command_t *commands;
{
unsigned long addr = kvtop((vm_offset_t) commands);
unsigned long addr = vtophys((vaddr_t)commands);
if (addr & 0xf)
panic("dbdma_start command structure not 16-byte aligned");

14
sys/arch/macppc/dev/dbdma.h
View File

@ -1,5 +1,7 @@
/* $NetBSD: dbdma.h,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */
/*
* Copyright 1996 1995 by Open Software Foundation, Inc. 1997 1996 1995 1994 1993 1992 1991
* Copyright 1991-1998 by Open Software Foundation, Inc.
* All Rights Reserved
*
* Permission to use, copy, modify, and distribute this software and
@ -116,15 +118,15 @@ typedef struct dbdma_command dbdma_command_t;
}
#define DBDMA_BUILD(d, cmd, key, count, address, interrupt, wait, branch) { \
dbdma_st16(&(d)->d_command, \
((cmd) << 12) | ((key) << 8) | \
((interrupt) << 4) | \
((branch) << 2) | (wait)); \
dbdma_st16(&(d)->d_count, count); \
dbdma_st16(&(d)->d_count, count); \
dbdma_st32(&(d)->d_address, address); \
(d)->d_resid = 0; \
(d)->d_status = 0; \
(d)->d_cmddep = 0; \
dbdma_st16(&(d)->d_command, \
((cmd) << 12) | ((key) << 8) | \
((interrupt) << 4) | \
((branch) << 2) | (wait)); \
}
static __inline__ void

2
sys/arch/macppc/include/autoconf.h
View File

@ -10,6 +10,6 @@ struct confargs {
/* bus_space_tag_t ca_tag; */
};
extern void * mapiodev __P((vm_offset_t, vm_size_t));
extern void * mapiodev __P((paddr_t, psize_t));
extern int kvtop __P((caddr_t));

6
sys/arch/macppc/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.3 1998/07/17 19:02:46 thorpej Exp $ */
/* $NetBSD: bus.h,v 1.4 1998/08/21 16:13:28 tsubai Exp $ */
/* $OpenBSD: bus.h,v 1.1 1997/10/13 10:53:42 pefo Exp $ */
/*-
@ -136,7 +136,7 @@ typedef u_int32_t bus_space_tag_t;
#define bus_space_map(t, addr, size, cacheable, bshp) \
((*(bshp) = (bus_space_handle_t)mapiodev(((u_int)(t)) + (addr), size)), 0)
extern void *mapiodev __P((vm_offset_t, vm_size_t));
extern void * mapiodev __P((paddr_t, psize_t));
/*
* int bus_space_unmap __P((bus_space_tag_t t,
@ -906,7 +906,7 @@ int _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
vm_offset_t low, vm_offset_t high));
paddr_t low, paddr_t high));
#endif /* _MACPPC_BUS_DMA_PRIVATE */
#endif /* _MACPPC_BUS_H_ */

6
sys/arch/macppc/include/powerpc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: powerpc.h,v 1.1 1998/05/15 10:15:54 tsubai Exp $ */
/* $NetBSD: powerpc.h,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@ -34,8 +34,8 @@
#define _MACHINE_POWERPC_H_
struct mem_region {
vm_offset_t start;
vm_size_t size;
paddr_t start;
psize_t size;
};
void mem_regions __P((struct mem_region **, struct mem_region **));

8
sys/arch/macppc/include/vmparam.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vmparam.h,v 1.3 1998/07/13 19:28:56 tsubai Exp $ */
/* $NetBSD: vmparam.h,v 1.4 1998/08/21 16:13:28 tsubai Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -83,10 +83,10 @@
/*
* Would like to have MAX addresses = 0, but this doesn't (currently) work
*/
#define VM_MIN_ADDRESS ((vm_offset_t)0)
#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x7ffff000)
#define VM_MIN_ADDRESS ((vaddr_t)0)
#define VM_MAXUSER_ADDRESS ((vaddr_t)0x7ffff000)
#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS
#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)(KERNEL_SR << ADDR_SR_SHFT))
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)(KERNEL_SR << ADDR_SR_SHFT))
#define VM_MAX_KERNEL_ADDRESS (VM_MIN_KERNEL_ADDRESS + SEGMENT_LENGTH - 1)
#define VM_KMEM_SIZE (NKMEMCLUSTERS * CLBYTES)

24
sys/arch/macppc/macppc/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.3 1998/08/17 22:35:04 thorpej Exp $ */
/* $NetBSD: bus_dma.c,v 1.4 1998/08/21 16:13:28 tsubai Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -59,7 +59,7 @@
#include <machine/intr.h>
int _bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *,
bus_size_t, struct proc *, int, vm_offset_t *, int *, int));
bus_size_t, struct proc *, int, paddr_t *, int *, int));
/*
* Common function for DMA map creation. May be called by bus-specific
@ -138,13 +138,13 @@ _bus_dmamap_load_buffer(t, map, buf, buflen, p, flags, lastaddrp, segp, first)
bus_size_t buflen;
struct proc *p;
int flags;
vm_offset_t *lastaddrp;
paddr_t *lastaddrp;
int *segp;
int first;
{
bus_size_t sgsize;
bus_addr_t curaddr, lastaddr, baddr, bmask;
vm_offset_t vaddr = (vm_offset_t)buf;
vaddr_t vaddr = (vaddr_t)buf;
int seg;
lastaddr = *lastaddrp;
@ -237,7 +237,7 @@ _bus_dmamap_load(t, map, buf, buflen, p, flags)
struct proc *p;
int flags;
{
vm_offset_t lastaddr;
paddr_t lastaddr;
int seg, error;
/*
@ -269,7 +269,7 @@ _bus_dmamap_load_mbuf(t, map, m0, flags)
struct mbuf *m0;
int flags;
{
vm_offset_t lastaddr;
paddr_t lastaddr;
int seg, error, first;
struct mbuf *m;
@ -312,7 +312,7 @@ _bus_dmamap_load_uio(t, map, uio, flags)
struct uio *uio;
int flags;
{
vm_offset_t lastaddr;
paddr_t lastaddr;
int seg, i, error, first;
bus_size_t minlen, resid;
struct proc *p = NULL;
@ -434,8 +434,8 @@ _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags)
int *rsegs;
int flags;
{
vm_offset_t avail_start, avail_end;
vm_offset_t curaddr, lastaddr, high;
paddr_t avail_start, avail_end;
paddr_t curaddr, lastaddr, high;
vm_page_t m;
struct pglist mlist;
int curseg, error;
@ -544,7 +544,7 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags)
caddr_t *kvap;
int flags;
{
vm_offset_t va;
vaddr_t va;
bus_addr_t addr;
int curseg;
@ -598,9 +598,9 @@ _bus_dmamem_unmap(t, kva, size)
size = round_page(size);
#if defined(UVM)
uvm_km_free(kernel_map, (vm_offset_t)kva, size);
uvm_km_free(kernel_map, (vaddr_t)kva, size);
#else
kmem_free(kernel_map, (vm_offset_t)kva, size);
kmem_free(kernel_map, (vaddr_t)kva, size);
#endif
}

36
sys/arch/macppc/macppc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.15 1998/07/13 19:37:29 tsubai Exp $ */
/* $NetBSD: machdep.c,v 1.16 1998/08/21 16:13:29 tsubai Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -439,7 +439,7 @@ cpu_startup()
{
int sz, i;
caddr_t v;
vm_offset_t minaddr, maxaddr;
vaddr_t minaddr, maxaddr;
int base, residual;
initmsgbuf((caddr_t)MSGBUFADDR, round_page(MSGBUFSIZE));
@ -475,7 +475,7 @@ cpu_startup()
sz = MAXBSIZE * nbuf;
#if defined(UVM)
minaddr = 0;
if (uvm_map(kernel_map, (vm_offset_t *)&minaddr, round_page(sz),
if (uvm_map(kernel_map, (vaddr_t *)&minaddr, round_page(sz),
NULL, UVM_UNKNOWN_OFFSET,
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
UVM_ADV_NORMAL, 0)) != KERN_SUCCESS)
@ -484,7 +484,7 @@ cpu_startup()
#else
buffer_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, sz, TRUE);
buffers = (char *)minaddr;
if (vm_map_find(buffer_map, vm_object_allocate(sz), (vm_offset_t)0,
if (vm_map_find(buffer_map, vm_object_allocate(sz), (vaddr_t)0,
&minaddr, sz, FALSE) != KERN_SUCCESS)
panic("startup: cannot allocate buffers");
#endif /* UVM */
@ -497,11 +497,11 @@ cpu_startup()
}
for (i = 0; i < nbuf; i++) {
#if defined(UVM)
vm_size_t curbufsize;
vm_offset_t curbuf;
vsize_t curbufsize;
vaddr_t curbuf;
struct vm_page *pg;
curbuf = (vm_offset_t)buffers + i * MAXBSIZE;
curbuf = (vaddr_t)buffers + i * MAXBSIZE;
curbufsize = CLBYTES * (i < residual ? base + 1 : base);
while (curbufsize) {
@ -515,10 +515,10 @@ cpu_startup()
curbufsize -= PAGE_SIZE;
}
#else /* !UVM */
vm_size_t curbufsize;
vm_offset_t curbuf;
vsize_t curbufsize;
vaddr_t curbuf;
curbuf = (vm_offset_t)buffers + i * MAXBSIZE;
curbuf = (vaddr_t)buffers + i * MAXBSIZE;
curbufsize = CLBYTES * (i < residual ? base + 1 : base);
vm_map_pageable(buffer_map, curbuf, curbuf + curbufsize, FALSE);
vm_map_simplify(buffer_map, curbuf);
@ -552,10 +552,10 @@ cpu_startup()
* Finally, allocate mbuf cluster submap.
*/
#if defined(UVM)
mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
mb_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
VM_MBUF_SIZE, FALSE, FALSE, NULL);
#else
mb_map = kmem_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
mb_map = kmem_suballoc(kernel_map, (vaddr_t *)&mbutl, &maxaddr,
VM_MBUF_SIZE, FALSE);
#endif
@ -988,7 +988,8 @@ int
kvtop(addr)
caddr_t addr;
{
vm_offset_t va, pa;
vaddr_t va;
paddr_t pa;
int off;
extern char end[];
@ -1012,11 +1013,12 @@ kvtop(addr)
*/
void *
mapiodev(pa, len)
vm_offset_t pa;
vm_size_t len;
paddr_t pa;
psize_t len;
{
vm_offset_t faddr, taddr, off;
vm_offset_t va;
paddr_t faddr;
vaddr_t taddr, va;
int off;
faddr = trunc_page(pa);
off = pa - faddr;