ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove '_drv' suffix

Browse Source 
Issue #4420
This commit is contained in:
Norman Feske 2024-05-30 15:46:57 +02:00
parent cb88c2c3e2
commit 8943a3e949
329 changed files with 1062 additions and 1063 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-fiasco/recipes/src/base-fiasco/content.mk
View File

@ -21,5 +21,5 @@ content:
for spec in x86_32; do \ for spec in x86_32; do \
mv lib/mk/spec/$$spec/ld-fiasco.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-fiasco.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/fiasco_timer_drv/timer/" src/timer/fiasco/target.mk sed -i "s/fiasco_timer/timer/" src/timer/fiasco/target.mk

2
repos/base-fiasco/src/timer/fiasco/target.mk
View File

@ -1,4 +1,4 @@
TARGET = fiasco_timer_drv TARGET = fiasco_timer
LIBS += syscall-fiasco LIBS += syscall-fiasco
GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc))
INC_DIR += $(GEN_DIR)/periodic INC_DIR += $(GEN_DIR)/periodic

2
repos/base-foc/recipes/src/base-foc_content.inc
View File

@ -39,4 +39,4 @@ content:
for spec in x86_32 x86_64 arm arm_64; do \ for spec in x86_32 x86_64 arm arm_64; do \
mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-foc.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/foc_timer_drv/timer/" src/timer/foc/target.mk sed -i "s/foc_timer/timer/" src/timer/foc/target.mk

2
repos/base-foc/src/timer/foc/target.mk
View File

@ -1,4 +1,4 @@
TARGET = foc_timer_drv TARGET = foc_timer
LIBS += syscall-foc LIBS += syscall-foc
GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc))
INC_DIR += $(GEN_DIR)/periodic INC_DIR += $(GEN_DIR)/periodic

2
repos/base-hw/recipes/src/base-hw_content.inc
View File

@ -195,7 +195,7 @@ generalize_target_names: $(CONTENT)
# apply kernel-agnostic convention of naming the timer and ld.lib.so # apply kernel-agnostic convention of naming the timer and ld.lib.so
for subdir in ${call selected_content,LD_MK_DIRS}; do \ for subdir in ${call selected_content,LD_MK_DIRS}; do \
mv $$subdir/ld-hw.mk $$subdir/ld.mk; done mv $$subdir/ld-hw.mk $$subdir/ld.mk; done
sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk sed -i "s/hw_timer/timer/" src/timer/hw/target.mk
# supplement BOARD definition that normally comes form the build dir # supplement BOARD definition that normally comes form the build dir
sed -i "s/\?= unknown/:= $(BOARD)/" src/core/hw/target.mk sed -i "s/\?= unknown/:= $(BOARD)/" src/core/hw/target.mk
sed -i "s/\?= unknown/:= $(BOARD)/" src/bootstrap/hw/target.mk sed -i "s/\?= unknown/:= $(BOARD)/" src/bootstrap/hw/target.mk

2
repos/base-hw/src/timer/hw/target.mk
View File

@ -1,4 +1,4 @@
TARGET = hw_timer_drv TARGET = hw_timer
REQUIRES = hw REQUIRES = hw
LIBS = syscall-hw base LIBS = syscall-hw base
REP_INC_DIR += src/include REP_INC_DIR += src/include

2
repos/base-linux/recipes/src/base-linux/content.mk
View File

@ -10,6 +10,6 @@ content:
mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done; mv lib/mk/spec/$$spec/ld-linux.mk lib/mk/spec/$$spec/ld.mk; done;
sed -i "/TARGET/s/core-linux/core/" src/core/linux/target.mk sed -i "/TARGET/s/core-linux/core/" src/core/linux/target.mk
sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc
sed -i "s/linux_timer_drv/timer/" src/timer/linux/target.mk sed -i "s/linux_timer/timer/" src/timer/linux/target.mk
rm -rf src/initramfs rm -rf src/initramfs

2
repos/base-linux/src/timer/linux/target.mk
View File

@ -1,4 +1,4 @@
TARGET = linux_timer_drv TARGET = linux_timer
GEN_DIR := $(call select_from_repositories,src/timer/periodic)/.. GEN_DIR := $(call select_from_repositories,src/timer/periodic)/..
INC_DIR += $(GEN_DIR)/periodic INC_DIR += $(GEN_DIR)/periodic
SRC_CC += periodic/time_source.cc time_source.cc SRC_CC += periodic/time_source.cc time_source.cc

2
repos/base-nova/recipes/src/base-nova/content.mk
View File

@ -17,5 +17,5 @@ content:
for spec in x86_32 x86_64; do \ for spec in x86_32 x86_64; do \
mv lib/mk/spec/$$spec/ld-nova.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-nova.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/nova_timer_drv/timer/" src/timer/nova/target.mk sed -i "s/nova_timer/timer/" src/timer/nova/target.mk

2
repos/base-nova/src/timer/nova/target.mk
View File

@ -1,4 +1,4 @@
TARGET = nova_timer_drv TARGET = nova_timer
INC_DIR += $(PRG_DIR) INC_DIR += $(PRG_DIR)
SRC_CC += main.cc SRC_CC += main.cc
LIBS += base LIBS += base

2
repos/base-okl4/recipes/src/base-okl4/content.mk
View File

@ -21,5 +21,5 @@ content:
for spec in x86_32; do \ for spec in x86_32; do \
mv lib/mk/spec/$$spec/ld-okl4.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-okl4.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc sed -i "s/pit_timer/timer/" src/timer/pit/target.inc

6
repos/base-okl4/tool/weaver_x86.xml
View File

@ -66,11 +66,11 @@
<memsection name="testnit" file="testnit" direct="true" /> <memsection name="testnit" file="testnit" direct="true" />
<memsection name="scout" file="scout" direct="true" /> <memsection name="scout" file="scout" direct="true" />
<memsection name="launchpad" file="launchpad" direct="true" /> <memsection name="launchpad" file="launchpad" direct="true" />
<memsection name="ps2_drv" file="ps2_drv" direct="true" /> <memsection name="ps2" file="ps2" direct="true" />
<memsection name="pci_drv" file="pci_drv" direct="true" /> <memsection name="pci" file="pci" direct="true" />
<memsection name="nitlog" file="nitlog" direct="true" /> <memsection name="nitlog" file="nitlog" direct="true" />
<memsection name="liquid_fb" file="liquid_fb" direct="true" /> <memsection name="liquid_fb" file="liquid_fb" direct="true" />
<memsection name="fb_drv" file="fb_drv" direct="true" /> <memsection name="fb" file="fb" direct="true" />
</pd> </pd>
</image> </image>

2
repos/base-pistachio/recipes/src/base-pistachio/content.mk
View File

@ -21,5 +21,5 @@ content:
for spec in x86_32; do \ for spec in x86_32; do \
mv lib/mk/spec/$$spec/ld-pistachio.mk lib/mk/spec/$$spec/ld.mk; \ mv lib/mk/spec/$$spec/ld-pistachio.mk lib/mk/spec/$$spec/ld.mk; \
done; done;
sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc sed -i "s/pit_timer/timer/" src/timer/pit/target.inc

2
repos/base-sel4/recipes/src/base-sel4-imx6q_sabrelite/content.mk
View File

@ -35,7 +35,7 @@ etc/board.conf:
content: content:
mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk; mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk;
sed -i "s/imx6_timer_drv/timer/" src/timer/epit/imx6/target.inc sed -i "s/imx6_timer/timer/" src/timer/epit/imx6/target.inc
find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf grep -v "sel4-imx6q_sabrelite.mk" | xargs rm -rf

2
repos/base-sel4/recipes/src/base-sel4-x86/content.mk
View File

@ -24,7 +24,7 @@ etc/board.conf:
content: content:
mv lib/mk/spec/x86_64/ld-sel4.mk lib/mk/spec/x86_64/ld.mk; mv lib/mk/spec/x86_64/ld-sel4.mk lib/mk/spec/x86_64/ld.mk;
sed -i "s/pit_timer_drv/timer/" src/timer/pit/target.inc sed -i "s/pit_timer/timer/" src/timer/pit/target.inc
find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\ find lib/mk/spec -name kernel-sel4-*.mk -o -name syscall-sel4-*.mk |\
grep -v "sel4-pc.mk" | xargs rm -rf grep -v "sel4-pc.mk" | xargs rm -rf

2
repos/base/src/timer/epit/imx6/target.inc
View File

@ -1,4 +1,4 @@
TARGET = imx6_timer_drv TARGET = imx6_timer
REQUIRES = arm_v7 REQUIRES = arm_v7
GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc)) GEN_DIR := $(dir $(call select_from_repositories,src/timer/main.cc))
INC_DIR += $(GEN_DIR)/epit INC_DIR += $(GEN_DIR)/epit

2
repos/base/src/timer/pit/target.inc
View File

@ -1,4 +1,4 @@
TARGET = pit_timer_drv TARGET = pit_timer
REQUIRES = x86 REQUIRES = x86
SRC_CC += main.cc SRC_CC += main.cc
LIBS += base LIBS += base

2
repos/dde_bsd/README
View File

@ -47,7 +47,7 @@ or recording because it may provoke the generation of artefacts.
The following configures the driver of playback and recording: The following configures the driver of playback and recording:
! <start name="audio_out_drv"> ! <start name="pci_audio">
! <resource name="RAM" quantum="8M"/> ! <resource name="RAM" quantum="8M"/>
! <provides> ! <provides>
! <service name="Audio_out"/> ! <service name="Audio_out"/>

0
repos/dde_bsd/recipes/pkg/bsd_audio_drv/README → repos/dde_bsd/recipes/pkg/bsd_audio/README
View File

1
repos/dde_bsd/recipes/pkg/bsd_audio/archives Normal file
View File

@ -0,0 +1 @@
_/src/bsd_audio

0
repos/dde_bsd/recipes/pkg/bsd_audio_drv/hash → repos/dde_bsd/recipes/pkg/bsd_audio/hash
View File

4
repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime → repos/dde_bsd/recipes/pkg/bsd_audio/runtime
View File

@ -1,4 +1,4 @@
<runtime ram="2M" caps="105" binary="pci_audio_drv"> <runtime ram="2M" caps="105" binary="pci_audio">
<requires> <platform/> <rm/> <timer/> </requires> <requires> <platform/> <rm/> <timer/> </requires>
@ -11,7 +11,7 @@
<content> <content>
<rom label="ld.lib.so"/> <rom label="ld.lib.so"/>
<rom label="pci_audio_drv"/> <rom label="pci_audio"/>
</content> </content>
</runtime> </runtime>

1
repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives
View File

@ -1 +0,0 @@
_/src/bsd_audio_drv

0
repos/dde_bsd/recipes/src/bsd_audio_drv/content.mk → repos/dde_bsd/recipes/src/bsd_audio/content.mk
View File

0
repos/dde_bsd/recipes/src/bsd_audio_drv/hash → repos/dde_bsd/recipes/src/bsd_audio/hash
View File

0
repos/dde_bsd/recipes/src/bsd_audio_drv/used_apis → repos/dde_bsd/recipes/src/bsd_audio/used_apis
View File

14
repos/dde_bsd/run/audio_in.run
View File

@ -99,12 +99,12 @@ install_config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides> <provides> <service name="Report"/> <service name="ROM"/> </provides>
<config> <config>
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi -> acpi"/>
<policy label="platform_drv -> devices" report="pci_decode -> devices"/> <policy label="platform -> devices" report="pci_decode -> devices"/>
</config> </config>
</start> </start>
<start name="acpi_drv" caps="350"> <start name="acpi" caps="350">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
@ -121,7 +121,7 @@ install_config {
</route> </route>
</start> </start>
<start name="platform_drv" caps="100" managing_system="yes"> <start name="platform" caps="100" managing_system="yes">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <provides>
<service name="Platform"/> <service name="Platform"/>
@ -132,12 +132,12 @@ install_config {
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
<config> <config>
<policy label="audio_drv -> "> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy> <policy label="audio -> "> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
</config> </config>
</start> </start>
<start name="audio_drv"> <start name="audio">
<binary name="pci_audio_drv"/> <binary name="pci_audio"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides> <provides>
<service name="Audio_out"/> <service name="Audio_out"/>

14
repos/dde_bsd/run/audio_out.run
View File

@ -117,12 +117,12 @@ install_config {
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides> <provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="yes"> <config verbose="yes">
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi -> acpi"/>
<policy label="platform_drv -> devices" report="pci_decode -> devices"/> <policy label="platform -> devices" report="pci_decode -> devices"/>
</config> </config>
</start> </start>
<start name="acpi_drv" caps="350"> <start name="acpi" caps="350">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
@ -139,7 +139,7 @@ install_config {
</route> </route>
</start> </start>
<start name="platform_drv" caps="100" managing_system="yes"> <start name="platform" caps="100" managing_system="yes">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <provides>
<service name="Platform"/> <service name="Platform"/>
@ -150,12 +150,12 @@ install_config {
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
<config> <config>
<policy label="audio_drv -> "> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy> <policy label="audio -> "> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
</config> </config>
</start> </start>
<start name="audio_drv"> <start name="audio">
<binary name="pci_audio_drv"/> <binary name="pci_audio"/>
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides> <service name="Audio_out"/> <service name="Audio_in"/> </provides> <provides> <service name="Audio_out"/> <service name="Audio_in"/> </provides>
<config } [audio_driver_config_attr] {/> <config } [audio_driver_config_attr] {/>

2
repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk → repos/dde_bsd/src/drivers/audio/pci/target.mk
View File

@ -1,5 +1,5 @@
REQUIRES = x86 REQUIRES = x86
TARGET = pci_audio_drv TARGET = pci_audio
SRC_CC = main.cc SRC_CC = main.cc
LIBS = dde_bsd_audio base format LIBS = dde_bsd_audio base format
INC_DIR += $(REP_DIR)/include INC_DIR += $(REP_DIR)/include

2
repos/dde_ipxe/README
View File

@ -14,7 +14,7 @@ build directory, for example
! REPOSITORIES += $(GENODE_DIR)/repos/dde_ipxe ! REPOSITORIES += $(GENODE_DIR)/repos/dde_ipxe
After a successful build the DDE iPXE based ethernet driver is located After a successful build the DDE iPXE based ethernet driver is located
at 'bin/ipxe_nic_drv'. at 'bin/ipxe_nic'.
The driver optionally reports the following information under the The driver optionally reports the following information under the
label "devices" if requested in the config as depicted. label "devices" if requested in the config as depicted.

0
repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/README → repos/dde_ipxe/recipes/pkg/ipxe_nic/README
View File

1
repos/dde_ipxe/recipes/pkg/ipxe_nic/archives Normal file
View File

@ -0,0 +1 @@
_/src/ipxe_nic

0
repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/hash → repos/dde_ipxe/recipes/pkg/ipxe_nic/hash
View File

10
repos/dde_ipxe/recipes/pkg/ipxe_nic/runtime Normal file
View File

@ -0,0 +1,10 @@
<runtime ram="16M" caps="300" binary="ipxe_nic">
<config/>
<content>
<rom label="ld.lib.so"/>
<rom label="ipxe_nic"/>
</content>
</runtime>

1
repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/archives
View File

@ -1 +0,0 @@
_/src/ipxe_nic_drv

10
repos/dde_ipxe/recipes/pkg/ipxe_nic_drv/runtime
View File

@ -1,10 +0,0 @@
<runtime ram="16M" caps="300" binary="ipxe_nic_drv">
<config/>
<content>
<rom label="ld.lib.so"/>
<rom label="ipxe_nic_drv"/>
</content>
</runtime>

0
repos/dde_ipxe/recipes/src/ipxe_nic_drv/content.mk → repos/dde_ipxe/recipes/src/ipxe_nic/content.mk
View File

0
repos/dde_ipxe/recipes/src/ipxe_nic_drv/hash → repos/dde_ipxe/recipes/src/ipxe_nic/hash
View File

0
repos/dde_ipxe/recipes/src/ipxe_nic_drv/used_apis → repos/dde_ipxe/recipes/src/ipxe_nic/used_apis
View File

2
repos/dde_ipxe/src/drivers/nic/target.mk
View File

@ -1,4 +1,4 @@
TARGET = ipxe_nic_drv TARGET = ipxe_nic
REQUIRES = x86 REQUIRES = x86
LIBS = base dde_ipxe_nic nic_driver format LIBS = base dde_ipxe_nic nic_driver format
SRC_CC = main.cc SRC_CC = main.cc

2
repos/dde_linux/README
View File

@ -36,7 +36,7 @@ version of 'libc' by linking your application to 'lxip_libc' plugin in your
Wifi Wifi
#### ####
The 'wifi_drv' consists of a port of the mac802.11 stack, platform-specific The 'wifi' driver consists of a port of the mac802.11 stack, platform-specific
drivers and the 'wpa_supplicant' to Genode. drivers and the 'wpa_supplicant' to Genode.

0
repos/dde_linux/recipes/src/usb_hid_drv/content.mk → repos/dde_linux/recipes/src/usb_hid/content.mk
View File

0
repos/dde_linux/recipes/src/usb_hid_drv/hash → repos/dde_linux/recipes/src/usb_hid/hash
View File

0
repos/dde_linux/recipes/src/usb_hid_drv/used_apis → repos/dde_linux/recipes/src/usb_hid/used_apis
View File

0
repos/dde_linux/recipes/src/usb_net_drv/content.mk → repos/dde_linux/recipes/src/usb_net/content.mk
View File

0
repos/dde_linux/recipes/src/usb_net_drv/hash → repos/dde_linux/recipes/src/usb_net/hash
View File

0
repos/dde_linux/recipes/src/usb_net_drv/used_apis → repos/dde_linux/recipes/src/usb_net/used_apis
View File

40
repos/dde_linux/run/nic_router_uplinks.run
View File

@ -22,15 +22,15 @@ proc router_verbose_domain_state {} {
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/pc_wifi \ [depot_user]/pkg/pc_wifi \
[depot_user]/src/acpi_drv \ [depot_user]/src/acpi \
[depot_user]/src/dynamic_rom \ [depot_user]/src/dynamic_rom \
[depot_user]/src/init \ [depot_user]/src/init \
[depot_user]/src/pc_nic_drv \ [depot_user]/src/pc_nic \
[depot_user]/src/nic_router \ [depot_user]/src/nic_router \
[depot_user]/src/pci_decode \ [depot_user]/src/pci_decode \
[depot_user]/src/platform_drv \ [depot_user]/src/platform \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \
[depot_user]/src/rtc_drv [depot_user]/src/pc_rtc
build { app/ping } build { app/ping }
@ -58,12 +58,12 @@ install_config {
<service name="Report" /> <service name="Report" />
</provides> </provides>
<config> <config>
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi -> acpi"/>
<policy label="platform_drv -> devices" report="pci_decode -> devices"/> <policy label="platform -> devices" report="pci_decode -> devices"/>
</config> </config>
</start> </start>
<start name="acpi_drv" caps="250"> <start name="acpi" caps="250">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
</start> </start>
@ -76,7 +76,7 @@ install_config {
</route> </route>
</start> </start>
<start name="platform_drv" caps="100" managing_system="yes"> <start name="platform" caps="100" managing_system="yes">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides> <service name="Platform"/> </provides> <provides> <service name="Platform"/> </provides>
<route> <route>
@ -84,8 +84,8 @@ install_config {
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
<config> <config>
<policy label_prefix="wifi_drv" info="yes"> <pci class="WIFI"/> </policy> <policy label_prefix="wifi" info="yes"> <pci class="WIFI"/> </policy>
<policy label_prefix="nic_drv" info="yes"> <pci class="ETHERNET"/> </policy> <policy label_prefix="nic" info="yes"> <pci class="ETHERNET"/> </policy>
</config> </config>
</start> </start>
@ -94,15 +94,15 @@ install_config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="rtc_drv" priority="-1"> <start name="pc_rtc" priority="-1">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <provides>
<service name="Rtc"/> <service name="Rtc"/>
</provides> </provides>
</start> </start>
<start name="nic_drv" priority="-1" caps="250"> <start name="nic" priority="-1" caps="250">
<binary name="pc_nic_drv"/> <binary name="pc_nic"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="Uplink"> <child name="router"/> </service> <service name="Uplink"> <child name="router"/> </service>
@ -110,7 +110,7 @@ install_config {
</route> </route>
</start> </start>
<start name="wifi_drv" caps="300" priority="-1"> <start name="wifi" caps="300" priority="-1">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="32M"/>
<config ld_verbose="no"> <config ld_verbose="no">
<vfs> <vfs>
@ -172,7 +172,7 @@ install_config {
verbose_packets="} [router_verbose_packets] {"> verbose_packets="} [router_verbose_packets] {">
<policy label_prefix="ping" domain="downlink"/> <policy label_prefix="ping" domain="downlink"/>
<policy label_prefix="nic_drv" domain="uplink" /> <policy label_prefix="nic" domain="uplink" />
<domain name="uplink"> <domain name="uplink">
<nat domain="downlink" icmp-ids="999"/> <nat domain="downlink" icmp-ids="999"/>
@ -196,7 +196,7 @@ install_config {
verbose_packets="} [router_verbose_packets] {"> verbose_packets="} [router_verbose_packets] {">
<policy label_prefix="ping" domain="downlink"/> <policy label_prefix="ping" domain="downlink"/>
<policy label_prefix="wifi_drv" domain="uplink" /> <policy label_prefix="wifi" domain="uplink" />
<domain name="uplink"> <domain name="uplink">
<nat domain="downlink" icmp-ids="999"/> <nat domain="downlink" icmp-ids="999"/>
@ -239,7 +239,7 @@ install_config {
verbose_packets="} [router_verbose_packets] {"> verbose_packets="} [router_verbose_packets] {">
<policy label_prefix="ping" domain="downlink"/> <policy label_prefix="ping" domain="downlink"/>
<policy label_prefix="nic_drv" domain="uplink" /> <policy label_prefix="nic" domain="uplink" />
<domain name="uplink"> <domain name="uplink">
<nat domain="downlink" icmp-ids="999"/> <nat domain="downlink" icmp-ids="999"/>
@ -263,7 +263,7 @@ install_config {
verbose_packets="} [router_verbose_packets] {"> verbose_packets="} [router_verbose_packets] {">
<policy label_prefix="ping" domain="downlink"/> <policy label_prefix="ping" domain="downlink"/>
<policy label_prefix="nic_drv" domain="uplink" /> <policy label_prefix="nic" domain="uplink" />
<domain name="uplink"> <domain name="uplink">
<nat domain="downlink" icmp-ids="999"/> <nat domain="downlink" icmp-ids="999"/>
@ -306,7 +306,7 @@ install_config {
verbose_packets="} [router_verbose_packets] {"> verbose_packets="} [router_verbose_packets] {">
<policy label_prefix="ping" domain="downlink"/> <policy label_prefix="ping" domain="downlink"/>
<policy label_prefix="wifi_drv" domain="uplink" /> <policy label_prefix="wifi" domain="uplink" />
<domain name="uplink"> <domain name="uplink">
<nat domain="downlink" icmp-ids="999"/> <nat domain="downlink" icmp-ids="999"/>
@ -330,7 +330,7 @@ install_config {
verbose_packets="} [router_verbose_packets] {"> verbose_packets="} [router_verbose_packets] {">
<policy label_prefix="ping" domain="downlink"/> <policy label_prefix="ping" domain="downlink"/>
<policy label_prefix="nic_drv" domain="uplink" /> <policy label_prefix="nic" domain="uplink" />
<domain name="uplink"> <domain name="uplink">
<nat domain="downlink" icmp-ids="999"/> <nat domain="downlink" icmp-ids="999"/>

38
repos/dde_linux/run/usb_hid_raw.run
View File

@ -59,10 +59,10 @@ if { [get_cmd_switch --autopilot] &&
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/test_usb_host_drv-[board] \ [depot_user]/pkg/test_usb_host-[board] \
[depot_user]/src/dynamic_rom \ [depot_user]/src/dynamic_rom \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \
[depot_user]/src/usb_hid_drv \ [depot_user]/src/usb_hid \
[depot_user]/src/init [depot_user]/src/init
build { server/event_dump } build { server/event_dump }
@ -93,14 +93,14 @@ install_config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides> <provides> <service name="Report"/> <service name="ROM"/> </provides>
<config> <config>
<default-policy report="usb_drv -> usb_drv -> devices"/> <default-policy report="usb -> usb -> devices"/>
</config> </config>
<route> <route>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
</start> </start>
<start name="usb_drv" caps="1500" managing_system="yes"> <start name="usb" caps="1500" managing_system="yes">
<binary name="init"/> <binary name="init"/>
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="32M"/>
<provides> <service name="Usb"/> </provides> <provides> <service name="Usb"/> </provides>
@ -113,7 +113,7 @@ install_config {
</route> </route>
</start> </start>
<start name="usb_hid_drv" caps="180"> <start name="usb_hid" caps="180">
<resource name="RAM" quantum="11M"/> <resource name="RAM" quantum="11M"/>
<config capslock_led="rom" numlock_led="rom" scrlock_led="rom"/> <config capslock_led="rom" numlock_led="rom" scrlock_led="rom"/>
<route> <route>
@ -122,7 +122,7 @@ install_config {
<service name="ROM" label="scrlock"> <child name="dynamic_rom"/> </service> <service name="ROM" label="scrlock"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="report"> <child name="report_rom"/> </service> <service name="ROM" label="report"> <child name="report_rom"/> </service>
<service name="Event"> <child name="event_dump"/> </service> <service name="Event"> <child name="event_dump"/> </service>
<service name="Usb"> <child name="usb_drv"/> </service> <service name="Usb"> <child name="usb"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
@ -188,11 +188,11 @@ install_config {
# #
# Define USB host controller config # Define USB host controller config
# #
set fd [open [run_dir]/genode/usb_host_drv.config w] set fd [open [run_dir]/genode/usb_host.config w]
puts $fd { puts $fd {
<config bios_handoff="no"> <config bios_handoff="no">
<report devices="yes"/> <report devices="yes"/>
<policy label_prefix="usb_hid_drv"> <device class="0x3"/> </policy> <policy label_prefix="usb_hid"> <device class="0x3"/> </policy>
</config>} </config>}
close $fd close $fd
@ -225,8 +225,8 @@ unify_output {(?n)hid-generic.*input:} "hid-generic: input:"
unify_output {(?n)usb-[0-9]-[0-9]: USB disconnect, device number [0-9]} "usb-X-X: USB disconnect, device number X" unify_output {(?n)usb-[0-9]-[0-9]: USB disconnect, device number [0-9]} "usb-X-X: USB disconnect, device number X"
unify_output {(?n)input[0-9]} "inputX" unify_output {(?n)input[0-9]} "inputX"
unify_output {(?n) as /devices/.*} "" unify_output {(?n) as /devices/.*} ""
unify_output {(?n)^\[init -\> usb_drv.*} "" unify_output {(?n)^\[init -\> usb -\>.*} ""
unify_output {(?n)^\[init -\> usb_hid_drv\] Connected device: inputX \(ATEN CS1764A V1.1.110\).*} "" unify_output {(?n)^\[init -\> usb_hid\] Connected device: inputX \(ATEN CS1764A V1.1.110\).*} ""
trim_lines trim_lines
compare_output_to { compare_output_to {
@ -235,15 +235,15 @@ compare_output_to {
[init -> event_dump] Input event #2 REL_MOTION -1+1 key count: 0 [init -> event_dump] Input event #2 REL_MOTION -1+1 key count: 0
[init -> event_dump] Input event #3 PRESS BTN_LEFT 65534 key count: 1 [init -> event_dump] Input event #3 PRESS BTN_LEFT 65534 key count: 1
[init -> event_dump] Input event #4 RELEASE BTN_LEFT key count: 0 [init -> event_dump] Input event #4 RELEASE BTN_LEFT key count: 0
[init -> usb_hid_drv] usb usb-X-X: USB disconnect, device number X [init -> usb_hid] usb usb-X-X: USB disconnect, device number X
[init -> usb_hid_drv] Disconnected device: inputX [init -> usb_hid] Disconnected device: inputX
[init -> usb_hid_drv] Disconnected device: inputX [init -> usb_hid] Disconnected device: inputX
[init -> usb_hid_drv] input: Dean Camera LUFA Mouse and Keyboard Demo [init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo
[init -> usb_hid_drv] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) [init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo)
[init -> usb_hid_drv] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo] [init -> usb_hid] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo]
[init -> usb_hid_drv] input: Dean Camera LUFA Mouse and Keyboard Demo [init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo
[init -> usb_hid_drv] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE [init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE
[init -> usb_hid_drv] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo] [init -> usb_hid] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo]
[init -> event_dump] Input event #5 PRESS KEY_X 65534 key count: 1 [init -> event_dump] Input event #5 PRESS KEY_X 65534 key count: 1
[init -> event_dump] Input event #6 RELEASE KEY_X key count: 0 [init -> event_dump] Input event #6 RELEASE KEY_X key count: 0
[init -> event_dump] Input event #7 REL_MOTION -1+1 key count: 0 [init -> event_dump] Input event #7 REL_MOTION -1+1 key count: 0

14
repos/dde_linux/run/usb_hid_reconnect.run
View File

@ -17,10 +17,10 @@ if {![have_include "power_on/qemu"]} {
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/test_usb_host_drv-[board] \ [depot_user]/pkg/test_usb_host-[board] \
[depot_user]/src/dynamic_rom \ [depot_user]/src/dynamic_rom \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \
[depot_user]/src/usb_hid_drv \ [depot_user]/src/usb_hid \
[depot_user]/src/init [depot_user]/src/init
build { server/event_dump } build { server/event_dump }
@ -51,11 +51,11 @@ install_config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides> <provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="no"> <config verbose="no">
<default-policy report="usb_drv -> usb_drv -> devices"/> <default-policy report="usb -> usb -> devices"/>
</config> </config>
</start> </start>
<start name="usb_drv" caps="1500" managing_system="yes"> <start name="usb" caps="1500" managing_system="yes">
<binary name="init"/> <binary name="init"/>
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="32M"/>
<provides> <service name="Usb"/> </provides> <provides> <service name="Usb"/> </provides>
@ -68,7 +68,7 @@ install_config {
</route> </route>
</start> </start>
<start name="usb_hid_drv" caps="180"> <start name="usb_hid" caps="180">
<resource name="RAM" quantum="11M"/> <resource name="RAM" quantum="11M"/>
<config capslock_led="rom" numlock_led="rom" scrlock_led="rom"/> <config capslock_led="rom" numlock_led="rom" scrlock_led="rom"/>
<route> <route>
@ -123,11 +123,11 @@ install_config {
# #
# Define USB host controller config # Define USB host controller config
# #
set fd [open [run_dir]/genode/usb_host_drv.config w] set fd [open [run_dir]/genode/usb_host.config w]
puts $fd { puts $fd {
<config bios_handoff="yes"> <config bios_handoff="yes">
<report devices="yes"/> <report devices="yes"/>
<policy label_prefix="usb_hid_drv"> <device class="0x3"/> </policy> <policy label_prefix="usb_hid"> <device class="0x3"/> </policy>
</config>} </config>}
close $fd close $fd

16
repos/dde_linux/run/usb_net.run
View File

@ -9,8 +9,8 @@
create_boot_directory create_boot_directory
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/test_usb_host_drv-[board] \ [depot_user]/pkg/test_usb_host-[board] \
[depot_user]/src/usb_net_drv \ [depot_user]/src/usb_net \
[depot_user]/src/nic_router \ [depot_user]/src/nic_router \
[depot_user]/src/libc \ [depot_user]/src/libc \
[depot_user]/src/vfs \ [depot_user]/src/vfs \
@ -41,7 +41,7 @@ install_config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="usb_drv" caps="1500" managing_system="yes"> <start name="usb" caps="1500" managing_system="yes">
<binary name="init"/> <binary name="init"/>
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="32M"/>
<provides> <service name="Usb"/> </provides> <provides> <service name="Usb"/> </provides>
@ -53,7 +53,7 @@ install_config {
</route> </route>
</start> </start>
<start name="usb_net_drv"> <start name="usb_net">
<resource name="RAM" quantum="20M"/> <resource name="RAM" quantum="20M"/>
<config mac="02:00:00:00:01:01" /> <config mac="02:00:00:00:01:01" />
<route> <route>
@ -71,7 +71,7 @@ install_config {
<config verbose_domain_state="yes"> <config verbose_domain_state="yes">
<policy label_prefix="test-lwip_httpsrv" domain="downlink"/> <policy label_prefix="test-lwip_httpsrv" domain="downlink"/>
<policy label_prefix="usb_net_drv" domain="uplink"/> <policy label_prefix="usb_net" domain="uplink"/>
<domain name="uplink"> <domain name="uplink">
@ -112,13 +112,13 @@ install_config {
# #
set config {<config bios_handoff="yes">} set config {<config bios_handoff="yes">}
append_if [have_board rpi] config { append_if [have_board rpi] config {
<policy label_prefix="usb_net_drv"> <policy label_prefix="usb_net">
<device vendor_id="0x0424" product_id="0xec00"/> </policy>} <device vendor_id="0x0424" product_id="0xec00"/> </policy>}
append_if [have_spec x86] config { append_if [have_spec x86] config {
<policy label_prefix="usb_net_drv"> <policy label_prefix="usb_net">
<device vendor_id="0x0b95" product_id="0x1790"/> </policy> } <device vendor_id="0x0b95" product_id="0x1790"/> </policy> }
append config {</config>} append config {</config>}
set fd [open [run_dir]/genode/usb_host_drv.config w] set fd [open [run_dir]/genode/usb_host.config w]
puts $fd $config puts $fd $config
close $fd close $fd

18
repos/dde_linux/run/wg_reconnect.run
View File

@ -44,15 +44,15 @@ if { ![expr [have_board linux] || [have_board pc]] } {
} }
proc rtc_drv_binary_name { } { proc rtc_binary_name { } {
switch [board] { switch [board] {
linux { return "linux_rtc_drv" } linux { return "linux_rtc" }
pc { return "rtc_drv" } pc { return "pc_rtc" }
} }
} }
proc rtc_drv_use_ld { } { proc rtc_use_ld { } {
return [expr [have_board linux] ? "no" : "yes"] return [expr [have_board linux] ? "no" : "yes"]
} }
@ -75,7 +75,7 @@ lappend depot_archives [depot_user]/src/nic_router
lappend depot_archives [depot_user]/src/openssl lappend depot_archives [depot_user]/src/openssl
lappend depot_archives [depot_user]/src/posix lappend depot_archives [depot_user]/src/posix
lappend depot_archives [depot_user]/src/report_rom lappend depot_archives [depot_user]/src/report_rom
lappend depot_archives [depot_user]/src/[rtc_drv_binary_name] lappend depot_archives [depot_user]/src/[rtc_binary_name]
lappend depot_archives [depot_user]/src/vfs lappend depot_archives [depot_user]/src/vfs
lappend depot_archives [depot_user]/src/vfs_jitterentropy lappend depot_archives [depot_user]/src/vfs_jitterentropy
lappend depot_archives [depot_user]/src/vfs_lwip lappend depot_archives [depot_user]/src/vfs_lwip
@ -272,8 +272,8 @@ append config {
</route> </route>
</start> </start>
<start name="rtc_drv" caps="100" ld="} [rtc_drv_use_ld] {"> <start name="rtc" caps="100" ld="} [rtc_use_ld] {">
<binary name="} [rtc_drv_binary_name] {"/> <binary name="} [rtc_binary_name] {"/>
<resource name="RAM" quantum="1M" /> <resource name="RAM" quantum="1M" />
<provides> <provides>
<service name="Rtc"/> <service name="Rtc"/>
@ -319,7 +319,7 @@ append config {
<route> <route>
<service name="Nic"> <child name="nic_router" label="server"/> </service> <service name="Nic"> <child name="nic_router" label="server"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Rtc"> <child name="rtc_drv"/> </service> <service name="Rtc"> <child name="rtc"/> </service>
<service name="Uplink"> <child name="nic_router" label="server"/> </service> <service name="Uplink"> <child name="nic_router" label="server"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>
@ -332,7 +332,7 @@ append config {
<route> <route>
<service name="Nic"> <child name="nic_router" label="client"/> </service> <service name="Nic"> <child name="nic_router" label="client"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Rtc"> <child name="rtc_drv"/> </service> <service name="Rtc"> <child name="rtc"/> </service>
<service name="Uplink"> <child name="nic_router" label="client"/> </service> <service name="Uplink"> <child name="nic_router" label="client"/> </service>
<any-service> <parent/> </any-service> <any-service> <parent/> </any-service>
</route> </route>

2
repos/dde_linux/src/drivers/usb_hid/target.inc
View File

@ -1,4 +1,4 @@
TARGET = usb_hid_drv TARGET = usb_hid
LIBS = base jitterentropy virt_lx_emul LIBS = base jitterentropy virt_lx_emul
INC_DIR = $(PRG_DIR)/../.. $(REP_DIR)/src/lib/usb_client INC_DIR = $(PRG_DIR)/../.. $(REP_DIR)/src/lib/usb_client

6
repos/dde_linux/src/drivers/usb_net/README
View File

@ -18,7 +18,7 @@ NIC configuration
Configuration snippet: Configuration snippet:
!<start name="usb_net_drv"> !<start name="usb_net">
! <resource name="RAM" quantum="10M"/> ! <resource name="RAM" quantum="10M"/>
! <config mac="2e:60:90:0c:4e:01 configuration="2" /> ! <config mac="2e:60:90:0c:4e:01 configuration="2" />
! <route> ! <route>
@ -44,11 +44,11 @@ LTE modem configuration
Currently there is support for MBIM (Mobile Broadband Interface Model) devices. Currently there is support for MBIM (Mobile Broadband Interface Model) devices.
Tested devices: Tested devices:
Huawai ME906s (P/V: 12d1:15c1) - "configuration=3" for 'usb_net_drv' Huawai ME906s (P/V: 12d1:15c1) - "configuration=3" for 'usb_net'
Fibocom L830-EB-00 (P/V: 2cb7:0210) - automatically detected Fibocom L830-EB-00 (P/V: 2cb7:0210) - automatically detected
!<start name="usb_nic_drv"> !<start name="usb_nic">
! <resource name="RAM" quantum="10M"/> ! <resource name="RAM" quantum="10M"/>
! <provides> ! <provides>
! <service name="Terminal"/> ! <service name="Terminal"/>

2
repos/dde_linux/src/drivers/usb_net/target.inc
View File

@ -1,4 +1,4 @@
TARGET = usb_net_drv TARGET = usb_net
LIBS = base jitterentropy virt_lx_emul LIBS = base jitterentropy virt_lx_emul
INC_DIR = $(PRG_DIR)/../.. INC_DIR = $(PRG_DIR)/../..

14
repos/dde_linux/src/drivers/wifi/README
View File

@ -1,4 +1,4 @@
The wifi_drv component is a port of the Linux mac802.11 stack as well as The wifi component is a port of the Linux mac802.11 stack as well as
libnl and wpa_supplicant to Genode. Depending on the used platform it libnl and wpa_supplicant to Genode. Depending on the used platform it
features a selection of drivers for wireless devices. For example on the features a selection of drivers for wireless devices. For example on the
PC platform it contains the ath9k, iwlwifi and rtlwifi drivers for PCI(e) PC platform it contains the ath9k, iwlwifi and rtlwifi drivers for PCI(e)
@ -6,14 +6,14 @@ devices.
In contrast to other DDE Linux based drivers the actual driver portion is In contrast to other DDE Linux based drivers the actual driver portion is
confined to its own library to better isolate the various parts of the driver. confined to its own library to better isolate the various parts of the driver.
The 'wifi_drv' binary is the generic management part that includes the Wifi The 'wifi' binary is the generic management part that includes the Wifi
configuration interface and the 'wpa_supplicant'. A suitable driver library configuration interface and the 'wpa_supplicant'. A suitable driver library
is loaded at run-time (see section [Debugging]). is loaded at run-time (see section [Debugging]).
To start the component on the PC platform the following configuration snippet To start the component on the PC platform the following configuration snippet
can be used: can be used:
!<start name="wifi_drv" caps="250"> !<start name="wifi" caps="250">
! <resource name="RAM" quantum="32M"/> ! <resource name="RAM" quantum="32M"/>
! <provides><service name="Nic"/></provides> ! <provides><service name="Nic"/></provides>
! <config> ! <config>
@ -41,7 +41,7 @@ can be used:
On other platforms the wifi library will be different. The following On other platforms the wifi library will be different. The following
snippet illustrates the use of the driver on the PinePhone: snippet illustrates the use of the driver on the PinePhone:
!<start name="wifi_drv" caps="250"> !<start name="wifi" caps="250">
! <resource name="RAM" quantum="32M"/> ! <resource name="RAM" quantum="32M"/>
! <provides><service name="Nic"/></provides> ! <provides><service name="Nic"/></provides>
! <config> ! <config>
@ -118,7 +118,7 @@ a better fit accesspoint for the configured network.
Also, the driver can be switched to verbose logging during runtime Also, the driver can be switched to verbose logging during runtime
by setting the 'verbose' or 'verbose_state' attribute to 'true'. by setting the 'verbose' or 'verbose_state' attribute to 'true'.
The wifi_drv creates two distinct reports to communicate its state and The wifi driver creates two distinct reports to communicate its state and
information about the wireless infrastructure to other components. The information about the wireless infrastructure to other components. The
first one is a list of all available accesspoints. The following examplary first one is a list of all available accesspoints. The following examplary
report shows its general structure: report shows its general structure:
@ -166,7 +166,7 @@ label "devices" if requested in the config as depicted.
Debugging Debugging
~~~~~~~~~ ~~~~~~~~~
As mentioned in the introduction the 'wifi_drv' component is special in the As mentioned in the introduction the 'wifi' component is special in the
regard that the actual driver is provided as a shared-object to better isolate regard that the actual driver is provided as a shared-object to better isolate
it from the the driver binary that is a Libc::Component managing the it from the the driver binary that is a Libc::Component managing the
'wpa_supplicant'. Since this code and in return the binary is the same for each 'wpa_supplicant'. Since this code and in return the binary is the same for each
@ -185,7 +185,7 @@ is necessary to link the driver binary directly against the driver library
rather then stub ABI library. This is achieved by adapting the driver's rather then stub ABI library. This is achieved by adapting the driver's
'target.mk' file. In 'target.mk' file. In
!TARGET := wifi_drv !TARGET := wifi
!SRC_CC := main.cc wpa.cc access_firmware.cc !SRC_CC := main.cc wpa.cc access_firmware.cc
!LIBS := base wifi !LIBS := base wifi
![…] ![…]

2
repos/dde_linux/src/drivers/wifi/frontend.h
View File

@ -1650,7 +1650,7 @@ struct Wifi::Frontend : Wifi::Rfkill_notification_handler
/** /**
* Trigger RFKILL notification * Trigger RFKILL notification
* *
* Used by the wifi_drv to notify front end. * Used by the wifi driver to notify front end.
*/ */
void rfkill_notify() override void rfkill_notify() override
{ {

2
repos/dde_linux/src/drivers/wifi/target.mk
View File

@ -1,4 +1,4 @@
TARGET := wifi_drv TARGET := wifi
SRC_CC := main.cc wpa.cc access_firmware.cc SRC_CC := main.cc wpa.cc access_firmware.cc
LIBS := base wifi LIBS := base wifi
LIBS += libc LIBS += libc

2
repos/dde_linux/src/lib/wpa_driver_nl80211/symbol.map
View File

@ -12,7 +12,7 @@
poll; poll;
/* needed by wpa_supplicant lib for wifi_drv */ /* needed by wpa_supplicant lib for the wifi driver */
nl_set_wpa_ctrl_fd; nl_set_wpa_ctrl_fd;
local: local:

2
repos/dde_linux/src/lib/wpa_supplicant/symbol.map
View File

@ -4,7 +4,7 @@
{ {
global: global:
/* needed by wifi_drv */ /* needed by wifi driver */
wpa_main; wpa_main;
wpa_reporter_init; wpa_reporter_init;
wpa_ctrl_set_fd; wpa_ctrl_set_fd;

6
repos/gems/recipes/pkg/drivers_nic-pc/archives
View File

@ -1,6 +1,6 @@
_/src/platform_drv _/src/platform
_/src/acpi_drv _/src/acpi
_/src/pc_nic_drv _/src/pc_nic
_/src/report_rom _/src/report_rom
_/src/pci_decode _/src/pci_decode
_/raw/drivers_nic-pc _/raw/drivers_nic-pc

4
repos/gems/recipes/pkg/goa-linux/archives
View File

@ -1,6 +1,6 @@
_/pkg/drivers_interactive-linux _/pkg/drivers_interactive-linux
_/src/base-linux _/src/base-linux
_/src/fb_sdl _/src/fb_sdl
_/src/linux_nic_drv _/src/linux_nic
_/src/linux_rtc_drv _/src/linux_rtc
_/src/lx_fs _/src/lx_fs

2
repos/gems/recipes/pkg/sculpt/README
View File

@ -688,7 +688,7 @@ displays and their supported resolutions by taking a look at the report at
_/report/runtime/intel_fb/connectors_. This report is updated _/report/runtime/intel_fb/connectors_. This report is updated
whenever a display is connected or disconnected. You can use this whenever a display is connected or disconnected. You can use this
information to enable or disable a display in the driver's configuration, information to enable or disable a display in the driver's configuration,
which you can find at _/config/fb_drv_. which you can find at _/config/fb_.
For a quick test, change the attributes 'height="768"' to 'force_height="768"' For a quick test, change the attributes 'height="768"' to 'force_height="768"'
and 'width="1024"' to 'force_width="1024"'. When saving the file, the screen and 'width="1024"' to 'force_width="1024"'. When saving the file, the screen

2
repos/gems/recipes/pkg/sculpt_distribution-pc/archives
View File

@ -5,5 +5,5 @@ _/pkg/acpica
_/pkg/system_clock-pc _/pkg/system_clock-pc
_/pkg/mesa_gpu-intel _/pkg/mesa_gpu-intel
_/pkg/file_vault _/pkg/file_vault
_/pkg/bsd_audio_drv _/pkg/bsd_audio
_/pkg/gdb_x86 _/pkg/gdb_x86

26
repos/gems/recipes/pkg/sculpt_drivers-pc/archives
View File

@ -1,16 +1,16 @@
_/pkg/pc_wifi _/pkg/pc_wifi
_/src/acpi_drv _/src/acpi
_/src/ahci_drv _/src/ahci
_/src/boot_fb_drv _/src/boot_fb
_/src/intel_gpu_drv _/src/intel_gpu
_/src/nvme_drv _/src/nvme
_/src/pci_decode _/src/pci_decode
_/src/pc_intel_fb_drv _/src/pc_intel_fb
_/src/pc_nic_drv _/src/pc_nic
_/src/pc_platform_drv _/src/pc_platform
_/src/pc_usb_host_drv _/src/pc_usb_host
_/src/ps2_drv _/src/ps2
_/src/usb_block_drv _/src/usb_block
_/src/usb_hid_drv _/src/usb_hid
_/src/vesa_drv _/src/vesa_fb
_/src/rom_reporter _/src/rom_reporter

20
repos/gems/recipes/raw/drivers_nic-pc/drivers.config
View File

@ -16,9 +16,9 @@
<default caps="100"/> <default caps="100"/>
<service name="Nic"> <service name="Nic">
<default-policy> <child name="nic_drv"/> </default-policy> </service> <default-policy> <child name="nic"/> </default-policy> </service>
<start name="acpi_drv" caps="300"> <start name="acpi" caps="300">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<route> <route>
<service name="IO_MEM"> <parent/> </service> <service name="IO_MEM"> <parent/> </service>
@ -38,8 +38,8 @@
<service name="Report" /> <service name="Report" />
</provides> </provides>
<config> <config>
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi -> acpi"/>
<policy label="platform_drv -> devices" report="pci_decode -> devices"/> <policy label="platform -> devices" report="pci_decode -> devices"/>
</config> </config>
<route> <route>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
@ -63,7 +63,7 @@
</route> </route>
</start> </start>
<start name="platform_drv" caps="200" managing_system="yes"> <start name="platform" caps="200" managing_system="yes">
<resource name="RAM" quantum="3M"/> <resource name="RAM" quantum="3M"/>
<provides> <provides>
<service name="Platform"/> <service name="Platform"/>
@ -81,7 +81,7 @@
<service name="Timer"> <parent/> </service> <service name="Timer"> <parent/> </service>
</route> </route>
<config> <config>
<policy label_prefix="nic_drv" info="yes"> <pci class="ETHERNET"/> </policy> <policy label_prefix="nic" info="yes"> <pci class="ETHERNET"/> </policy>
</config> </config>
</start> </start>
@ -93,7 +93,7 @@
<service name="Report" /> <service name="Report" />
</provides> </provides>
<config verbose="yes"> <config verbose="yes">
<policy label="nic -> devices" report="nic_drv -> devices"/> <policy label="nic -> devices" report="nic -> devices"/>
</config> </config>
<route> <route>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
@ -103,11 +103,11 @@
</route> </route>
</start> </start>
<start name="nic_drv" caps="250"> <start name="nic" caps="250">
<binary name="pc_nic_drv"/> <binary name="pc_nic"/>
<resource name="RAM" quantum="10M"/> <resource name="RAM" quantum="10M"/>
<route> <route>
<service name="Platform"> <child name="platform_drv"/> </service> <service name="Platform"> <child name="platform"/> </service>
<service name="ROM"> <parent/> </service> <service name="ROM"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="RM"> <parent/> </service> <service name="RM"> <parent/> </service>

2
repos/gems/run/mixer_gui_qt_test.run
View File

@ -70,7 +70,7 @@ install_config {
<service name="Gui"> <child name="wm"/> </service> <service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service> <service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="channel_list"> <child name="dynamic_rom" /> </service> <service name="ROM" label="channel_list"> <child name="dynamic_rom" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service> <service name="ROM" label="mesa_gpu.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>

52
repos/gems/run/sculpt.run
View File

@ -175,43 +175,43 @@ proc log_route { } {
proc driver_routes { } { proc driver_routes { } {
set result(pc) { set result(pc) {
<service name="ROM" label="nic_drv"> <parent label="pc_nic_drv"/> </service> <service name="ROM" label="nic"> <parent label="pc_nic"/> </service>
<service name="ROM" label="wifi.lib.so"> <parent label="pc_wifi.lib.so"/> </service> <service name="ROM" label="wifi.lib.so"> <parent label="pc_wifi.lib.so"/> </service>
<service name="ROM" label="wifi_firmware.tar"> <parent label="pc_wifi_firmware.tar"/> </service> <service name="ROM" label="wifi_firmware.tar"> <parent label="pc_wifi_firmware.tar"/> </service>
<service name="ROM" label="usb_drv"> <parent label="pc_usb_host_drv"/> </service> <service name="ROM" label="usb"> <parent label="pc_usb_host"/> </service>
} }
set result(mnt_reform2) { set result(mnt_reform2) {
<service name="ROM" label="fb_drv"> <parent label="imx8mq_fb_drv"/> </service> <service name="ROM" label="fb"> <parent label="imx8mq_fb"/> </service>
<service name="ROM" label="fb_drv.dtb"> <parent label="imx8mq_fb_drv-mnt_reform2.dtb"/> </service> <service name="ROM" label="fb.dtb"> <parent label="imx8mq_fb-mnt_reform2.dtb"/> </service>
<service name="ROM" label="mmc_drv"> <parent label="imx8mq_sd_card_drv"/> </service> <service name="ROM" label="mmc"> <parent label="imx8mq_sd_card"/> </service>
<service name="ROM" label="mmc_drv.dtb"> <parent label="imx8mq_sd_card_drv-mnt_reform2.dtb"/> </service> <service name="ROM" label="mmc.dtb"> <parent label="imx8mq_sd_card-mnt_reform2.dtb"/> </service>
<service name="ROM" label="nic_drv"> <parent label="fec_nic_drv"/> </service> <service name="ROM" label="nic"> <parent label="fec_nic"/> </service>
<service name="ROM" label="nic_drv.dtb"> <parent label="fec_nic_drv-mnt_reform2.dtb"/> </service> <service name="ROM" label="nic.dtb"> <parent label="fec_nic-mnt_reform2.dtb"/> </service>
<service name="ROM" label="usb_drv"> <parent label="imx8mq_usb_host_drv"/> </service> <service name="ROM" label="usb"> <parent label="imx8mq_usb_host"/> </service>
<service name="ROM" label="usb_drv.dtb"> <parent label="imx8mq_usb_host_drv-mnt_reform2.dtb"/> </service> <service name="ROM" label="usb.dtb"> <parent label="imx8mq_usb_host-mnt_reform2.dtb"/> </service>
<service name="ROM" label="wifi.lib.so"> <parent label="imx8mq_wifi.lib.so"/> </service> <service name="ROM" label="wifi.lib.so"> <parent label="imx8mq_wifi.lib.so"/> </service>
<service name="ROM" label="wifi_firmware.tar"> <parent label="imx8mq_wifi_firmware.tar"/> </service> <service name="ROM" label="wifi_firmware.tar"> <parent label="imx8mq_wifi_firmware.tar"/> </service>
<service name="I2c"> <child name="drivers"/> </service> <service name="I2c"> <child name="drivers"/> </service>
} }
set result(imx8q_evk) { set result(imx8q_evk) {
<service name="ROM" label="nic_drv"> <parent label="fec_nic_drv"/> </service> <service name="ROM" label="nic"> <parent label="fec_nic"/> </service>
<service name="ROM" label="nic_drv.dtb"> <parent label="fec_nic_drv-imx8q_evk.dtb"/> </service> <service name="ROM" label="nic.dtb"> <parent label="fec_nic-imx8q_evk.dtb"/> </service>
} }
set result(pinephone) { set result(pinephone) {
<service name="ROM" label="wifi.lib.so"> <parent label="a64_wifi.lib.so"/> </service> <service name="ROM" label="wifi.lib.so"> <parent label="a64_wifi.lib.so"/> </service>
<service name="ROM" label="wifi_drv.dtb"> <parent label="wifi-pinephone.dtb"/> </service> <service name="ROM" label="wifi.dtb"> <parent label="wifi-pinephone.dtb"/> </service>
<service name="ROM" label="wifi_firmware.tar"> <parent label="a64_wifi_firmware.tar"/> </service> <service name="ROM" label="wifi_firmware.tar"> <parent label="a64_wifi_firmware.tar"/> </service>
<service name="ROM" label="usb_drv"> <parent label="a64_usb_host_drv"/> </service> <service name="ROM" label="usb"> <parent label="a64_usb_host"/> </service>
<service name="ROM" label="usb_drv.dtb"> <parent label="usb-pinephone.dtb"/> </service> <service name="ROM" label="usb.dtb"> <parent label="usb-pinephone.dtb"/> </service>
<service name="ROM" label="mmc_drv"> <parent label="a64_sd_card_drv"/> </service> <service name="ROM" label="mmc"> <parent label="a64_sd_card"/> </service>
<service name="ROM" label="mmc_drv.dtb"> <parent label="sd_card-pinephone.dtb"/> </service> <service name="ROM" label="mmc.dtb"> <parent label="sd_card-pinephone.dtb"/> </service>
<service name="ROM" label="fb_drv"> <parent label="de_fb_drv"/> </service> <service name="ROM" label="fb"> <parent label="de_fb"/> </service>
<service name="ROM" label="fb_drv.dtb"> <parent label="de-pinephone.dtb"/> </service> <service name="ROM" label="fb.dtb"> <parent label="de-pinephone.dtb"/> </service>
<service name="ROM" label="touch_drv"> <parent label="goodix_touch_drv"/> </service> <service name="ROM" label="touch"> <parent label="goodix_touch"/> </service>
<service name="ROM" label="touch_drv.dtb"> <parent label="goodix-pinephone.dtb"/> </service> <service name="ROM" label="touch.dtb"> <parent label="goodix-pinephone.dtb"/> </service>
<service name="IRQ" label_prefix="touch ->"> <child name="drivers" label="runtime -> touch -> PH4"/> </service> <service name="IRQ" label_prefix="touch ->"> <child name="drivers" label="runtime -> touch -> PH4"/> </service>
} }
@ -433,8 +433,8 @@ install_config {
} [log_route] { } [log_route] {
<service name="ROM" label="config"> <service name="ROM" label="config">
<child name="config_fs_rom" label="drivers"/> </service> <child name="config_fs_rom" label="drivers"/> </service>
<service name="ROM" label_last="gpu_drv.config"> <service name="ROM" label_last="gpu.config">
<child name="config_fs_rom" label="gpu_drv"/> </service> <child name="config_fs_rom" label="gpu"/> </service>
<service name="ROM" label_last="system"> <service name="ROM" label_last="system">
<child name="config_fs_rom" label="managed/system"/> </service> <child name="config_fs_rom" label="managed/system"/> </service>
<service name="ROM" label_last="modem.config"> <service name="ROM" label_last="modem.config">
@ -750,7 +750,7 @@ set optional_configs {
event_filter event_filter
wifi wifi
runtime runtime
gpu_drv gpu
} }
foreach config $optional_configs { foreach config $optional_configs {
@ -764,7 +764,7 @@ foreach config $optional_configs {
set required_configs { set required_configs {
nitpicker nitpicker
deploy deploy
fb_drv fb
clipboard clipboard
drivers drivers
numlock_remap numlock_remap
@ -840,7 +840,7 @@ foreach config { fonts wifi runtime event_filter system } {
} }
} }
copy_file [file join [initial_config_dir] fb_drv] [managed_config_path fb_drv] copy_file [file join [initial_config_dir] fb] [managed_config_path fb]
# #

2
repos/gems/run/sculpt/index
View File

@ -22,7 +22,7 @@
<pkg path="file_vault" info="encrypted file store"/> <pkg path="file_vault" info="encrypted file store"/>
<pkg path="black_hole" info="pseudo service provider"/> <pkg path="black_hole" info="pseudo service provider"/>
<pkg path="usb_webcam" info="USB webcam"/> <pkg path="usb_webcam" info="USB webcam"/>
<pkg path="bsd_audio_drv" info="audio driver" arch="x86_64"/> <pkg path="bsd_audio" info="audio driver" arch="x86_64"/>
<pkg path="mixer" info="audio mixer"/> <pkg path="mixer" info="audio mixer"/>
<pkg path="terminal" info="graphical terminal"/> <pkg path="terminal" info="graphical terminal"/>
<pkg path="gdb_x86" info="GNU debugger" arch="x86_64"/> <pkg path="gdb_x86" info="GNU debugger" arch="x86_64"/>

2
repos/gems/run/sculpt_test.run
View File

@ -2,7 +2,7 @@ set use_nvme 0
source ${genode_dir}/repos/gems/run/sculpt.run source ${genode_dir}/repos/gems/run/sculpt.run
# enable Qemu networking, usable via the nic_drv # enable Qemu networking, usable via the nic driver
append_qemu_nic_args append_qemu_nic_args
append qemu_args " -m 1024 " append qemu_args " -m 1024 "

2
repos/gems/run/terminal_log.run
View File

@ -23,7 +23,7 @@ install_config {
<service name="Gui"> <child name="nitpicker"/> </service> <service name="Gui"> <child name="nitpicker"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
<service name="Terminal"> <child name="terminal"/> </service> <service name="Terminal"> <child name="terminal"/> </service>
<service name="Platform"> <child name="platform_drv"/> </service> <service name="Platform"> <child name="platform"/> </service>
<any-service><parent/></any-service> <any-service><parent/></any-service>
</default-route> </default-route>

10
repos/gems/run/tiled_wm.run
View File

@ -118,7 +118,7 @@ install_config {
<route> <route>
<service name="Gui"> <child name="wm"/> </service> <service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service> <service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service> <service name="ROM" label="mesa_gpu.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<service name="ROM" label="apps"> <child name="test_reports" /> </service> <service name="ROM" label="apps"> <child name="test_reports" /> </service>
<service name="ROM" label="overlay"> <child name="test_reports" /> </service> <service name="ROM" label="overlay"> <child name="test_reports" /> </service>
@ -144,7 +144,7 @@ install_config {
<route> <route>
<service name="Gui"> <child name="wm"/> </service> <service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service> <service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service> <service name="ROM" label="mesa_gpu.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service> <any-service> <parent /> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -167,7 +167,7 @@ install_config {
<route> <route>
<service name="Gui"> <child name="wm"/> </service> <service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service> <service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service> <service name="ROM" label="mesa_gpu.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service> <any-service> <parent /> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -190,7 +190,7 @@ install_config {
<route> <route>
<service name="Gui"> <child name="wm"/> </service> <service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service> <service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service> <service name="ROM" label="mesa_gpu.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service> <any-service> <parent /> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -212,7 +212,7 @@ install_config {
<route> <route>
<service name="Gui"> <child name="wm"/> </service> <service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service> <service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service> <service name="ROM" label="mesa_gpu.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service> <any-service> <parent /> <any-child/> </any-service>
</route> </route>
</start> </start>

4
repos/gems/run/trace_recorder.run
View File

@ -41,7 +41,7 @@ import_from_depot \
[depot_user]/src/nic_router \ [depot_user]/src/nic_router \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \
[depot_user]/src/vfs \ [depot_user]/src/vfs \
[depot_user]/src/linux_rtc_drv \ [depot_user]/src/linux_rtc \
[depot_user]/src/trace_recorder \ [depot_user]/src/trace_recorder \
[depot_user]/raw/trace_recorder \ [depot_user]/raw/trace_recorder \
[depot_user]/src/trace_recorder_policy \ [depot_user]/src/trace_recorder_policy \
@ -70,7 +70,7 @@ install_config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="linux_rtc_drv" ld="no"> <start name="linux_rtc" ld="no">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Rtc"/> </provides> <provides> <service name="Rtc"/> </provides>
</start> </start>

4
repos/gems/run/trace_recorder_ctf.run
View File

@ -26,7 +26,7 @@ import_from_depot \
[depot_user]/src/rom_logger \ [depot_user]/src/rom_logger \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \
[depot_user]/src/vfs \ [depot_user]/src/vfs \
[depot_user]/src/dummy_rtc_drv \ [depot_user]/src/dummy_rtc \
[depot_user]/src/trace_recorder \ [depot_user]/src/trace_recorder \
[depot_user]/raw/trace_recorder \ [depot_user]/raw/trace_recorder \
[depot_user]/src/trace_recorder_policy \ [depot_user]/src/trace_recorder_policy \
@ -113,7 +113,7 @@ install_config {
</route> </route>
</start> </start>
<start name="dummy_rtc_drv"> <start name="dummy_rtc">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Rtc"/> </provides> <provides> <service name="Rtc"/> </provides>
</start> </start>

4
repos/gems/run/trace_recorder_pcapng.run
View File

@ -25,7 +25,7 @@ import_from_depot \
[depot_user]/src/libc \ [depot_user]/src/libc \
[depot_user]/src/nic_router \ [depot_user]/src/nic_router \
[depot_user]/src/vfs \ [depot_user]/src/vfs \
[depot_user]/src/linux_rtc_drv \ [depot_user]/src/linux_rtc \
[depot_user]/src/trace_recorder \ [depot_user]/src/trace_recorder \
[depot_user]/raw/trace_recorder \ [depot_user]/raw/trace_recorder \
[depot_user]/src/trace_recorder_policy \ [depot_user]/src/trace_recorder_policy \
@ -54,7 +54,7 @@ install_config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="linux_rtc_drv" ld="no"> <start name="linux_rtc" ld="no">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Rtc"/> </provides> <provides> <service name="Rtc"/> </provides>
</start> </start>

2
repos/gems/sculpt/default-pc.sculpt
View File

@ -1,7 +1,7 @@
# configuration decisions # configuration decisions
drivers: pc drivers: pc
system: pc system: pc
gpu_drv: intel gpu: intel
# supplemental depot content added to the system image # supplemental depot content added to the system image
import: pkg/sculpt_drivers-pc import: pkg/sculpt_drivers-pc

2
repos/gems/sculpt/deploy/goa_testbed
View File

@ -110,7 +110,7 @@
<service name="ROM" label="clipboard"> <child name="wm"/> </service> <service name="ROM" label="clipboard"> <child name="wm"/> </service>
<service name="ROM" label="platform_info"> <parent label="platform_info"/> </service> <service name="ROM" label="platform_info"> <parent label="platform_info"/> </service>
<service name="ROM" label="capslock"> <parent label="capslock"/> </service> <service name="ROM" label="capslock"> <parent label="capslock"/> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <child name="mesa_gpu-intel"/> </service> <service name="ROM" label="mesa_gpu.lib.so"> <child name="mesa_gpu-intel"/> </service>
</route> </route>
</start> </start>

18
repos/gems/sculpt/drivers/pc
View File

@ -22,17 +22,17 @@
<default caps="100"/> <default caps="100"/>
<service name="Platform"> <service name="Platform">
<default-policy> <child name="platform_drv"/> </default-policy> </service> <default-policy> <child name="platform"/> </default-policy> </service>
<start name="report_rom"> <start name="report_rom">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides> <provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="no"> <config verbose="no">
<policy label="pci_decode -> system" report="acpi_drv -> acpi"/> <policy label="pci_decode -> system" report="acpi -> acpi"/>
<policy label="platform_drv -> acpi" report="acpi_drv -> acpi"/> <policy label="platform -> acpi" report="acpi -> acpi"/>
<policy label="platform_drv -> devices" report="pci_decode -> devices"/> <policy label="platform -> devices" report="pci_decode -> devices"/>
<policy label="rom_reporter -> acpi" report="acpi_drv -> acpi"/> <policy label="rom_reporter -> acpi" report="acpi -> acpi"/>
<policy label="rom_reporter -> devices" report="platform_drv -> devices"/> <policy label="rom_reporter -> devices" report="platform -> devices"/>
</config> </config>
</start> </start>
@ -54,7 +54,7 @@
</route> </route>
</start> </start>
<start name="acpi_drv" caps="350"> <start name="acpi" caps="350">
<resource name="RAM" quantum="7M"/> <resource name="RAM" quantum="7M"/>
<route> <route>
<service name="Report" label="acpi"> <child name="report_rom"/> </service> <service name="Report" label="acpi"> <child name="report_rom"/> </service>
@ -83,8 +83,8 @@
</route> </route>
</start> </start>
<start name="platform_drv" caps="400" managing_system="yes"> <start name="platform" caps="400" managing_system="yes">
<binary name="pc_platform_drv"/> <binary name="pc_platform"/>
<resource name="RAM" quantum="6M"/> <resource name="RAM" quantum="6M"/>
<provides> <service name="Platform"/> </provides> <provides> <service name="Platform"/> </provides>
<route> <route>

0
repos/gems/sculpt/fb_drv/default → repos/gems/sculpt/fb/default
View File

0
repos/gems/sculpt/gpu_drv/intel → repos/gems/sculpt/gpu/intel
View File

2
repos/gems/sculpt/launcher/audio
View File

@ -1,4 +1,4 @@
<launcher pkg="bsd_audio_drv" priority="0"> <launcher pkg="bsd_audio" priority="0">
<config report_mixer="yes" record_play="yes"> <config report_mixer="yes" record_play="yes">
<!-- value range [0,255] --> <!-- value range [0,255] -->
<mixer field="outputs.master" value="255"/> <mixer field="outputs.master" value="255"/>

4
repos/gems/sculpt/leitzentrale/default
View File

@ -229,8 +229,8 @@
<child name="config_fs_report" label="managed -> fonts"/> </service> <child name="config_fs_report" label="managed -> fonts"/> </service>
<service name="Report" label="nic_router_config"> <service name="Report" label="nic_router_config">
<child name="config_fs_report" label="managed -> nic_router"/> </service> <child name="config_fs_report" label="managed -> nic_router"/> </service>
<service name="Report" label="fb_drv_config"> <service name="Report" label="fb_config">
<child name="config_fs_report" label="managed -> fb_drv"/> </service> <child name="config_fs_report" label="managed -> fb"/> </service>
<service name="Report" label="usb_config"> <service name="Report" label="usb_config">
<child name="config_fs_report" label="managed -> usb"/> </service> <child name="config_fs_report" label="managed -> usb"/> </service>
<service name="Report" label="system_config"> <service name="Report" label="system_config">

2
repos/gems/src/app/phone_manager/main.cc
View File

@ -2272,7 +2272,7 @@ void Sculpt::Main::_handle_runtime_state(Xml_node const &state)
_storage._storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) { _storage._storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) {
Child_exit_state exit_state(state, dev.driver); Child_exit_state exit_state(state, dev.driver);
if (exit_state.exited) { if (exit_state.exited) {
dev.discard_usb_block_drv(); dev.discard_usb_block();
reconfigure_runtime = true; reconfigure_runtime = true;
regenerate_dialog = true; regenerate_dialog = true;
} }

4
repos/gems/src/app/sculpt_manager/driver/ahci.h
View File

@ -43,7 +43,7 @@ struct Sculpt::Ahci_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_ahci->gen_start_node_content(xml); _ahci->gen_start_node_content(xml);
gen_named_node(xml, "binary", "ahci_drv"); gen_named_node(xml, "binary", "ahci");
gen_provides<Block::Session>(xml); gen_provides<Block::Session>(xml);
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("system", "yes"); xml.attribute("system", "yes");
@ -56,7 +56,7 @@ struct Sculpt::Ahci_driver : private Noncopyable
}); });
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session>(xml); gen_parent_route<Platform::Session>(xml);
gen_parent_rom_route(xml, "ahci_drv"); gen_parent_rom_route(xml, "ahci");
gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_parent_rom_route(xml, "system", "config -> managed/system");
gen_common_routes(xml); gen_common_routes(xml);
}); });

32
repos/gems/src/app/sculpt_manager/driver/fb.h
View File

@ -43,29 +43,29 @@ struct Sculpt::Fb_driver : private Noncopyable
fn(); }); fn(); });
}; };
start_node(_intel_gpu, "intel_gpu_drv", [&] { start_node(_intel_gpu, "intel_gpu", [&] {
xml.node("provides", [&] { xml.node("provides", [&] {
gen_service_node<Gpu::Session> (xml, [&] { }); gen_service_node<Gpu::Session> (xml, [&] { });
gen_service_node<Platform::Session>(xml, [&] { }); gen_service_node<Platform::Session>(xml, [&] { });
}); });
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session>(xml); gen_parent_route<Platform::Session>(xml);
gen_parent_rom_route(xml, "intel_gpu_drv"); gen_parent_rom_route(xml, "intel_gpu");
gen_parent_rom_route(xml, "config", "config -> gpu_drv"); gen_parent_rom_route(xml, "config", "config -> gpu");
gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_parent_rom_route(xml, "system", "config -> managed/system");
gen_parent_route<Rm_session>(xml); gen_parent_route<Rm_session>(xml);
gen_common_routes(xml); gen_common_routes(xml);
}); });
}); });
start_node(_intel_fb, "pc_intel_fb_drv", [&] { start_node(_intel_fb, "pc_intel_fb", [&] {
xml.node("heartbeat", [&] { }); xml.node("heartbeat", [&] { });
xml.node("route", [&] { xml.node("route", [&] {
gen_service_node<Platform::Session>(xml, [&] { gen_service_node<Platform::Session>(xml, [&] {
gen_named_node(xml, "child", "intel_gpu"); }); gen_named_node(xml, "child", "intel_gpu"); });
gen_capture_route(xml); gen_capture_route(xml);
gen_parent_rom_route(xml, "pc_intel_fb_drv"); gen_parent_rom_route(xml, "pc_intel_fb");
gen_parent_rom_route(xml, "config", "config -> managed/fb_drv"); gen_parent_rom_route(xml, "config", "config -> managed/fb");
gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_parent_rom_route(xml, "system", "config -> managed/system");
gen_parent_rom_route(xml, "intel_opregion", "report -> drivers/intel_opregion"); gen_parent_rom_route(xml, "intel_opregion", "report -> drivers/intel_opregion");
gen_parent_route<Rm_session>(xml); gen_parent_route<Rm_session>(xml);
@ -73,22 +73,22 @@ struct Sculpt::Fb_driver : private Noncopyable
}); });
}); });
start_node(_vesa_fb, "vesa_fb_drv", [&] { start_node(_vesa_fb, "vesa_fb", [&] {
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session>(xml); gen_parent_route<Platform::Session>(xml);
gen_capture_route(xml); gen_capture_route(xml);
gen_parent_rom_route(xml, "vesa_fb_drv"); gen_parent_rom_route(xml, "vesa_fb");
gen_parent_rom_route(xml, "config", "config -> fb_drv"); gen_parent_rom_route(xml, "config", "config -> fb");
gen_parent_route<Io_mem_session>(xml); gen_parent_route<Io_mem_session>(xml);
gen_parent_route<Io_port_session>(xml); gen_parent_route<Io_port_session>(xml);
gen_common_routes(xml); gen_common_routes(xml);
}); });
}); });
start_node(_boot_fb, "boot_fb_drv", [&] { start_node(_boot_fb, "boot_fb", [&] {
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_rom_route(xml, "config", "config -> fb_drv"); gen_parent_rom_route(xml, "config", "config -> fb");
gen_parent_rom_route(xml, "boot_fb_drv"); gen_parent_rom_route(xml, "boot_fb");
gen_parent_rom_route(xml, "platform_info"); gen_parent_rom_route(xml, "platform_info");
gen_parent_route<Io_mem_session>(xml); gen_parent_route<Io_mem_session>(xml);
gen_capture_route(xml); gen_capture_route(xml);
@ -96,15 +96,15 @@ struct Sculpt::Fb_driver : private Noncopyable
}); });
}); });
start_node(_soc_fb, "fb_drv", [&] { start_node(_soc_fb, "fb", [&] {
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session> (xml); gen_parent_route<Platform::Session> (xml);
gen_parent_route<Pin_control::Session>(xml); gen_parent_route<Pin_control::Session>(xml);
gen_parent_route<I2c::Session>(xml); gen_parent_route<I2c::Session>(xml);
gen_capture_route(xml); gen_capture_route(xml);
gen_parent_rom_route(xml, "fb_drv"); gen_parent_rom_route(xml, "fb");
gen_parent_rom_route(xml, "config", "config -> fb_drv"); gen_parent_rom_route(xml, "config", "config -> fb");
gen_parent_rom_route(xml, "dtb", "fb_drv.dtb"); gen_parent_rom_route(xml, "dtb", "fb.dtb");
gen_parent_route<Rm_session>(xml); gen_parent_route<Rm_session>(xml);
gen_common_routes(xml); gen_common_routes(xml);
}); });

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

@ -43,7 +43,7 @@ struct Sculpt::Mmc_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_mmc->gen_start_node_content(xml); _mmc->gen_start_node_content(xml);
gen_named_node(xml, "binary", "mmc_drv"); gen_named_node(xml, "binary", "mmc");
gen_provides<Block::Session>(xml); gen_provides<Block::Session>(xml);
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("report", "yes"); xml.attribute("report", "yes");
@ -58,8 +58,8 @@ struct Sculpt::Mmc_driver : private Noncopyable
}); });
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session>(xml); gen_parent_route<Platform::Session>(xml);
gen_parent_rom_route(xml, "dtb", "mmc_drv.dtb"); gen_parent_rom_route(xml, "dtb", "mmc.dtb");
gen_parent_rom_route(xml, "mmc_drv"); gen_parent_rom_route(xml, "mmc");
gen_common_routes(xml); gen_common_routes(xml);
}); });
}); });

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

@ -28,7 +28,7 @@ struct Sculpt::Nic_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_nic->gen_start_node_content(xml); _nic->gen_start_node_content(xml);
gen_named_node(xml, "binary", "nic_drv"); gen_named_node(xml, "binary", "nic");
xml.node("config", [&] { }); xml.node("config", [&] { });
xml.node("route", [&] { xml.node("route", [&] {
gen_service_node<Platform::Session>(xml, [&] { gen_service_node<Platform::Session>(xml, [&] {
@ -38,8 +38,8 @@ struct Sculpt::Nic_driver : private Noncopyable
xml.node("child", [&] { xml.node("child", [&] {
xml.attribute("name", "nic_router"); }); }); xml.attribute("name", "nic_router"); }); });
gen_common_routes(xml); gen_common_routes(xml);
gen_parent_rom_route(xml, "nic_drv"); gen_parent_rom_route(xml, "nic");
gen_parent_rom_route(xml, "nic_drv.dtb"); gen_parent_rom_route(xml, "nic.dtb");
gen_parent_route<Rm_session>(xml); gen_parent_route<Rm_session>(xml);
}); });
}); });

4
repos/gems/src/app/sculpt_manager/driver/nvme.h
View File

@ -43,7 +43,7 @@ struct Sculpt::Nvme_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_nvme->gen_start_node_content(xml); _nvme->gen_start_node_content(xml);
gen_named_node(xml, "binary", "nvme_drv"); gen_named_node(xml, "binary", "nvme");
gen_provides<Block::Session>(xml); gen_provides<Block::Session>(xml);
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("system", "yes"); xml.attribute("system", "yes");
@ -55,7 +55,7 @@ struct Sculpt::Nvme_driver : private Noncopyable
}); });
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session>(xml); gen_parent_route<Platform::Session>(xml);
gen_parent_rom_route(xml, "nvme_drv"); gen_parent_rom_route(xml, "nvme");
gen_parent_rom_route(xml, "system", "config -> managed/system"); gen_parent_rom_route(xml, "system", "config -> managed/system");
gen_common_routes(xml); gen_common_routes(xml);
}); });

2
repos/gems/src/app/sculpt_manager/driver/ps2.h
View File

@ -29,7 +29,7 @@ struct Sculpt::Ps2_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_ps2->gen_start_node_content(xml); _ps2->gen_start_node_content(xml);
gen_named_node(xml, "binary", "ps2_drv"); gen_named_node(xml, "binary", "ps2");
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("capslock_led", "rom"); xml.attribute("capslock_led", "rom");

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

@ -28,12 +28,12 @@ struct Sculpt::Touch_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_soc->gen_start_node_content(xml); _soc->gen_start_node_content(xml);
gen_named_node(xml, "binary", "touch_drv"); gen_named_node(xml, "binary", "touch");
xml.node("config", [&] { }); xml.node("config", [&] { });
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session> (xml); gen_parent_route<Platform::Session> (xml);
gen_parent_rom_route(xml, "dtb", "touch_drv.dtb"); gen_parent_rom_route(xml, "dtb", "touch.dtb");
gen_parent_rom_route(xml, "touch_drv"); gen_parent_rom_route(xml, "touch");
gen_common_routes(xml); gen_common_routes(xml);
gen_parent_route<Pin_control::Session>(xml); gen_parent_route<Pin_control::Session>(xml);
gen_parent_route<Irq_session> (xml); gen_parent_route<Irq_session> (xml);

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

@ -117,18 +117,18 @@ struct Sculpt::Usb_driver : private Noncopyable
fn(); }); fn(); });
}; };
start_node(_hcd, "usb_drv", [&] { start_node(_hcd, "usb", [&] {
gen_provides<Usb::Session>(xml); gen_provides<Usb::Session>(xml);
xml.node("route", [&] { xml.node("route", [&] {
gen_parent_route<Platform::Session>(xml); gen_parent_route<Platform::Session>(xml);
gen_parent_rom_route(xml, "usb_drv"); gen_parent_rom_route(xml, "usb");
gen_parent_rom_route(xml, "config", "config -> managed/usb"); gen_parent_rom_route(xml, "config", "config -> managed/usb");
gen_parent_rom_route(xml, "dtb", "usb_drv.dtb"); gen_parent_rom_route(xml, "dtb", "usb.dtb");
gen_common_routes(xml); gen_common_routes(xml);
}); });
}); });
start_node(_hid, "usb_hid_drv", [&] { start_node(_hid, "usb_hid", [&] {
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("capslock_led", "rom"); xml.attribute("capslock_led", "rom");
xml.attribute("numlock_led", "rom"); xml.attribute("numlock_led", "rom");
@ -136,7 +136,7 @@ struct Sculpt::Usb_driver : private Noncopyable
xml.node("route", [&] { xml.node("route", [&] {
gen_service_node<Usb::Session>(xml, [&] { gen_service_node<Usb::Session>(xml, [&] {
gen_named_node(xml, "child", "usb"); }); gen_named_node(xml, "child", "usb"); });
gen_parent_rom_route(xml, "usb_hid_drv"); gen_parent_rom_route(xml, "usb_hid");
gen_parent_rom_route(xml, "capslock", "capslock"); gen_parent_rom_route(xml, "capslock", "capslock");
gen_parent_rom_route(xml, "numlock", "numlock"); gen_parent_rom_route(xml, "numlock", "numlock");
gen_common_routes(xml); gen_common_routes(xml);
@ -146,14 +146,14 @@ struct Sculpt::Usb_driver : private Noncopyable
}); });
}); });
start_node(_net, "usb_net_drv", [&] { start_node(_net, "usb_net", [&] {
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("mac", "02:00:00:00:01:05"); xml.attribute("mac", "02:00:00:00:01:05");
}); });
xml.node("route", [&] { xml.node("route", [&] {
gen_service_node<Usb::Session>(xml, [&] { gen_service_node<Usb::Session>(xml, [&] {
gen_named_node(xml, "child", "usb"); }); gen_named_node(xml, "child", "usb"); });
gen_parent_rom_route(xml, "usb_net_drv"); gen_parent_rom_route(xml, "usb_net");
gen_common_routes(xml); gen_common_routes(xml);
gen_service_node<Uplink::Session>(xml, [&] { gen_service_node<Uplink::Session>(xml, [&] {
xml.node("child", [&] { xml.node("child", [&] {

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

@ -28,10 +28,10 @@ struct Sculpt::Wifi_driver : private Noncopyable
xml.node("start", [&] { xml.node("start", [&] {
_wifi->gen_start_node_content(xml); _wifi->gen_start_node_content(xml);
gen_named_node(xml, "binary", "wifi_drv"); gen_named_node(xml, "binary", "wifi");
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("dtb", "wifi_drv.dtb"); xml.attribute("dtb", "wifi.dtb");
xml.node("vfs", [&] { xml.node("vfs", [&] {
gen_named_node(xml, "dir", "dev", [&] { gen_named_node(xml, "dir", "dev", [&] {
@ -68,8 +68,8 @@ struct Sculpt::Wifi_driver : private Noncopyable
xml.attribute("name", "nic_router"); xml.attribute("name", "nic_router");
xml.attribute("label", "wifi -> "); }); }); xml.attribute("label", "wifi -> "); }); });
gen_common_routes(xml); gen_common_routes(xml);
gen_parent_rom_route(xml, "wifi_drv"); gen_parent_rom_route(xml, "wifi");
gen_parent_rom_route(xml, "wifi_drv.dtb"); gen_parent_rom_route(xml, "wifi.dtb");
gen_parent_rom_route(xml, "libcrypto.lib.so"); gen_parent_rom_route(xml, "libcrypto.lib.so");
gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_rom_route(xml, "vfs.lib.so");
gen_parent_rom_route(xml, "libc.lib.so"); gen_parent_rom_route(xml, "libc.lib.so");

12
repos/gems/src/app/sculpt_manager/main.cc
View File

@ -1555,12 +1555,12 @@ struct Sculpt::Main : Input_event_handler,
_cached_runtime_config, _cached_runtime_config,
_file_browser_state, *this }; _file_browser_state, *this };
Managed_config<Main> _fb_drv_config { Managed_config<Main> _fb_config {
_env, "config", "fb_drv", *this, &Main::_handle_fb_drv_config }; _env, "config", "fb", *this, &Main::_handle_fb_config };
void _handle_fb_drv_config(Xml_node const &node) void _handle_fb_config(Xml_node const &node)
{ {
_fb_drv_config.generate([&] (Xml_generator &xml) { _fb_config.generate([&] (Xml_generator &xml) {
xml.attribute("system", "yes"); xml.attribute("system", "yes");
copy_attributes(xml, node); copy_attributes(xml, node);
node.for_each_sub_node([&] (Xml_node const &sub_node) { node.for_each_sub_node([&] (Xml_node const &sub_node) {
@ -1649,7 +1649,7 @@ struct Sculpt::Main : Input_event_handler,
_gui.input()->sigh(_input_handler); _gui.input()->sigh(_input_handler);
_gui.mode_sigh(_gui_mode_handler); _gui.mode_sigh(_gui_mode_handler);
_handle_gui_mode(); _handle_gui_mode();
_fb_drv_config.trigger_update(); _fb_config.trigger_update();
/* /*
* Generate initial configurations * Generate initial configurations
@ -2158,7 +2158,7 @@ void Sculpt::Main::_handle_runtime_state(Xml_node const &state)
_storage._storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) { _storage._storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) {
Child_exit_state exit_state(state, dev.driver); Child_exit_state exit_state(state, dev.driver);
if (exit_state.exited) { if (exit_state.exited) {
dev.discard_usb_block_drv(); dev.discard_usb_block();
reconfigure_runtime = true; reconfigure_runtime = true;
regenerate_dialog = true; regenerate_dialog = true;
} }

22
repos/gems/src/app/sculpt_manager/model/usb_storage_device.h
View File

@ -29,7 +29,7 @@ struct Sculpt::Usb_storage_device : List_model<Usb_storage_device>::Element,
Storage_device Storage_device
{ {
/** /**
* Information that is reported asynchronously by 'usb_block_drv' * Information that is reported asynchronously by 'usb_block'
*/ */
struct Driver_info struct Driver_info
{ {
@ -48,7 +48,7 @@ struct Sculpt::Usb_storage_device : List_model<Usb_storage_device>::Element,
Env &_env; Env &_env;
/* information provided asynchronously by usb_block_drv */ /* information provided asynchronously by usb_block */
Constructible<Driver_info> driver_info { }; Constructible<Driver_info> driver_info { };
Rom_handler<Usb_storage_device> _report { Rom_handler<Usb_storage_device> _report {
@ -70,17 +70,17 @@ struct Sculpt::Usb_storage_device : List_model<Usb_storage_device>::Element,
}); });
} }
bool usb_block_drv_needed() const bool usb_block_needed() const
{ {
bool drv_needed = false; bool needed = false;
for_each_partition([&] (Partition const &partition) { for_each_partition([&] (Partition const &partition) {
drv_needed |= partition.check_in_progress needed |= partition.check_in_progress
|| partition.format_in_progress || partition.format_in_progress
|| partition.file_system.inspected || partition.file_system.inspected
|| partition.relabel_in_progress() || partition.relabel_in_progress()
|| partition.expand_in_progress(); }); || partition.expand_in_progress(); });
return drv_needed || Storage_device::state == UNKNOWN; return needed || Storage_device::state == UNKNOWN;
} }
/** /**
@ -89,7 +89,7 @@ struct Sculpt::Usb_storage_device : List_model<Usb_storage_device>::Element,
* This method is called as response to a failed USB-block-driver * This method is called as response to a failed USB-block-driver
* initialization. * initialization.
*/ */
void discard_usb_block_drv() void discard_usb_block()
{ {
Storage_device::state = FAILED; Storage_device::state = FAILED;
@ -116,7 +116,7 @@ struct Sculpt::Usb_storage_device : List_model<Usb_storage_device>::Element,
_env(env) _env(env)
{ } { }
inline void gen_usb_block_drv_start_content(Xml_generator &xml) const; inline void gen_usb_block_start_content(Xml_generator &xml) const;
void gen_usb_policy(Xml_generator &xml) const void gen_usb_policy(Xml_generator &xml) const
{ {
@ -141,12 +141,12 @@ struct Sculpt::Usb_storage_device : List_model<Usb_storage_device>::Element,
}; };
void Sculpt::Usb_storage_device::gen_usb_block_drv_start_content(Xml_generator &xml) const void Sculpt::Usb_storage_device::gen_usb_block_start_content(Xml_generator &xml) const
{ {
gen_common_start_content(xml, driver, Cap_quota{100}, Ram_quota{6*1024*1024}, gen_common_start_content(xml, driver, Cap_quota{100}, Ram_quota{6*1024*1024},
Priority::STORAGE); Priority::STORAGE);
gen_named_node(xml, "binary", "usb_block_drv"); gen_named_node(xml, "binary", "usb_block");
xml.node("config", [&] { xml.node("config", [&] {
xml.attribute("report", "yes"); xml.attribute("report", "yes");
@ -160,7 +160,7 @@ void Sculpt::Usb_storage_device::gen_usb_block_drv_start_content(Xml_generator &
xml.node("child", [&] { xml.node("child", [&] {
xml.attribute("name", "usb"); }); }); xml.attribute("name", "usb"); }); });
gen_parent_rom_route(xml, "usb_block_drv"); gen_parent_rom_route(xml, "usb_block");
gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_rom_route(xml, "ld.lib.so");
gen_parent_route<Cpu_session> (xml); gen_parent_route<Cpu_session> (xml);
gen_parent_route<Pd_session> (xml); gen_parent_route<Pd_session> (xml);

4
repos/gems/src/app/sculpt_manager/storage.cc
View File

@ -118,9 +118,9 @@ void Storage::gen_runtime_start_nodes(Xml_generator &xml) const
_storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device const &device) { _storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device const &device) {
if (device.usb_block_drv_needed() || contains_used_fs(device)) if (device.usb_block_needed() || contains_used_fs(device))
xml.node("start", [&] { xml.node("start", [&] {
device.gen_usb_block_drv_start_content(xml); }); device.gen_usb_block_start_content(xml); });
}); });
_storage_devices.for_each([&] (Storage_device const &device) { _storage_devices.for_each([&] (Storage_device const &device) {

2
repos/libports/ports/mesa.hash
View File

@ -1 +1 @@
1fe844251b05c1622f35383317034ec01bac81c2 bbd7ef22df1a6c0ec3bc3fcae5342bc3114d4e0b

2
repos/libports/recipes/pkg/mesa_gears/runtime
View File

@ -4,7 +4,7 @@
<gui/> <gui/>
<gpu/> <gpu/>
<timer/> <timer/>
<rom label="mesa_gpu_drv.lib.so"/> <rom label="mesa_gpu.lib.so"/>
</requires> </requires>
<content> <content>

2
repos/libports/recipes/pkg/qt5_textedit/runtime
View File

@ -6,7 +6,7 @@
<report label="shape"/> <report label="shape"/>
<report label="clipboard"/> <report label="clipboard"/>
<rom label="clipboard"/> <rom label="clipboard"/>
<rom label="mesa_gpu_drv.lib.so"/> <rom label="mesa_gpu.lib.so"/>
<timer/> <timer/>
</requires> </requires>

2
repos/libports/recipes/pkg/sntp_dummy_rtc/archives
View File

@ -1,5 +1,5 @@
_/raw/sntp_dummy_rtc _/raw/sntp_dummy_rtc
_/src/sntp_client _/src/sntp_client
_/src/dummy_rtc_drv _/src/dummy_rtc
_/src/report_rom _/src/report_rom
_/src/init _/src/init

2
repos/libports/recipes/pkg/sntp_dummy_rtc/runtime
View File

@ -6,7 +6,7 @@
<content> <content>
<rom label="sntp_client"/> <rom label="sntp_client"/>
<rom label="report_rom"/> <rom label="report_rom"/>
<rom label="dummy_rtc_drv"/> <rom label="dummy_rtc"/>
<rom label="ntp_rtc.config"/> <rom label="ntp_rtc.config"/>
<rom label="init"/> <rom label="init"/>
</content> </content>

Some files were not shown because too many files have changed in this diff Show More