tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_external_dtc/tests/del_node.c

111 lines
3.3 KiB
C
Raw Normal View History

tests: Replace license boilerplate with SPDX tags Replace instances in tests of mostly LGPL-2.1 license boilerplate with SPDX tags. Signed-off-by: Rob Herring <robh@kernel.org> Message-Id: <20190620211944.9378-5-robh@kernel.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2019-06-20 23:19:41 +02:00
// SPDX-License-Identifier: LGPL-2.1-or-later
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
/*
* libfdt - Flat Device Tree manipulation
* Testcase for fdt_nop_node()
* Copyright (C) 2006 David Gibson, IBM Corporation.
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
libfdt: Remove #includes from fdt.h At present fdt.h #includes stdint.h. This makes some sense, because fdt.h uses the standard fixed-width integer types. However, this can make life difficult when building in different environments which may not have a stdint.h. Therefore, this patch removes the #include from fdt.h, instead requiring that users of fdt.h define the fixed-width integer types before including fdt.h, either by themselves including stdint.h, or by any other means.
2007-03-23 05:16:54 +01:00
#include <stdint.h>
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
#include <libfdt.h>
#include "tests.h"
#include "testdata.h"
int main(int argc, char *argv[])
{
libfdt: Use void * to refer to device tree blobs At present, the blob containing a device tree is passed to the various fdt_*() functions as a (struct fdt_header *) i.e. a pointer to the header structure at the beginning of the blob. This patch changes all the functions so that they instead take a (void *) pointing to the blob. Under some circumstances can avoid the need for the caller to cast a blob pointer into a (struct fdt_header *) before passing it to the fdt_*() functions. Using a (void *) also reduce the temptation for users of the library to directly dereference toe (struct fdt_header *) to access header fields. Instead they must use the fdt_get_header() or fdt_set_header() macros, or the fdt_magic(), fdt_totalsize() etc. wrappers around them which are safer, since they will always handle endian conversion. With this change, the whole-tree moving, or manipulating functions: fdt_move(), fdt_open_into() and fdt_pack() no longer need to return a pointer to the "new" tree. The given (void *) buffer pointer they take can instead be used directly by the caller as the new tree. Those functions are thus changed to instead return an error code (which in turn reduces the number of functions using the ugly encoding of error values into pointers). Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:47 +01:00
void *fdt;
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
int subnode1_offset, subnode2_offset, subsubnode2_offset;
int err;
int oldsize, delsize, newsize;
test_init(argc, argv);
fdt = load_blob_arg(argc, argv);
libfdt: Handle v16 and re-ordered trees for r/w Currently all the read/write functions in libfdt require that the given tree be v17, and further, that the tree has the memory reservation block, structure block and strings block stored in that physical order. This patch eases these constraints, by making fdt_open_int() reorder the blocks, and/or convert the tree to v17, so that it will then be ready for the other read-write functions. It also extends fdt_pack() to actually remove any gaps between blocks that might be present. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-01 01:37:31 +01:00
fdt = open_blob_rw(fdt);
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
oldsize = fdt_totalsize(fdt);
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subnode1_offset = fdt_path_offset(fdt, "/subnode@1");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subnode1_offset < 0)
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
FAIL("Couldn't find \"/subnode@1\": %s",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subnode1_offset));
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
check_getprop_cell(fdt, subnode1_offset, "prop-int", TEST_VALUE_1);
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subnode2_offset = fdt_path_offset(fdt, "/subnode@2");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subnode2_offset < 0)
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
FAIL("Couldn't find \"/subnode@2\": %s",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subnode2_offset));
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
check_getprop_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subsubnode2_offset < 0)
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
FAIL("Couldn't find \"/subnode@2/subsubnode\": %s",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subsubnode2_offset));
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
check_getprop_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
err = fdt_del_node(fdt, subnode1_offset);
if (err)
FAIL("fdt_del_node(subnode1): %s", fdt_strerror(err));
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subnode1_offset = fdt_path_offset(fdt, "/subnode@1");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subnode1_offset != -FDT_ERR_NOTFOUND)
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
FAIL("fdt_path_offset(subnode1) returned \"%s\" instead of \"%s\"",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subnode1_offset),
fdt_strerror(-FDT_ERR_NOTFOUND));
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subnode2_offset = fdt_path_offset(fdt, "/subnode@2");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subnode2_offset < 0)
FAIL("Couldn't find \"/subnode2\": %s",
fdt_strerror(subnode2_offset));
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
check_getprop_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subsubnode2_offset < 0)
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
FAIL("Couldn't find \"/subnode@2/subsubnode\": %s",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subsubnode2_offset));
libfdt: Abolish _typed() variants, add _cell() variants In a number of places through libfdt and its tests, we have *_typed() macro variants on functions which use gcc's typeof and statement expression extensions to allow passing literals where the underlying function takes a buffer and size. These seemed like a good idea at the time, but in fact they have some problems. They use typeof and statement expressions, extensions I'd prefer to avoid for portability. Plus, they have potential gotchas - although they'll deal with the size of the thing passed, they won't deal with other representation issues (like endianness) and results could be very strange if the type of the expression passed isn't what you think it is. In fact, the only users of these _typed() macros were when the value passed is a single cell (32-bit integer). Therefore, this patch removes all these _typed() macros and replaces them with explicit _cell() variants which handle a single 32-bit integer, and which also perform endian convesions as appropriate. With this in place, it now becomes easy to use standardized big-endian representation for integer valued properties in the testcases, regardless of the platform we're running on. We therefore do that, which has the additional advantage that all the example trees created during a test run are now byte-for-byte identical regardless of platform. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-20 03:35:46 +01:00
check_getprop_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
err = fdt_del_node(fdt, subnode2_offset);
if (err)
FAIL("fdt_del_node(subnode2): %s", fdt_strerror(err));
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subnode1_offset = fdt_path_offset(fdt, "/subnode@1");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subnode1_offset != -FDT_ERR_NOTFOUND)
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
FAIL("fdt_path_offset(subnode1) returned \"%s\" instead of \"%s\"",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subnode1_offset),
fdt_strerror(-FDT_ERR_NOTFOUND));
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subnode2_offset = fdt_path_offset(fdt, "/subnode@2");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subnode2_offset != -FDT_ERR_NOTFOUND)
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
FAIL("fdt_path_offset(subnode2) returned \"%s\" instead of \"%s\"",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subnode2_offset),
fdt_strerror(-FDT_ERR_NOTFOUND));
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
libfdt: Make unit address optional for finding nodes At present, the fdt_subnode_offset() and fdt_path_offset() functions in libfdt require the exact name of the nodes in question be passed, including unit address. This is contrary to traditional OF-like finddevice() behaviour, which allows the unit address to be omitted (which is useful when the device name is unambiguous without the address). This patch introduces similar behaviour to fdt_subnode_offset_namelen(), and hence to fdt_subnode_offset() and fdt_path_offset() which are implemented in terms of the former. The unit address can be omitted from the given node name. If this is ambiguous, the first such node in the flattened tree will be selected (this behaviour is consistent with IEEE1275 which specifies only that an arbitrary node matching the given information be selected). This very small change is then followed by many more diffs which change the test examples and testcases to exercise this behaviour. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-09-28 07:51:04 +02:00
subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
if (subsubnode2_offset != -FDT_ERR_NOTFOUND)
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
FAIL("fdt_path_offset(subsubnode2) returned \"%s\" instead of \"%s\"",
libfdt: More consistent handling of returned error codes. At present, libfdt functions returning a structure offset return a zero-or-positive offset on success, and return a negative error code on failure. Functions which only return an error code return a positive version of the error code, or 0 on success. This patch improves consistency by always returning negative error codes on failure, for both types of function. With this change, we do away with the special fdt_offset_error() macro for checking whether a returned offset value is an error and extracting the encoded error value within. Instead an explicit (ret_value < 0) is now the preferred way of checking return values for both offset-returning and error-code-returning functions. The fdt_strerror() function in the test code is updated correspondingly to make more sense with the new conventions. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:51 +01:00
fdt_strerror(subsubnode2_offset),
fdt_strerror(-FDT_ERR_NOTFOUND));
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
delsize = fdt_totalsize(fdt);
libfdt: Use void * to refer to device tree blobs At present, the blob containing a device tree is passed to the various fdt_*() functions as a (struct fdt_header *) i.e. a pointer to the header structure at the beginning of the blob. This patch changes all the functions so that they instead take a (void *) pointing to the blob. Under some circumstances can avoid the need for the caller to cast a blob pointer into a (struct fdt_header *) before passing it to the fdt_*() functions. Using a (void *) also reduce the temptation for users of the library to directly dereference toe (struct fdt_header *) to access header fields. Instead they must use the fdt_get_header() or fdt_set_header() macros, or the fdt_magic(), fdt_totalsize() etc. wrappers around them which are safer, since they will always handle endian conversion. With this change, the whole-tree moving, or manipulating functions: fdt_move(), fdt_open_into() and fdt_pack() no longer need to return a pointer to the "new" tree. The given (void *) buffer pointer they take can instead be used directly by the caller as the new tree. Those functions are thus changed to instead return an error code (which in turn reduces the number of functions using the ugly encoding of error values into pointers). Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2006-12-15 05:12:47 +01:00
err = fdt_pack(fdt);
if (err)
libfdt: Read-write support This patch adds support for random access, read-write support on flat trees.
2006-12-01 06:59:43 +01:00
FAIL("fdt_pack(): %s", fdt_strerror(err));
newsize = fdt_totalsize(fdt);
verbose_printf("oldsize = %d, delsize = %d, newsize = %d\n",
oldsize, delsize, newsize);
if (newsize >= oldsize)
FAIL("Tree failed to shrink after deletions");
PASS();
}
Reference in a new issue Copy permalink