From owner-p4-projects@FreeBSD.ORG Tue Dec 15 22:35:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 222F31065676; Tue, 15 Dec 2009 22:35:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB05B106566B for ; Tue, 15 Dec 2009 22:35:43 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C93C38FC18 for ; Tue, 15 Dec 2009 22:35:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBFMZhkI073079 for ; Tue, 15 Dec 2009 22:35:43 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBFMZhFR073077 for perforce@freebsd.org; Tue, 15 Dec 2009 22:35:43 GMT (envelope-from raj@freebsd.org) Date: Tue, 15 Dec 2009 22:35:43 GMT Message-Id: <200912152235.nBFMZhFR073077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2009 22:35:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=171818 Change 171818 by raj@raj_fdt on 2009/12/15 22:35:36 Allow for translation of internal FDT phandles via OF_instance_to_package(). This slighly abuses the OF_* i/f as FDT does not really have the notion of instances, but lets us get away with a uniform way of handling internal FDT offsets at the consumer level; this is needed in some specific cases like interrupt domain graph traversal. Affected files ... .. //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#2 edit Differences ... ==== //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#2 (text+ko) ==== @@ -201,8 +201,7 @@ ofw_fdt_parent(ofw_t ofw, phandle_t node) { phandle_t p; - int offset; - int paroffset; + int offset, paroffset; offset = fdt_phandle_offset(node); if (offset < 0) @@ -217,8 +216,22 @@ static phandle_t ofw_fdt_instance_to_package(ofw_t ofw, ihandle_t instance) { + phandle_t p; + int offset; - return (0); + /* + * Note: FDT does not have the notion of instances, but we somewhat + * abuse the semantics and let treat as 'instance' the internal + * 'phandle' prop, so that ofw I/F consumers have a uniform way of + * translation between internal representation (which appear in some + * contexts as property values) and effective phandles. + */ + offset = fdt_node_offset_by_phandle(fdtp, instance); + if (offset < 0) + return (0); + + p = (phandle_t)fdt_offset_ptr(fdtp, offset, sizeof(phandle_t)); + return (p); } /* Get the length of a property of a package. */