From 3840ea9537c3fd855346d324e04319f9db208e01 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 27 Feb 2019 19:16:17 +0100 Subject: [PATCH] sculpt: anchor nic_drv, wifi_drv to hardware node --- repos/gems/src/app/sculpt_manager/runtime/nic_drv.cc | 8 ++++---- repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/repos/gems/src/app/sculpt_manager/runtime/nic_drv.cc b/repos/gems/src/app/sculpt_manager/runtime/nic_drv.cc index 44f09c4f5..a5af18982 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/nic_drv.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/nic_drv.cc @@ -22,6 +22,10 @@ void Sculpt::gen_nic_drv_start_content(Xml_generator &xml) xml.node("config", [&] () { }); xml.node("route", [&] () { + gen_service_node(xml, [&] () { + xml.node("parent", [&] () { + xml.attribute("label", "nic"); }); }); + gen_parent_rom_route(xml, "nic_drv"); gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_route (xml); @@ -29,9 +33,5 @@ void Sculpt::gen_nic_drv_start_content(Xml_generator &xml) gen_parent_route (xml); gen_parent_route (xml); gen_parent_route (xml); - - gen_service_node(xml, [&] () { - xml.node("parent", [&] () { - xml.attribute("label", "nic"); }); }); }); } diff --git a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc index 8f589be22..4c055ca23 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc @@ -40,6 +40,10 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) }); xml.node("route", [&] () { + gen_service_node(xml, [&] () { + xml.node("parent", [&] () { + xml.attribute("label", "wifi"); }); }); + gen_parent_rom_route(xml, "wifi_drv"); gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_rom_route(xml, "libcrypto.lib.so"); @@ -75,9 +79,5 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml) xml.attribute("label", "wifi_config"); xml.node("parent", [&] () { xml.attribute("label", "config -> managed/wifi"); }); }); - - gen_service_node(xml, [&] () { - xml.node("parent", [&] () { - xml.attribute("label", "wifi"); }); }); }); }