ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 01:36:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sculpt: attach nic and wifi to hardware node

Browse Source 
This makes the grouping of these two drivers consistent with the
other drivers.

Issue #5174
This commit is contained in:
Norman Feske 2024-04-17 12:07:15 +02:00 committed by Christian Helmuth
parent dcd4578585
commit 7c7c4e80e1
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/gems/src/app/sculpt_manager/driver/nic.h
View File

@ -31,12 +31,12 @@ struct Sculpt::Nic_driver : private Noncopyable
gen_named_node(xml, "binary", "nic_drv");
xml.node("config", [&] { });
xml.node("route", [&] {
gen_service_node<Uplink::Session>(xml, [&] {
xml.node("child", [&] {
xml.attribute("name", "nic_router"); }); });
gen_service_node<Platform::Session>(xml, [&] {
xml.node("parent", [&] {
xml.attribute("label", "nic"); }); });
gen_service_node<Uplink::Session>(xml, [&] {
xml.node("child", [&] {
xml.attribute("name", "nic_router"); }); });
gen_common_routes(xml);
gen_parent_rom_route(xml, "nic_drv");
gen_parent_rom_route(xml, "nic_drv.dtb");

14
repos/gems/src/app/sculpt_manager/driver/wifi.h
View File

@ -59,19 +59,14 @@ struct Sculpt::Wifi_driver : private Noncopyable
});
xml.node("route", [&] {
gen_service_node<Platform::Session>(xml, [&] {
xml.node("parent", [&] {
xml.attribute("label", "wifi"); }); });
xml.node("service", [&] {
xml.attribute("name", "Uplink");
xml.node("child", [&] {
xml.attribute("name", "nic_router");
xml.attribute("label", "wifi -> ");
});
});
gen_service_node<Platform::Session>(xml, [&] {
xml.node("parent", [&] {
xml.attribute("label", "wifi"); }); });
xml.attribute("label", "wifi -> "); }); });
gen_common_routes(xml);
gen_parent_rom_route(xml, "wifi_drv");
gen_parent_rom_route(xml, "wifi_drv.dtb");
@ -87,7 +82,6 @@ struct Sculpt::Wifi_driver : private Noncopyable
gen_parent_rom_route(xml, "wpa_supplicant.lib.so");
gen_parent_route<Rm_session> (xml);
gen_parent_route<Rtc::Session> (xml);
gen_service_node<Rom_session>(xml, [&] {
xml.attribute("label", "wifi_config");
xml.node("parent", [&] {