len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-14 00:37:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pylibfdt/libfdt.i: fix backwards compatibility of return values

Browse source 
When our Python functions wrap `fdt_getprop()` they return a list
containing `[*data, length]`.

In SWIG v4.2 and earlier SWIG would discard `*data` if it is NULL/None.
Causing the return value to just be `length`.

But starting in SWIG v4.3 it no longer discards `*data`. So the return
value is now `[None, length]`.

Handle this compatibility issue in libfdt.i by checking if the return
value looks like the older 4.2 return value, and casting it to the newer
style.

See https://github.com/swig/swig/pull/2907

Signed-off-by: Brandon Maier <brandon.maier@gmail.com>
This commit is contained in:
Brandon Maier 2024-11-24 15:48:04 -06:00
parent 2d10aa2afe
commit d0b4125184
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
pylibfdt/libfdt.i
View file

@ -114,11 +114,14 @@ def check_err_null(val, quiet=()):
FdtException if val indicates an error was reported and the error FdtException if val indicates an error was reported and the error
is not in @quiet. is not in @quiet.
""" """
# Normally a list is returned which contains the data and its length. # Compatibility for SWIG v4.2 and earlier. SWIG 4.2 would drop the first
# If we get just an integer error code, it means the function failed. # item from the list if it was None, returning only the second item.
if not isinstance(val, list): if not isinstance(val, list):
if -val not in quiet: val = [None, val]
raise FdtException(val)
if val[0] is None:
if -val[1] not in quiet:
raise FdtException(val[1])
return val return val
class FdtRo(object): class FdtRo(object):
@ -395,8 +398,8 @@ class FdtRo(object):
""" """
pdata = check_err_null( pdata = check_err_null(
fdt_get_property_by_offset(self._fdt, prop_offset), quiet) fdt_get_property_by_offset(self._fdt, prop_offset), quiet)
if isinstance(pdata, (int)): if pdata[0] is None:
return pdata return pdata[1]
return Property(pdata[0], pdata[1]) return Property(pdata[0], pdata[1])
def getprop(self, nodeoffset, prop_name, quiet=()): def getprop(self, nodeoffset, prop_name, quiet=()):
@ -417,8 +420,8 @@ class FdtRo(object):
""" """
pdata = check_err_null(fdt_getprop(self._fdt, nodeoffset, prop_name), pdata = check_err_null(fdt_getprop(self._fdt, nodeoffset, prop_name),
quiet) quiet)
if isinstance(pdata, (int)): if pdata[0] is None:
return pdata return pdata[1]
return Property(prop_name, bytearray(pdata[0])) return Property(prop_name, bytearray(pdata[0]))
def hasprop(self, nodeoffset, prop_name, quiet=()): def hasprop(self, nodeoffset, prop_name, quiet=()):
@ -444,10 +447,10 @@ class FdtRo(object):
""" """
pdata = check_err_null(fdt_getprop(self._fdt, nodeoffset, prop_name), pdata = check_err_null(fdt_getprop(self._fdt, nodeoffset, prop_name),
quiet + (NOTFOUND,)) quiet + (NOTFOUND,))
if isinstance(pdata, (int)): if pdata[0] is None:
if pdata == -NOTFOUND: if pdata[1] == -NOTFOUND:
return False return False
return pdata return pdata[1]
return True return True
def get_phandle(self, nodeoffset): def get_phandle(self, nodeoffset):