libfdt: Make fdt_check_header() public
PATCH 1/2 libfdt: Make fdt_check_header() public
Changed _fdt_check_header() to fdt_check_header() and made it part of the interface - it is a useful routine.
Also did some asthetics cleanup to the include files (headers).
Signed-off-by Gerald Van Baren <[email protected]>
--- include/fdt.h | 19 +++++++++++++++++++ include/libfdt.h | 7 +++++-- include/libfdt_env.h | 20 ++++++++++++++++++++ libfdt/fdt.c | 4 ++-- libfdt/fdt_ro.c | 4 ++-- libfdt/fdt_rw.c | 2 +- 6 files changed, 49 insertions(+), 7 deletions(-)
include/fdt.h +19 -0
@@ -1,3 +1,22 @@ +/* +* libfdt - Flat Device Tree manipulation +* Copyright (C) 2006 David Gibson, IBM Corporation. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public License +* as published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#ifndef _FDT_H#define _FDT_H
include/libfdt.h +5 -2
@@ -1,5 +1,3 @@ -#ifndef _LIBFDT_H -#define _LIBFDT_H/* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -19,6 +17,9 @@* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef _LIBFDT_H +#define _LIBFDT_H +#include <fdt.h> #include <libfdt_env.h>
@@ -60,6 +61,8 @@#define fdt_set_header (fdt, field, val) \ ((struct fdt_header *)(fdt))->field = cpu_to_fdt32(val) +int fdt_check_header (const void *fdt); +void *fdt_offset_ptr (const void *fdt,int offset,int checklen);#define fdt_offset_ptr_typed (fdt, offset, var) \
include/libfdt_env.h +20 -0
@@ -1,3 +1,23 @@ +/* +* libfdt - Flat Device Tree manipulation (build/run environment adaptation) +* Copyright (C) 2007 Gerald Van Baren, Custom IDEAS, vanbaren at cideas.com +* Original version written by David Gibson, IBM Corporation. +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public License +* as published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#ifndef _LIBFDT_ENV_H#define _LIBFDT_ENV_H
libfdt/fdt.c +2 -2
@@ -23,7 +23,7 @@#include "libfdt_internal.h" -int _fdt_check_header (const void *fdt) +int fdt_check_header (const void *fdt) {if (fdt_magic (fdt) ==FDT_MAGIC ) {/* Complete tree */
@@ -72,7 +72,7 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)int fdt_move (const void *fdt,void *buf,int bufsize) { -int err =_fdt_check_header (fdt); +int err =fdt_check_header (fdt);if (err)return err;
libfdt/fdt_ro.c +2 -2
@@ -25,7 +25,7 @@#define CHECK_HEADER (fdt) { \ int err; \ - if ((err = _fdt_check_header(fdt)) != 0) \ + if ((err = fdt_check_header(fdt)) != 0) \ return err; \ }
@@ -188,7 +188,7 @@ struct fdt_property *fdt_get_property(const void *fdt,int offset, nextoffset;int err; -if ((err =_fdt_check_header (fdt)) !=0 ) +if ((err =fdt_check_header (fdt)) !=0 ) goto fail; err = -FDT_ERR_BADOFFSET ;
libfdt/fdt_rw.c +1 -1
@@ -27,7 +27,7 @@ static int rw_check_header(void *fdt) {int err; -if ((err =_fdt_check_header (fdt))) +if ((err =fdt_check_header (fdt)))return err;if (fdt_version (fdt) <0x11 )return -FDT_ERR_BADVERSION ;
Signature · 1 line
1.4.4.4