From owner-svn-src-head@FreeBSD.ORG Wed Jan 21 04:06:38 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2FAC36C; Wed, 21 Jan 2015 04:06:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CFAA0DC6; Wed, 21 Jan 2015 04:06:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0L46biM036171; Wed, 21 Jan 2015 04:06:37 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0L46a5C036167; Wed, 21 Jan 2015 04:06:36 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201501210406.t0L46a5C036167@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 21 Jan 2015 04:06:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277473 - in head/sys/arm: arm include versatile X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2015 04:06:38 -0000 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: