Author: ian
Date: Wed Jan 21 04:06:36 2015
New Revision: 277473
URL: https://svnweb.freebsd.org/changeset/base/277473
Log:
The versatile platform had two copies of a bus_space that are essentially
duplicates of the standard arm base bus_space, so just use it.
Deleted:
head/sys/arm/versatile/bus_space.c
head/sys/arm/versatile/versatile_pci_bus_space.c
head/sys/arm/versatile/versatile_pci_bus_space.h
Modified:
head/sys/arm/arm/bus_space_base.c
head/sys/arm/include/bus.h
head/sys/arm/versatile/files.versatile
head/sys/arm/versatile/versatile_pci.c
Modified: head/sys/arm/arm/bus_space_base.c
==============================================================================
--- head/sys/arm/arm/bus_space_base.c Wed Jan 21 03:44:29 2015
(r277472)
+++ head/sys/arm/arm/bus_space_base.c Wed Jan 21 04:06:36 2015
(r277473)
@@ -45,7 +45,7 @@ bs_protos(generic);
* The bus space tag. This is constant for all instances, so
* we never have to explicitly "create" it.
*/
-static struct bus_space arm_base_tag = {
+static struct bus_space arm_base_bus_space = {
/* privdata is whatever the implementer wants; unused in base tag */
.bs_privdata = NULL,
@@ -153,5 +153,7 @@ static struct bus_space arm_base_tag = {
};
#ifdef FDT
-bus_space_tag_t fdtbus_bs_tag = &arm_base_tag;
+bus_space_tag_t fdtbus_bs_tag = &arm_base_bus_space;
#endif
+
+bus_space_tag_t arm_base_bs_tag = &arm_base_bus_space;
Modified: head/sys/arm/include/bus.h
==============================================================================
--- head/sys/arm/include/bus.h Wed Jan 21 03:44:29 2015 (r277472)
+++ head/sys/arm/include/bus.h Wed Jan 21 04:06:36 2015 (r277473)
@@ -245,6 +245,7 @@ struct bus_space {
bus_size_t, const uint64_t *, bus_size_t);
};
+extern bus_space_tag_t arm_base_bs_tag;
/*
* Utility macros; INTERNAL USE ONLY.
Modified: head/sys/arm/versatile/files.versatile
==============================================================================
--- head/sys/arm/versatile/files.versatile Wed Jan 21 03:44:29 2015
(r277472)
+++ head/sys/arm/versatile/files.versatile Wed Jan 21 04:06:36 2015
(r277473)
@@ -1,5 +1,6 @@
# $FreeBSD$
+arm/arm/bus_space_base.c standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_arm11.S standard
@@ -7,14 +8,12 @@ arm/arm/cpufunc_asm_arm11x6.S standard
arm/arm/cpufunc_asm_armv5.S standard
arm/arm/cpufunc_asm_armv6.S standard
-arm/versatile/bus_space.c standard
arm/versatile/pl050.c optional sc
arm/versatile/sp804.c standard
arm/versatile/versatile_machdep.c standard
arm/versatile/versatile_clcd.c optional sc
arm/versatile/versatile_common.c standard
arm/versatile/versatile_pci.c optional pci
-arm/versatile/versatile_pci_bus_space.c optional pci
arm/versatile/versatile_sic.c standard
arm/versatile/versatile_timer.c standard
Modified: head/sys/arm/versatile/versatile_pci.c
==============================================================================
--- head/sys/arm/versatile/versatile_pci.c Wed Jan 21 03:44:29 2015
(r277472)
+++ head/sys/arm/versatile/versatile_pci.c Wed Jan 21 04:06:36 2015
(r277473)
@@ -355,7 +355,7 @@ versatile_pci_activate_resource(device_t
vaddr = (vm_offset_t)pmap_mapdev(rman_get_start(r),
rman_get_size(r));
rman_set_bushandle(r, vaddr);
- rman_set_bustag(r, versatile_bus_space_pcimem);
+ rman_set_bustag(r, arm_base_bs_tag);
res = rman_activate_resource(r);
break;
case SYS_RES_IRQ:
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
