Revert "device: iterable supported devices"
This reverts commit 0c6588ff4793bc0684d37b43b81e5a1d174b41a8.
It's not clear that the supported devices are being properly computed,
so let's revert this for v2.7.0 until we've had more time to think
it through.
Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
diff --git a/scripts/gen_handles.py b/scripts/gen_handles.py
index c8354d9..4e5764f 100755
--- a/scripts/gen_handles.py
+++ b/scripts/gen_handles.py
@@ -246,19 +246,15 @@
hvi = 1
handle.dev_deps = []
handle.ext_deps = []
- handle.dev_sups = []
- hdls = handle.dev_deps
+ deps = handle.dev_deps
while hvi < len(hv):
h = hv[hvi]
if h == DEVICE_HANDLE_ENDS:
break
if h == DEVICE_HANDLE_SEP:
- if hdls == handle.dev_deps:
- hdls = handle.ext_deps
- else:
- hdls = handle.dev_sups
+ deps = handle.ext_deps
else:
- hdls.append(h)
+ deps.append(h)
n = edt
hvi += 1
@@ -271,7 +267,6 @@
for sn in used_nodes:
# Where we're storing the final set of nodes: these are all used
sn.__depends = set()
- sn.__supports = set()
deps = set(sn.depends_on)
debug("\nNode: %s\nOrig deps:\n\t%s" % (sn.path, "\n\t".join([dn.path for dn in deps])))
@@ -284,16 +279,7 @@
# forward the dependency up one level
for ddn in dn.depends_on:
deps.add(ddn)
- debug("Final deps:\n\t%s\n" % ("\n\t".join([ _dn.path for _dn in sn.__depends])))
-
- sups = set(sn.required_by)
- debug("\nOrig sups:\n\t%s" % ("\n\t".join([dn.path for dn in sups])))
- while len(sups) > 0:
- dn = sups.pop()
- if dn in used_nodes:
- # this is used
- sn.__supports.add(dn)
- debug("\nFinal sups:\n\t%s" % ("\n\t".join([dn.path for dn in sn.__supports])))
+ debug("final deps:\n\t%s\n" % ("\n\t".join([ _dn.path for _dn in sn.__depends])))
with open(args.output_source, "w") as fp:
fp.write('#include <device.h>\n')
@@ -304,7 +290,6 @@
assert hs, "no hs for %s" % (dev.sym.name,)
dep_paths = []
ext_paths = []
- sup_paths = []
hdls = []
sn = hs.node
@@ -315,7 +300,6 @@
dep_paths.append(dn.path)
else:
dep_paths.append('(%s)' % dn.path)
-
# Force separator to signal start of injected dependencies
hdls.append(DEVICE_HANDLE_SEP)
if len(hs.ext_deps) > 0:
@@ -323,16 +307,6 @@
ext_paths.extend(map(str, hs.ext_deps))
hdls.extend(hs.ext_deps)
- # Force separator to signal start of supported devices
- hdls.append(DEVICE_HANDLE_SEP)
- if len(hs.dev_sups) > 0:
- for dn in sn.required_by:
- if dn in sn.__supports:
- sup_paths.append(dn.path)
- else:
- sup_paths.append('(%s)' % dn.path)
- hdls.extend(dn.__device.dev_handle for dn in sn.__supports)
-
# When CONFIG_USERSPACE is enabled the pre-built elf is
# also used to get hashes that identify kernel objects by
# address. We can't allow the size of any object in the
@@ -349,14 +323,9 @@
]
if len(dep_paths) > 0:
- lines.append(' * Direct Dependencies:')
- lines.append(' * - %s' % ('\n * - '.join(dep_paths)))
+ lines.append(' * - %s' % ('\n * - '.join(dep_paths)))
if len(ext_paths) > 0:
- lines.append(' * Injected Dependencies:')
- lines.append(' * - %s' % ('\n * - '.join(ext_paths)))
- if len(sup_paths) > 0:
- lines.append(' * Supported:')
- lines.append(' * - %s' % ('\n * - '.join(sup_paths)))
+ lines.append(' * + %s' % ('\n * + '.join(ext_paths)))
lines.extend([
' */',
