alex/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove input_merger component

Browse Source 
Fixes #3736
This commit is contained in:
Norman Feske
2020-04-22 16:15:56 +02:00
parent 1459085a4d
commit 840f383e46
8 changed files with 54 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repos/ports/run/vbox_share.inc
View File

@@ -102,7 +102,7 @@ catch { exec dd if=/dev/urandom of=bin/test.bin bs=4096 count=8160 }
# Step 1: prepare and start the actual VM
#
set build_components {
server/input_merger
server/input_filter
server/report_rom server/fs_rom server/vfs
server/tcp_terminal drivers/nic
lib/vfs/lwip lib/vfs/pipe lib/vfs/import
@@ -118,7 +118,7 @@ set boot_modules {
vfs fs_rom
posix.lib.so bash.tar coreutils.tar
tcp_terminal vfs_lwip.lib.so vfs_pipe.lib.so vfs_import.lib.so
ipxe_nic_drv report_rom input_merger
ipxe_nic_drv report_rom input_filter
test.bin template.bat
}
@@ -245,17 +245,26 @@ set config_of_app {
</config>
</start>
<start name="input_merger" priority="-1">
<start name="input_filter" priority="-1">
<resource name="RAM" quantum="1M" />
<provides>
<service name="Input" />
</provides>
<config>}
append_if [expr $use_ps2] config_of_app {
<input label="ps2" /> }
<input label="ps2"/> }
append_if [expr $use_usb] config_of_app {
<input label="usb_hid" />}
<input label="usb_hid"/>}
append config_of_app {
<output>
<merge>}
append_if [expr $use_ps2] config_of_app {
<input name="ps2"/>}
append_if [expr $use_usb] config_of_app {
<input name="usb_hid"/>}
append config_of_app {
</merge>
</output>
</config>
<route> }
append_if [expr $use_ps2] config_of_app {
@@ -272,7 +281,7 @@ append config_of_app {
<provides><service name="Nitpicker"/></provides>
<route>
<service name="Framebuffer"> <child name="fb_drv" /> </service>
<service name="Input"> <child name="input_merger" /> </service>
<service name="Input"> <child name="input_filter" /> </service>
<service name="Report"> <child name="report_rom" /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
@@ -337,7 +346,7 @@ append config_of_app {
<child name="ram_fs_to"/>
</service>
<service name="File_system"> <child name="rump_fs"/> </service>
<service name="Input"> <child name="input_merger"/> </service>
<service name="Input"> <child name="input_filter"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

21
repos/ports/run/vbox_win.inc
View File

@@ -25,7 +25,7 @@ if {[info exists flavor_extension]} {
}
set build_components {
server/input_merger
server/input_filter
drivers/nic
drivers/audio
server/report_rom
@@ -33,7 +33,7 @@ set build_components {
}
set boot_modules {
input_merger
input_filter
ipxe_nic_drv
audio_drv
report_rom
@@ -45,17 +45,26 @@ if {$use_vbox5_nova} { set virtualbox5_binary "virtualbox5-nova" }
set config_of_app {
<start name="input_merger">
<start name="input_filter">
<resource name="RAM" quantum="1M" />
<provides>
<service name="Input" />
</provides>
<config>}
append_if [expr $use_ps2] config_of_app {
<input label="ps2" /> }
<input label="ps2"/> }
append_if [expr $use_usb] config_of_app {
<input label="usb_hid" />}
<input label="usb_hid"/>}
append config_of_app {
<output>
<merge>}
append_if [expr $use_ps2] config_of_app {
<input name="ps2"/>}
append_if [expr $use_usb] config_of_app {
<input name="usb_hid"/>}
append config_of_app {
</merge>
</output>
</config>
<route> }
append_if [expr $use_ps2] config_of_app {
@@ -120,7 +129,7 @@ append config_of_app {
<configfile name="nitpicker.config"/>
<route>
<service name="Framebuffer"> <child name="fb_drv" /> </service>
<service name="Input"> <child name="input_merger" /> </service>
<service name="Input"> <child name="input_filter" /> </service>
<service name="Report"> <child name="report_rom" /> </service>
<service name="ROM" label="nitpicker.config"> <child name="dynamic-config"/> </service>
<any-service> <parent/> <any-child /> </any-service>

14
repos/ports/run/virtualbox_nic_router.run
View File

@@ -25,7 +25,7 @@ append build_components { drivers/input }
append build_components { drivers/rtc }
append build_components { drivers/usb }
append build_components { drivers/nic }
append build_components { server/input_merger }
append build_components { server/input_filter }
append_platform_drv_build_components
@@ -110,7 +110,7 @@ append config {
</route>
</start>
<start name="input_merger" priority="-2">
<start name="input_filter" priority="-2">
<resource name="RAM" quantum="1M" />
<provides>
<service name="Input" />
@@ -118,6 +118,12 @@ append config {
<config>
<input label="ps2" />
<input label="usb_hid" />
<output>
<merge>
<input name="ps2"/>
<input name="usb_hid"/>
</merge>
</output>
</config>
<route>
<service name="Input" label="ps2"> <child name="ps2_drv" /> </service>
@@ -339,7 +345,7 @@ append config {
</vfs>
</config>
<route>
<service name="Input"><child name="input_merger" /></service>
<service name="Input"><child name="input_filter" /></service>
<service name="Nic"> <child name="router2"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent /> <any-child /> </any-service>
@@ -389,7 +395,7 @@ append boot_modules { rtc_drv }
append boot_modules { usb_drv }
append boot_modules { vfs.lib.so }
append boot_modules { ipxe_nic_drv }
append boot_modules { input_merger }
append boot_modules { input_filter }
append boot_modules { log_terminal }
append_platform_drv_boot_modules