From owner-svn-src-projects@FreeBSD.ORG Tue Apr 3 02:16:22 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 745641065743; Tue, 3 Apr 2012 02:16:22 +0000 (UTC) (envelope-from jceel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8338FC15; Tue, 3 Apr 2012 02:16:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q332GM7L026451; Tue, 3 Apr 2012 02:16:22 GMT (envelope-from jceel@svn.freebsd.org) Received: (from jceel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q332GMp1026449; Tue, 3 Apr 2012 02:16:22 GMT (envelope-from jceel@svn.freebsd.org) Message-Id: <201204030216.q332GMp1026449@svn.freebsd.org> From: Jakub Wojciech Klama Date: Tue, 3 Apr 2012 02:16:22 +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: r233822 - projects/armv6/sys/dev/fdt 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: Tue, 03 Apr 2012 02:16:22 -0000 Author: jceel Date: Tue Apr 3 02:16:21 2012 New Revision: 233822 URL: http://svn.freebsd.org/changeset/base/233822 Log: Remove useless and wrong piece of code in fdt_get_range() which overwrites passed phandle_t node. Modify debug printf in fdt_reg_to_rl() to be consistent (that is, print start and end *virtual* addresses). Modified: projects/armv6/sys/dev/fdt/fdt_common.c Modified: projects/armv6/sys/dev/fdt/fdt_common.c ============================================================================== --- projects/armv6/sys/dev/fdt/fdt_common.c Mon Apr 2 22:54:31 2012 (r233821) +++ projects/armv6/sys/dev/fdt/fdt_common.c Tue Apr 3 02:16:21 2012 (r233822) @@ -70,22 +70,6 @@ fdt_get_range(phandle_t node, int range_ pcell_t addr_cells, size_cells, par_addr_cells; int len, tuple_size, tuples; - /* - * Try to access the SOC node directly i.e. through /aliases/. - */ - if ((node = OF_finddevice("soc")) != -1) - if (fdt_is_compatible_strict(node, "simple-bus")) - goto moveon; - /* - * Find the node the long way. - */ - if ((node = OF_finddevice("/")) == -1) - return (ENXIO); - - if ((node = fdt_find_compatible(node, "simple-bus", 1)) == 0) - return (ENXIO); - -moveon: if ((fdt_addrsize_cells(node, &addr_cells, &size_cells)) != 0) return (ENXIO); /* @@ -474,7 +458,7 @@ fdt_reg_to_rl(phandle_t node, struct res panic("Couldn't map the device memory"); end = vaddr + count - 1; - debugf("reg addr start = %lx, end = %lx, count = %lx\n", start, + debugf("reg addr start = %lx, end = %lx, count = %lx\n", vaddr, end, count); resource_list_add(rl, SYS_RES_MEMORY, i, vaddr, end,