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

Convert to [pv]addr_t & [pv]size_t.

This commit is contained in:
pk 1998-08-21 14:12:18 +00:00
parent 24255abca0
commit b8a1caac4a
6 changed files with 84 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/sparc/include/autoconf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.h,v 1.26 1998/07/29 18:48:54 pk Exp $ */ /* $NetBSD: autoconf.h,v 1.27 1998/08/21 14:12:18 pk Exp $ */
/*- /*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -150,7 +150,7 @@ union obio_attach_args {
}; };
#define obio_bus_map(t, a, o, s, f, v, hp) \ #define obio_bus_map(t, a, o, s, f, v, hp) \
bus_space_map2(t, 0, (long)(a) + o, s, f, (vm_offset_t)v, hp) bus_space_map2(t, 0, (long)(a) + o, s, f, (vaddr_t)v, hp)
/* obio specific bus flag */ /* obio specific bus flag */
#define OBIO_BUS_MAP_USE_ROM BUS_SPACE_MAP_BUS1 #define OBIO_BUS_MAP_USE_ROM BUS_SPACE_MAP_BUS1
@ -210,8 +210,8 @@ char *clockfreq __P((int freq));
* handle discontiguous physical memory). * handle discontiguous physical memory).
*/ */
struct memarr { struct memarr {
u_int addr; paddr_t addr;
u_int len; psize_t len;
}; };
int makememarr(struct memarr *, int max, int which); int makememarr(struct memarr *, int max, int which);
#define MEMARR_AVAILPHYS 0 #define MEMARR_AVAILPHYS 0

10
sys/arch/sparc/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.11 1998/07/30 22:20:31 pk Exp $ */ /* $NetBSD: bus.h,v 1.12 1998/08/21 14:12:18 pk Exp $ */
/*- /*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -96,7 +96,7 @@ struct sparc_bus_space_tag {
bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t,
int, /*flags*/ int, /*flags*/
vm_offset_t, /*preferred vaddr*/ vaddr_t, /*preferred vaddr*/
bus_space_handle_t *)); bus_space_handle_t *));
int (*sparc_bus_unmap) __P(( int (*sparc_bus_unmap) __P((
bus_space_tag_t, bus_space_tag_t,
@ -166,7 +166,7 @@ static int bus_space_map2 __P((
bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t,
int, /*flags*/ int, /*flags*/
vm_offset_t, /*preferred vaddr*/ vaddr_t, /*preferred vaddr*/
bus_space_handle_t *)); bus_space_handle_t *));
static int bus_space_unmap __P(( static int bus_space_unmap __P((
bus_space_tag_t, bus_space_tag_t,
@ -222,7 +222,7 @@ bus_space_map2(t, bt, a, s, f, v, hp)
bus_addr_t a; bus_addr_t a;
bus_size_t s; bus_size_t s;
int f; int f;
vm_offset_t v; vaddr_t v;
bus_space_handle_t *hp; bus_space_handle_t *hp;
{ {
_BS_CALL(t, sparc_bus_map)(t, bt, a, s, f, v, hp); _BS_CALL(t, sparc_bus_map)(t, bt, a, s, f, v, hp);
@ -679,7 +679,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, int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary, bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags, bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
vm_offset_t low, vm_offset_t high)); vaddr_t low, vaddr_t high));
#endif /* _SPARC_BUS_DMA_PRIVATE */ #endif /* _SPARC_BUS_DMA_PRIVATE */
#endif /* _SPARC_BUS_H_ */ #endif /* _SPARC_BUS_H_ */

4
sys/arch/sparc/include/db_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.h,v 1.11 1997/12/10 23:12:15 pk Exp $ */ /* $NetBSD: db_machdep.h,v 1.12 1998/08/21 14:12:18 pk Exp $ */
/* /*
* Mach Operating System * Mach Operating System
@ -42,7 +42,7 @@
/* end of mangling */ /* end of mangling */
typedef vm_offset_t db_addr_t; /* address - unsigned */ typedef vaddr_t db_addr_t; /* address - unsigned */
typedef long db_expr_t; /* expression - signed */ typedef long db_expr_t; /* expression - signed */
typedef struct { typedef struct {

6
sys/arch/sparc/include/param.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: param.h,v 1.34 1998/04/29 23:11:01 thorpej Exp $ */ /* $NetBSD: param.h,v 1.35 1998/08/21 14:12:18 pk Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -169,8 +169,8 @@ extern int nbpg, pgofset, pgshift;
*/ */
#ifdef _KERNEL #ifdef _KERNEL
#ifndef _LOCORE #ifndef _LOCORE
extern vm_offset_t dvma_base; extern vaddr_t dvma_base;
extern vm_offset_t dvma_end; extern vaddr_t dvma_end;
extern struct map *dvmamap; extern struct map *dvmamap;
/* /*
* The dvma resource map is defined in page units, which are numbered 1 to N. * The dvma resource map is defined in page units, which are numbered 1 to N.

140
sys/arch/sparc/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.33 1998/03/02 17:58:34 fvdl Exp $ */ /* $NetBSD: pmap.h,v 1.34 1998/08/21 14:12:18 pk Exp $ */
/* /*
* Copyright (c) 1996 * Copyright (c) 1996
@ -186,7 +186,7 @@ struct kvm_cpustate {
#define PMAP_NULL ((pmap_t)0) #define PMAP_NULL ((pmap_t)0)
extern struct pmap kernel_pmap_store; extern struct pmap kernel_pmap_store;
extern vm_offset_t vm_first_phys, vm_num_phys; extern paddr_t vm_first_phys, vm_num_phys;
/* /*
* Since PTEs also contain type bits, we have to have some way * Since PTEs also contain type bits, we have to have some way
@ -203,8 +203,8 @@ extern vm_offset_t vm_first_phys, vm_num_phys;
#define PMAP_NC 4 /* tells pmap_enter to set PG_NC */ #define PMAP_NC 4 /* tells pmap_enter to set PG_NC */
#define PMAP_TNC_4 7 /* mask to get PG_TYPE & PG_NC */ #define PMAP_TNC_4 7 /* mask to get PG_TYPE & PG_NC */
#define PMAP_T2PTE_4(x) (((x) & PMAP_TNC_4) << PG_TNC_SHIFT) #define PMAP_T2PTE_4(x) (((x) & PMAP_TNC_4) << PG_TNC_SHIFT)
#define PMAP_IOENC_4(io) (io) #define PMAP_IOENC_4(io) (io)
/* /*
* On a SRMMU machine, the iospace is encoded in bits [3-6] of the * On a SRMMU machine, the iospace is encoded in bits [3-6] of the
@ -223,12 +223,6 @@ extern vm_offset_t vm_first_phys, vm_num_phys;
/* Encode IO space for pmap_enter() */ /* Encode IO space for pmap_enter() */
#define PMAP_IOENC(io) (CPU_ISSUN4M ? PMAP_IOENC_SRMMU(io) : PMAP_IOENC_4(io)) #define PMAP_IOENC(io) (CPU_ISSUN4M ? PMAP_IOENC_SRMMU(io) : PMAP_IOENC_4(io))
#if xxx
void pmap_bootstrap __P((int nmmu, int nctx, int nregion));
int pmap_count_ptes __P((struct pmap *));
void pmap_prefer __P((vm_offset_t, vm_offset_t *));
int pmap_pa_exists __P((vm_offset_t));
#endif
int pmap_dumpsize __P((void)); int pmap_dumpsize __P((void));
int pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)), int pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)),
daddr_t)); daddr_t));
@ -248,28 +242,26 @@ void pmap_activate __P((struct proc *));
void pmap_deactivate __P((struct proc *)); void pmap_deactivate __P((struct proc *));
void pmap_bootstrap __P((int nmmu, int nctx, int nregion)); void pmap_bootstrap __P((int nmmu, int nctx, int nregion));
int pmap_count_ptes __P((struct pmap *)); int pmap_count_ptes __P((struct pmap *));
void pmap_prefer __P((vm_offset_t, vm_offset_t *)); void pmap_prefer __P((vaddr_t, vaddr_t *));
int pmap_pa_exists __P((vm_offset_t)); int pmap_pa_exists __P((paddr_t));
void *pmap_bootstrap_alloc __P((int)); void *pmap_bootstrap_alloc __P((int));
void pmap_change_wiring __P((pmap_t, vm_offset_t, boolean_t)); void pmap_change_wiring __P((pmap_t, vaddr_t, boolean_t));
void pmap_collect __P((pmap_t)); void pmap_collect __P((pmap_t));
void pmap_copy __P((pmap_t, void pmap_copy __P((pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t));
pmap_t, vm_offset_t, vm_size_t, vm_offset_t)); pmap_t pmap_create __P((vsize_t));
pmap_t pmap_create __P((vm_size_t)); void pmap_destroy __P((pmap_t));
void pmap_destroy __P((pmap_t)); void pmap_init __P((void));
void pmap_init __P((void)); vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, int));
vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int)); void pmap_pageable __P((pmap_t, vaddr_t, vaddr_t, boolean_t));
void pmap_pageable __P((pmap_t, paddr_t pmap_phys_address __P((int));
vm_offset_t, vm_offset_t, boolean_t)); void pmap_pinit __P((pmap_t));
vm_offset_t pmap_phys_address __P((int)); void pmap_reference __P((pmap_t));
void pmap_pinit __P((pmap_t)); void pmap_release __P((pmap_t));
void pmap_reference __P((pmap_t)); void pmap_remove __P((pmap_t, vaddr_t, vaddr_t));
void pmap_release __P((pmap_t)); void pmap_update __P((void));
void pmap_remove __P((pmap_t, vm_offset_t, vm_offset_t)); void pmap_init __P((void));
void pmap_update __P((void)); int pmap_page_index __P((paddr_t));
void pmap_init __P((void)); void pmap_virtual_space __P((vaddr_t *, vaddr_t *));
int pmap_page_index __P((vm_offset_t));
void pmap_virtual_space __P((vm_offset_t *, vm_offset_t *));
void pmap_redzone __P((void)); void pmap_redzone __P((void));
void kvm_uncache __P((caddr_t, int)); void kvm_uncache __P((caddr_t, int));
struct user; struct user;
@ -278,51 +270,49 @@ int mmu_pagein __P((struct pmap *pm, int, int));
void pmap_writetext __P((unsigned char *, int)); void pmap_writetext __P((unsigned char *, int));
#if !defined(MACHINE_NEW_CONCONTIG) #if !defined(MACHINE_NEW_CONCONTIG)
u_int pmap_free_pages __P((void)); u_int pmap_free_pages __P((void));
boolean_t pmap_next_page __P((vm_offset_t *)); boolean_t pmap_next_page __P((paddr_t *));
#endif #endif
/* SUN4/SUN4C SPECIFIC DECLARATIONS */ /* SUN4/SUN4C SPECIFIC DECLARATIONS */
#if defined(SUN4) || defined(SUN4C) #if defined(SUN4) || defined(SUN4C)
void pmap_clear_modify4_4c __P((vm_offset_t pa)); void pmap_clear_modify4_4c __P((paddr_t pa));
void pmap_clear_reference4_4c __P((vm_offset_t pa)); void pmap_clear_reference4_4c __P((paddr_t pa));
void pmap_copy_page4_4c __P((vm_offset_t, vm_offset_t)); void pmap_copy_page4_4c __P((paddr_t, paddr_t));
void pmap_enter4_4c __P((pmap_t, void pmap_enter4_4c __P((pmap_t,
vm_offset_t, vm_offset_t, vm_prot_t, boolean_t)); vaddr_t, paddr_t, vm_prot_t, boolean_t));
vm_offset_t pmap_extract4_4c __P((pmap_t, vm_offset_t)); paddr_t pmap_extract4_4c __P((pmap_t, vaddr_t));
boolean_t pmap_is_modified4_4c __P((vm_offset_t pa)); boolean_t pmap_is_modified4_4c __P((paddr_t pa));
boolean_t pmap_is_referenced4_4c __P((vm_offset_t pa)); boolean_t pmap_is_referenced4_4c __P((paddr_t pa));
void pmap_page_protect4_4c __P((vm_offset_t, vm_prot_t)); void pmap_page_protect4_4c __P((paddr_t, vm_prot_t));
void pmap_protect4_4c __P((pmap_t, void pmap_protect4_4c __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
vm_offset_t, vm_offset_t, vm_prot_t)); void pmap_zero_page4_4c __P((paddr_t));
void pmap_zero_page4_4c __P((vm_offset_t)); void pmap_changeprot4_4c __P((pmap_t, vaddr_t, vm_prot_t, int));
void pmap_changeprot4_4c __P((pmap_t, vm_offset_t, vm_prot_t, int));
#endif #endif
/* SIMILAR DECLARATIONS FOR SUN4M MODULE */ /* SIMILAR DECLARATIONS FOR SUN4M MODULE */
#if defined(SUN4M) #if defined(SUN4M)
void pmap_clear_modify4m __P((vm_offset_t pa)); void pmap_clear_modify4m __P((paddr_t pa));
void pmap_clear_reference4m __P((vm_offset_t pa)); void pmap_clear_reference4m __P((paddr_t pa));
void pmap_copy_page4m __P((vm_offset_t, vm_offset_t)); void pmap_copy_page4m __P((paddr_t, paddr_t));
void pmap_enter4m __P((pmap_t, void pmap_enter4m __P((pmap_t,
vm_offset_t, vm_offset_t, vm_prot_t, boolean_t)); vaddr_t, paddr_t, vm_prot_t, boolean_t));
vm_offset_t pmap_extract4m __P((pmap_t, vm_offset_t)); paddr_t pmap_extract4m __P((pmap_t, vaddr_t));
boolean_t pmap_is_modified4m __P((vm_offset_t pa)); boolean_t pmap_is_modified4m __P((paddr_t pa));
boolean_t pmap_is_referenced4m __P((vm_offset_t pa)); boolean_t pmap_is_referenced4m __P((paddr_t pa));
void pmap_page_protect4m __P((vm_offset_t, vm_prot_t)); void pmap_page_protect4m __P((paddr_t, vm_prot_t));
void pmap_protect4m __P((pmap_t, void pmap_protect4m __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
vm_offset_t, vm_offset_t, vm_prot_t)); void pmap_zero_page4m __P((paddr_t));
void pmap_zero_page4m __P((vm_offset_t)); void pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int));
void pmap_changeprot4m __P((pmap_t, vm_offset_t, vm_prot_t, int));
#endif /* defined SUN4M */ #endif /* defined SUN4M */
#if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C)) #if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C))
#define pmap_clear_modify pmap_clear_modify4_4c #define pmap_clear_modify pmap_clear_modify4_4c
#define pmap_clear_reference pmap_clear_reference4_4c #define pmap_clear_reference pmap_clear_reference4_4c
#define pmap_copy_page pmap_copy_page4_4c #define pmap_copy_page pmap_copy_page4_4c
#define pmap_enter pmap_enter4_4c #define pmap_enter pmap_enter4_4c
@ -336,7 +326,7 @@ void pmap_changeprot4m __P((pmap_t, vm_offset_t, vm_prot_t, int));
#elif defined(SUN4M) && !(defined(SUN4) || defined(SUN4C)) #elif defined(SUN4M) && !(defined(SUN4) || defined(SUN4C))
#define pmap_clear_modify pmap_clear_modify4m #define pmap_clear_modify pmap_clear_modify4m
#define pmap_clear_reference pmap_clear_reference4m #define pmap_clear_reference pmap_clear_reference4m
#define pmap_copy_page pmap_copy_page4m #define pmap_copy_page pmap_copy_page4m
#define pmap_enter pmap_enter4m #define pmap_enter pmap_enter4m
@ -350,22 +340,20 @@ void pmap_changeprot4m __P((pmap_t, vm_offset_t, vm_prot_t, int));
#else /* must use function pointers */ #else /* must use function pointers */
extern void (*pmap_clear_modify_p) __P((vm_offset_t pa)); extern void (*pmap_clear_modify_p) __P((paddr_t pa));
extern void (*pmap_clear_reference_p) __P((vm_offset_t pa)); extern void (*pmap_clear_reference_p) __P((paddr_t pa));
extern void (*pmap_copy_page_p) __P((vm_offset_t, vm_offset_t)); extern void (*pmap_copy_page_p) __P((paddr_t, paddr_t));
extern void (*pmap_enter_p) __P((pmap_t, extern void (*pmap_enter_p) __P((pmap_t,
vm_offset_t, vm_offset_t, vm_prot_t, boolean_t)); vaddr_t, paddr_t, vm_prot_t, boolean_t));
extern vm_offset_t (*pmap_extract_p) __P((pmap_t, vm_offset_t)); extern paddr_t (*pmap_extract_p) __P((pmap_t, vaddr_t));
extern boolean_t (*pmap_is_modified_p) __P((vm_offset_t pa)); extern boolean_t(*pmap_is_modified_p) __P((paddr_t pa));
extern boolean_t (*pmap_is_referenced_p) __P((vm_offset_t pa)); extern boolean_t(*pmap_is_referenced_p) __P((paddr_t pa));
extern void (*pmap_page_protect_p) __P((vm_offset_t, vm_prot_t)); extern void (*pmap_page_protect_p) __P((paddr_t, vm_prot_t));
extern void (*pmap_protect_p) __P((pmap_t, extern void (*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
vm_offset_t, vm_offset_t, vm_prot_t)); extern void (*pmap_zero_page_p) __P((paddr_t));
extern void (*pmap_zero_page_p) __P((vm_offset_t)); extern void (*pmap_changeprot_p) __P((pmap_t, vaddr_t, vm_prot_t, int));
extern void (*pmap_changeprot_p) __P((pmap_t, vm_offset_t,
vm_prot_t, int));
#define pmap_clear_modify (*pmap_clear_modify_p) #define pmap_clear_modify (*pmap_clear_modify_p)
#define pmap_clear_reference (*pmap_clear_reference_p) #define pmap_clear_reference (*pmap_clear_reference_p)
#define pmap_copy_page (*pmap_copy_page_p) #define pmap_copy_page (*pmap_copy_page_p)
#define pmap_enter (*pmap_enter_p) #define pmap_enter (*pmap_enter_p)

19
sys/arch/sparc/include/vmparam.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: vmparam.h,v 1.16 1998/07/08 04:43:20 thorpej Exp $ */ /* $NetBSD: vmparam.h,v 1.17 1998/08/21 14:12:18 pk Exp $ */
/* /*
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -121,11 +121,11 @@
* IO space virtual base, which must be the same as VM_MAX_KERNEL_ADDRESS: * IO space virtual base, which must be the same as VM_MAX_KERNEL_ADDRESS:
* tread with care. * tread with care.
*/ */
#define VM_MIN_ADDRESS ((vm_offset_t)0) #define VM_MIN_ADDRESS ((vaddr_t)0)
#define VM_MAX_ADDRESS ((vm_offset_t)KERNBASE) #define VM_MAX_ADDRESS ((vaddr_t)KERNBASE)
#define VM_MAXUSER_ADDRESS ((vm_offset_t)KERNBASE) #define VM_MAXUSER_ADDRESS ((vaddr_t)KERNBASE)
#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)KERNBASE) #define VM_MIN_KERNEL_ADDRESS ((vaddr_t)KERNBASE)
#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xfe000000) #define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0xfe000000)
/* virtual sizes (bytes) for various kernel submaps */ /* virtual sizes (bytes) for various kernel submaps */
#define VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES) #define VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES)
@ -144,13 +144,6 @@
/* /*
* pmap specific data stored in the vm_physmem[] array * pmap specific data stored in the vm_physmem[] array
*/ */
struct pmap_physseg { struct pmap_physseg {
/* NULL */ /* NULL */
}; };
#if defined (_KERNEL) && !defined(_LOCORE)
struct vm_map;
vm_offset_t dvma_mapin __P((struct vm_map *, vm_offset_t, int, int));
void dvma_mapout __P((vm_offset_t, vm_offset_t, int));
#endif