svn commit: r295143 - in head/sys/arm: annapurna/alpine include mv mv/orion versatile

[Svatopluk Kraus]

Author: skra
Date: Tue Feb  2 10:32:45 2016
New Revision: 295143
URL: https://svnweb.freebsd.org/changeset/base/295143

Log:
  Remove all remaining references to old and not more used struct
  pmap_devmap, pmap_devmap_bootstrap() and pmap_devmap[]. It was
  replaced in r257660.

Modified:
  head/sys/arm/annapurna/alpine/alpine_machdep.c
  head/sys/arm/include/pmap-v6.h
  head/sys/arm/mv/mv_common.c
  head/sys/arm/mv/mv_machdep.c
  head/sys/arm/mv/orion/db88f5xxx.c
  head/sys/arm/versatile/versatile_machdep.c

Modified: head/sys/arm/annapurna/alpine/alpine_machdep.c
==============================================================================
--- head/sys/arm/annapurna/alpine/alpine_machdep.c	Tue Feb  2 10:28:56 2016	(r295142)
+++ head/sys/arm/annapurna/alpine/alpine_machdep.c	Tue Feb  2 10:32:45 2016	(r295143)
@@ -123,7 +123,7 @@ platform_late_init(void)
 }
 
 /*
- * Construct pmap_devmap[] with DT-derived config data.
+ * Construct devmap table with DT-derived config data.
  */
 int
 platform_devmap_init(void)

Modified: head/sys/arm/include/pmap-v6.h
==============================================================================
--- head/sys/arm/include/pmap-v6.h	Tue Feb  2 10:28:56 2016	(r295142)
+++ head/sys/arm/include/pmap-v6.h	Tue Feb  2 10:32:45 2016	(r295143)
@@ -225,20 +225,6 @@ pmap_map_chunk(vm_offset_t l1pt, vm_offs
 	pmap_preboot_map_attr(pa, va, size, prot, cache);
 }
 
-/*
- * This structure is used by machine-dependent code to describe
- * static mappings of devices, created at bootstrap time.
- */
-struct pmap_devmap {
-	vm_offset_t	pd_va;		/* virtual address */
-	vm_paddr_t	pd_pa;		/* physical address */
-	vm_size_t	pd_size;	/* size of region */
-	vm_prot_t	pd_prot;	/* protection code */
-	int		pd_cache;	/* cache attributes */
-};
-
-void pmap_devmap_bootstrap(const struct pmap_devmap *);
-
 #endif	/* _KERNEL */
 
 // ----------------- TO BE DELETED ---------------------------------------------

Modified: head/sys/arm/mv/mv_common.c
==============================================================================
--- head/sys/arm/mv/mv_common.c	Tue Feb  2 10:28:56 2016	(r295142)
+++ head/sys/arm/mv/mv_common.c	Tue Feb  2 10:32:45 2016	(r295143)
@@ -377,7 +377,7 @@ soc_id(uint32_t *dev, uint32_t *rev)
 	 * Notice: system identifiers are available in the registers range of
 	 * PCIE controller, so using this function is only allowed (and
 	 * possible) after the internal registers range has been mapped in via
-	 * pmap_devmap_bootstrap().
+	 * arm_devmap_bootstrap().
 	 */
 	*dev = bus_space_read_4(fdtbus_bs_tag, MV_PCIE_BASE, 0) >> 16;
 	*rev = bus_space_read_4(fdtbus_bs_tag, MV_PCIE_BASE, 8) & 0xff;

Modified: head/sys/arm/mv/mv_machdep.c
==============================================================================
--- head/sys/arm/mv/mv_machdep.c	Tue Feb  2 10:28:56 2016	(r295142)
+++ head/sys/arm/mv/mv_machdep.c	Tue Feb  2 10:32:45 2016	(r295143)
@@ -337,7 +337,7 @@ __weak_reference(mv_default_fdt_pci_devm
  */
 
 /*
- * Construct pmap_devmap[] with DT-derived config data.
+ * Construct devmap table with DT-derived config data.
  */
 int
 platform_devmap_init(void)

Modified: head/sys/arm/mv/orion/db88f5xxx.c
==============================================================================
--- head/sys/arm/mv/orion/db88f5xxx.c	Tue Feb  2 10:28:56 2016	(r295142)
+++ head/sys/arm/mv/orion/db88f5xxx.c	Tue Feb  2 10:32:45 2016	(r295143)
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 int platform_pci_get_irq(u_int bus, u_int slot, u_int func, u_int pin);
 
 /* Static device mappings. */
-const struct pmap_devmap pmap_devmap[] = {
+const struct arm_devmap_entry db88f5xxx_devmap[] = {
 	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.

Modified: head/sys/arm/versatile/versatile_machdep.c
==============================================================================
--- head/sys/arm/versatile/versatile_machdep.c	Tue Feb  2 10:28:56 2016	(r295142)
+++ head/sys/arm/versatile/versatile_machdep.c	Tue Feb  2 10:32:45 2016	(r295143)
@@ -88,7 +88,7 @@ static struct arm_devmap_entry fdt_devma
 
 
 /*
- * Construct pmap_devmap[] with DT-derived config data.
+ * Construct devmap table with DT-derived config data.
  */
 int
 platform_devmap_init(void)