From patchwork Mon Sep 10 00:20:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: crwulff@gmail.com X-Patchwork-Id: 182762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A35042C009D for ; Mon, 10 Sep 2012 10:42:53 +1000 (EST) Received: from localhost ([::1]:39550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TArky-0007VE-3z for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 20:21:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TArj1-0006Gx-Vk for qemu-devel@nongnu.org; Sun, 09 Sep 2012 20:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TArj0-0001zr-Mu for qemu-devel@nongnu.org; Sun, 09 Sep 2012 20:19:39 -0400 Received: from mail-vb0-f45.google.com ([209.85.212.45]:47216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TArj0-0001yN-Hz for qemu-devel@nongnu.org; Sun, 09 Sep 2012 20:19:38 -0400 Received: by mail-vb0-f45.google.com with SMTP id p1so1862449vbi.4 for ; Sun, 09 Sep 2012 17:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=KPWGUrBF7D6Xw1cFWq/ifmO5RtPsVLyR5VzsIdsQLJE=; b=e7ZZUa/VWbThn7L3juIi5HpC/xRYHVUF8+KrkRQx0xJTBep/ldhy+X3hD9Cr45Yh4a teyOLoBHdhkdVvtxnsq8rNh/1DlC3tJTHQrBetjbxy7+gQiGotPuwCCnr+TNHTRqw2O9 sXnEULmesSEBMsAfYRGQTMoieTfVfvEvPyDtt1zhtlCQKwgiW8wf0xZgFPMoq40o6n7/ rkghB8oaKF1Y1uwfeq64oi5s1uGXy/3N04olsZIF+9GZSGzCJUNgLxOaBUrUuwBu/ZrL Ji+XBbosoDh34fL39073zGgWm0+RDi1tejySHPOpOFJGzh8VJWS5/b5WUEi8K5OeNUpb +siw== Received: by 10.52.28.173 with SMTP id c13mr12629178vdh.48.1347236378423; Sun, 09 Sep 2012 17:19:38 -0700 (PDT) Received: from localhost.localdomain (cpe-67-244-159-59.rochester.res.rr.com. [67.244.159.59]) by mx.google.com with ESMTPS id l8sm7515390veu.6.2012.09.09.17.19.36 (version=SSLv3 cipher=OTHER); Sun, 09 Sep 2012 17:19:37 -0700 (PDT) From: crwulff@gmail.com To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 20:20:03 -0400 Message-Id: <1347236407-10465-6-git-send-email-crwulff@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347236407-10465-1-git-send-email-crwulff@gmail.com> References: <1347236407-10465-1-git-send-email-crwulff@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.45 X-Mailman-Approved-At: Sun, 09 Sep 2012 20:21:31 -0400 Cc: Chris Wulff Subject: [Qemu-devel] [PATCH 5/9] FDT: Add additional access methods for array types and walking children. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chris Wulff Signed-off-by: Chris Wulff --- device_tree.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ device_tree.h | 18 ++++++++++++ 2 files changed, 106 insertions(+) diff --git a/device_tree.c b/device_tree.c index d7a9b6b..7fa7646 100644 --- a/device_tree.c +++ b/device_tree.c @@ -27,6 +27,14 @@ #include +#define CHECK_HEADER(fdt) \ + { \ + int err = fdt_check_header(fdt); \ + if (err != 0) { \ + return err; \ + } \ + } + #define FDT_MAX_SIZE 0x10000 void *create_device_tree(int *sizep) @@ -304,3 +312,83 @@ int qemu_devtree_add_subnode(void *fdt, const char *name) g_free(dupname); return retval; } + +int qemu_devtree_node_offset(void *fdt, const char *node_path) +{ + return fdt_path_offset(fdt, node_path); +} + +int qemu_devtree_subnode_offset_namelen(void *fdt, int parentoffset, + const char *name, int namelen) +{ + return fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen); +} + +int qemu_devtree_next_child_offset(void *fdt, int parentoffset, int childoffset) +{ + int level = 0; + uint32_t tag; + int offset, nextoffset; + + CHECK_HEADER(fdt); + tag = fdt_next_tag(fdt, parentoffset, &nextoffset); + if (tag != FDT_BEGIN_NODE) { + return -FDT_ERR_BADOFFSET; + } + + do { + offset = nextoffset; + tag = fdt_next_tag(fdt, offset, &nextoffset); + + switch (tag) { + case FDT_END: + return -FDT_ERR_TRUNCATED; + + case FDT_BEGIN_NODE: + level++; + if (level != 1) { + continue; + } + if (offset > childoffset) { + return offset; + } + break; + + case FDT_END_NODE: + level--; + break; + + case FDT_PROP: + case FDT_NOP: + break; + + default: + return -FDT_ERR_BADSTRUCTURE; + } + } while (level >= 0); + + return -FDT_ERR_NOTFOUND; +} + +const char *qemu_devtree_get_name(const void *fdt, int nodeoffset, int *lenp) +{ + return fdt_get_name(fdt, nodeoffset, lenp); +} + +const void *qemu_devtree_getprop_offset(const void *fdt, int nodeoffset, + const char *name, int *lenp) +{ + return fdt_getprop(fdt, nodeoffset, name, lenp); +} + +uint32_t qemu_devtree_int_array_index(const void *propval, unsigned int index) +{ + return be32_to_cpu(((uint32_t *)propval)[index]); +} + +int qemu_devtree_node_check_compatible(const void *fdt, int nodeoffset, + const char *compatible) +{ + return fdt_node_check_compatible(fdt, nodeoffset, compatible); +} + diff --git a/device_tree.h b/device_tree.h index f7a3e6c..e01b460 100644 --- a/device_tree.h +++ b/device_tree.h @@ -49,4 +49,22 @@ int qemu_devtree_add_subnode(void *fdt, const char *name); sizeof(qdt_tmp)); \ } while (0) +int qemu_devtree_node_offset(void *fdt, const char *node_path); + +int qemu_devtree_subnode_offset_namelen(void *fdt, int parentoffset, + const char *name, int namelen); + +int qemu_devtree_next_child_offset(void *fdt, int parentoffset, + int childoffset); + +const char *qemu_devtree_get_name(const void *fdt, int nodeoffset, int *lenp); + +const void *qemu_devtree_getprop_offset(const void *fdt, int nodeoffset, + const char *name, int *lenp); + +uint32_t qemu_devtree_int_array_index(const void *propval, unsigned int index); + +int qemu_devtree_node_check_compatible(const void *fdt, int nodeoffset, + const char *compatible); + #endif /* __DEVICE_TREE_H__ */