On Sat, Aug 19, 2017 at 11:18:00AM -0600, Simon Glass wrote: > When calling libfdt functions which are not supported by the Fdt class it > is necessary to get direct access to the device tree data. At present this > requries using the internal _fdt member. Add a new method to provide > public access to this. > > Signed-off-by: Simon Glass <sjg@xxxxxxxxxxxx> I've applied patches 1-6 already. This looks fine, except I'm dubious about the name. "get_fdt" from an fdt object seems a bit.. tautological? How about "as_bytestring"? > --- > > pylibfdt/libfdt.i | 11 +++++++++++ > tests/pylibfdt_tests.py | 5 +++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/pylibfdt/libfdt.i b/pylibfdt/libfdt.i > index d492d58..1f6809e 100644 > --- a/pylibfdt/libfdt.i > +++ b/pylibfdt/libfdt.i > @@ -174,6 +174,17 @@ class Fdt: > self._fdt = bytearray(data) > check_err(fdt_check_header(self._fdt)); > > + def get_fdt(self): > + """Get the device tree contents as a bytearray > + > + This can be passed directly to libfdt functions that access a > + const void * for the device tree. > + > + Returns: > + bytearray containing the device tree > + """ > + return self._fdt > + > def path_offset(self, path, quiet=()): > """Get the offset for a given path > > diff --git a/tests/pylibfdt_tests.py b/tests/pylibfdt_tests.py > index 8028c1a..a775d37 100644 > --- a/tests/pylibfdt_tests.py > +++ b/tests/pylibfdt_tests.py > @@ -285,9 +285,10 @@ class PyLibfdtTests(unittest.TestCase): > > def testIntegers(self): > """Check that integers can be passed and returned""" > - self.assertEquals(0, libfdt.fdt_get_phandle(self.fdt._fdt, 0)) > + self.assertEquals(0, libfdt.fdt_get_phandle(self.fdt.get_fdt(), 0)) > node2 = self.fdt.path_offset('/subnode@2') > - self.assertEquals(0x2000, libfdt.fdt_get_phandle(self.fdt._fdt, node2)) > + self.assertEquals(0x2000, > + libfdt.fdt_get_phandle(self.fdt.get_fdt(), node2)) > > def testGetPhandle(self): > """Test for the get_phandle() method""" -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature