From owner-svn-src-projects@FreeBSD.ORG Wed Apr 15 01:47:53 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 352631065672; Wed, 15 Apr 2009 01:47:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0982A8FC17; Wed, 15 Apr 2009 01:47:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F1lqQr026934; Wed, 15 Apr 2009 01:47:52 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3F1lq7g026933; Wed, 15 Apr 2009 01:47:52 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200904150147.n3F1lq7g026933@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 15 Apr 2009 01:47:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191083 - projects/mips/sys/mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 01:47:53 -0000 Author: gonzo Date: Wed Apr 15 01:47:52 2009 New Revision: 191083 URL: http://svn.freebsd.org/changeset/base/191083 Log: - Cleanout stale #ifdef'ed chunk of code - Fix whitespaces - Explicitly undefine NEXUS_DEBUG flag Modified: projects/mips/sys/mips/mips/nexus.c Modified: projects/mips/sys/mips/mips/nexus.c ============================================================================== --- projects/mips/sys/mips/mips/nexus.c Tue Apr 14 23:56:48 2009 (r191082) +++ projects/mips/sys/mips/mips/nexus.c Wed Apr 15 01:47:52 2009 (r191083) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include +#undef NEXUS_DEBUG #ifdef NEXUS_DEBUG #define dprintf printf #else @@ -77,20 +78,6 @@ struct nexus_device { static struct rman irq_rman; static struct rman mem_rman; -#ifdef notyet -/* - * XXX: TODO: Implement bus space barrier functions. - * Currently tag and handle are set when memory resources - * are activated. - */ -struct bus_space_tag nexus_bustag = { - NULL, /* cookie */ - NULL, /* parent bus tag */ - NEXUS_BUS_SPACE, /* type */ - nexus_bus_barrier, /* bus_space_barrier */ -}; -#endif - static struct resource * nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); @@ -386,22 +373,22 @@ nexus_activate_resource(device_t bus, de struct resource *r) { #ifdef TARGET_OCTEON - uint64_t temp; + uint64_t temp; #endif /* * If this is a memory resource, track the direct mapping * in the uncached MIPS KSEG1 segment. */ if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) { - caddr_t vaddr = 0; - u_int32_t paddr; - u_int32_t psize; - u_int32_t poffs; - - paddr = rman_get_start(r); - psize = rman_get_size(r); - poffs = paddr - trunc_page(paddr); - vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; + caddr_t vaddr = 0; + u_int32_t paddr; + u_int32_t psize; + u_int32_t poffs; + + paddr = rman_get_start(r); + psize = rman_get_size(r); + poffs = paddr - trunc_page(paddr); + vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; rman_set_virtual(r, vaddr); rman_set_bustag(r, MIPS_BUS_SPACE_MEM);