From owner-svn-src-head@FreeBSD.ORG Tue Mar 19 14:15:42 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5C51A4FD; Tue, 19 Mar 2013 14:15:42 +0000 (UTC) (envelope-from ray@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4D31099F; Tue, 19 Mar 2013 14:15:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JEFgfI013516; Tue, 19 Mar 2013 14:15:42 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JEFg7h013515; Tue, 19 Mar 2013 14:15:42 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201303191415.r2JEFg7h013515@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 19 Mar 2013 14:15:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248509 - head/sys/dev/fdt 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.14 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: Tue, 19 Mar 2013 14:15:42 -0000 Author: ray Date: Tue Mar 19 14:15:41 2013 New Revision: 248509 URL: http://svnweb.freebsd.org/changeset/base/248509 Log: Return "start" and "end" to u_long world. Because rman handle addresses as u_long too. Discussed with: ian@ Pointy hat to: ray@ Modified: head/sys/dev/fdt/fdt_common.c Modified: head/sys/dev/fdt/fdt_common.c ============================================================================== --- head/sys/dev/fdt/fdt_common.c Tue Mar 19 14:13:12 2013 (r248508) +++ head/sys/dev/fdt/fdt_common.c Tue Mar 19 14:15:41 2013 (r248509) @@ -421,12 +421,11 @@ fdt_regsize(phandle_t node, u_long *base int fdt_reg_to_rl(phandle_t node, struct resource_list *rl) { - u_long count; + u_long end, count, start; pcell_t *reg, *regptr; pcell_t addr_cells, size_cells; int tuple_size, tuples; int i, rv; - bus_space_handle_t start, end; long busaddr, bussize; if (fdt_addrsize_cells(OF_parent(node), &addr_cells, &size_cells) != 0) @@ -447,8 +446,8 @@ fdt_reg_to_rl(phandle_t node, struct res regptr = reg; for (i = 0; i < tuples; i++) { - rv = fdt_data_to_res(reg, addr_cells, size_cells, - (u_long *)&start, &count); + rv = fdt_data_to_res(reg, addr_cells, size_cells, &start, + &count); if (rv != 0) { resource_list_free(rl); goto out;