diff options
| author | ian <ian@FreeBSD.org> | 2013-11-04 22:45:26 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-11-04 22:45:26 +0000 |
| commit | fefbe5ab0a495d58849a7fe9d9908d64840bdc2c (patch) | |
| tree | b38acd2229eed55194270f60a20d47197e5ad60e /sys/arm/xscale/ixp425 | |
| parent | fca50c96f29736e66f63356836d199a1295b48ed (diff) | |
| download | FreeBSD-src-fefbe5ab0a495d58849a7fe9d9908d64840bdc2c.zip FreeBSD-src-fefbe5ab0a495d58849a7fe9d9908d64840bdc2c.tar.gz | |
Move remaining code and data related to static device mapping into the
new devmap.[ch] files. Emphasize the MD nature of these things by using
the prefix arm_devmap_ on the function and type names (already a few of
these things found their way into MI code, hopefully it will be harder to
do by accident in the future).
Diffstat (limited to 'sys/arm/xscale/ixp425')
| -rw-r--r-- | sys/arm/xscale/ixp425/avila_machdep.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c index 8b16631..b47e70a 100644 --- a/sys/arm/xscale/ixp425/avila_machdep.c +++ b/sys/arm/xscale/ixp425/avila_machdep.c @@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> +#include <machine/devmap.h> #include <machine/vmparam.h> #include <machine/pcb.h> #include <machine/undefined.h> @@ -125,7 +126,7 @@ struct pv_addr kernelstack; struct pv_addr minidataclean; /* Static device mappings. */ -static const struct pmap_devmap ixp425_devmap[] = { +static const struct arm_devmap_entry ixp425_devmap[] = { /* Physical/Virtual address for I/O space */ { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, @@ -158,7 +159,7 @@ static const struct pmap_devmap ixp425_devmap[] = { }; /* Static device mappings. */ -static const struct pmap_devmap ixp435_devmap[] = { +static const struct arm_devmap_entry ixp435_devmap[] = { /* Physical/Virtual address for I/O space */ { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, @@ -368,9 +369,9 @@ initarm(struct arm_boot_params *abp) pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); if (cpu_is_ixp43x()) - pmap_devmap_bootstrap(l1pagetable, ixp435_devmap); + arm_devmap_bootstrap(l1pagetable, ixp435_devmap); else - pmap_devmap_bootstrap(l1pagetable, ixp425_devmap); + arm_devmap_bootstrap(l1pagetable, ixp425_devmap); /* * Give the XScale global cache clean code an appropriately * sized chunk of unmapped VA space starting at 0xff000000 |
