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

Update example configurations 

With the change of the Timer::Session interface, all scenarios that use
the timer use core's SIGNAL service. So we need to route sessions
accordingly.

In addition to the adaptation to the changed timer, this patch removes
some stale examples that predate the run tool and are no longer used.
This commit is contained in:
Norman Feske 2013-02-19 12:54:46 +01:00
parent fae63f4fa9
commit ce67b73dca
14 changed files with 58 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/config/bomb
View File

@ -12,6 +12,7 @@
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>

40
os/config/demo
View File

@ -1,40 +0,0 @@
<config>
<parent-provides>
<service name="ROM"/>
<service name="RAM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="CAP"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="ps2_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Input"/></provides>
</start>
<start name="pci_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="PCI"/></provides>
</start>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides>
</start>
<start name="vesa_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>
<start name="launchpad">
<resource name="RAM" quantum="32M"/>
</start>
</config>

35
os/config/gta01
View File

@ -1,35 +0,0 @@
<config>
<parent-provides>
<service name="ROM"/>
<service name="RAM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="CAP"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="gta01_drv">
<resource name="RAM" quantum="2M"/>
<provides>
<service name="Input"/>
<service name="Framebuffer"/>
</provides>
</start>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides>
</start>
<start name="testnit">
<resource name="RAM" quantum="1M"/>
</start>
</config>

43
os/config/linux_demo
View File

@ -1,43 +0,0 @@
<!--
Configuration for init
======================
Init processes a list of programs to start. The starting
order corresponds to the order of the entries in the config
section.
-->
<config>
<parent-provides>
<service name="ROM"/>
<service name="RAM"/>
<service name="CAP"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="fb_sdl">
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Input"/>
<service name="Framebuffer"/>
</provides>
</start>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="nitpicker">
<resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides>
</start>
<start name="launchpad">
<resource name="RAM" quantum="32M"/>
</start>
</config>

67
os/config/mixer
View File

@ -1,67 +0,0 @@
<!--
Example configuration for audio mixer and driver
================================================
The configuration uses the new init configuration
elements. Please add 'SPECS += use_new_init' to your
etc/specs.conf.
-->
<config>
<parent-provides>
<service name="ROM"/>
<service name="RAM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="CAP"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<!-- all clients use the mixer for audio per default -->
<service name="Audio_out"> <child name="mixer"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="timer">
<resource name="RAM" quantum="512K"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="pci_drv">
<resource name="RAM" quantum="512K"/>
<provides> <service name="PCI"/> </provides>
</start>
<start name="audio_out_drv">
<resource name="RAM" quantum="8M"/>
<provides> <service name="Audio_out"/> </provides>
</start>
<start name="mixer">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Audio_out"/> </provides>
<route>
<!-- use the actual driver as mixer back end -->
<service name="Audio_out"> <child name="audio_out_drv"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="test-audio_out">
<resource name="RAM" quantum="12M"/>
<config>
<!-- a bunch of raw media files in 2-channel FLOAT -->
<filename>silence.f32</filename>
<filename>silence.f32</filename>
</config>
</start>
</config>
<!-- vi: set ft=xml : -->

27
os/config/nested_config
View File

@ -41,12 +41,14 @@ the 'configfile' tag:
<service name="CPU"/>
<service name="RM"/>
<service name="PD"/>
<service name="SIGNAL"/>
</parent-provides>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
<route>
<service name="CAP"> <parent/> </service>
<service name="CAP"> <parent/> </service>
<service name="SIGNAL"> <parent/> </service>
</route>
</start>
<start name="init">
@ -54,25 +56,28 @@ the 'configfile' tag:
<config>
<parent-provides>
<service name="Timer"/>
<service name="SIGNAL"/>
<service name="LOG"/>
</parent-provides>
<start name="test-timer">
<resource name="RAM" quantum="1M"/>
<route>
<service name="Timer"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="SIGNAL"> <parent/> </service>
</route>
</start>
</config>
<route>
<service name="Timer"> <child name="timer"/> </service>
<service name="LOG"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="CAP"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="RM"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="LOG"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="RAM"> <parent/> </service>
<service name="CAP"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="RM"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="SIGNAL"/> <parent/> </service>
</route>
</start>
</config>

47
os/doc/init.txt
View File

@ -41,19 +41,22 @@ illustrated by an example (the following config file can be used on Linux):
! <parent-provides>
! <service name="CAP"/>
! <service name="LOG"/>
! <service name="SIGNAL"/>
! </parent-provides>
! <start name="timer">
! <resource name="RAM" quantum="1M"/>
! <provides> <service name="Timer"/> </provides>
! <route>
! <service name="CAP"> <parent/> </service>
! <service name="CAP"> <parent/> </service>
! <service name="SIGNAL"> <parent/> </service>
! </route>
! </start>
! <start name="test-timer">
! <resource name="RAM" quantum="1M"/>
! <route>
! <service name="Timer"> <child name="timer"/> </service>
! <service name="LOG"> <parent/> </service>
! <service name="Timer"> <child name="timer"/> </service>
! <service name="LOG"> <parent/> </service>
! <service name="SIGNAL"> <parent/> </service>
! </route>
! </start>
! </config>
@ -88,11 +91,12 @@ route. Instead of specifying a list of single service routes targeting the same
destination, the wildcard '<any-service>' becomes handy. For example, instead
of specifying
! <route>
! <service name="ROM"> <parent/> </service>
! <service name="RAM"> <parent/> </service>
! <service name="RM"> <parent/> </service>
! <service name="PD"> <parent/> </service>
! <service name="CPU"> <parent/> </service>
! <service name="ROM"> <parent/> </service>
! <service name="RAM"> <parent/> </service>
! <service name="RM"> <parent/> </service>
! <service name="PD"> <parent/> </service>
! <service name="CPU"> <parent/> </service>
! <service name="SIGNAL"> <parent/> </service>
! </route>
the following shortcut can be used:
! <route>
@ -192,12 +196,14 @@ child is routed to the timer service started at the first-level init instance.
! <service name="CPU"/>
! <service name="RM"/>
! <service name="PD"/>
! <service name="SIGNAL"/>
! </parent-provides>
! <start name="timer">
! <resource name="RAM" quantum="1M"/>
! <provides><service name="Timer"/></provides>
! <route>
! <service name="CAP"> <parent/> </service>
! <service name="CAP"> <parent/> </service>
! <service name="SIGNAL"> <parent/> </service>
! </route>
! </start>
! <start name="init">
@ -206,24 +212,27 @@ child is routed to the timer service started at the first-level init instance.
! <parent-provides>
! <service name="Timer"/>
! <service name="LOG"/>
! <service name="SIGNAL"/>
! </parent-provides>
! <start name="test-timer">
! <resource name="RAM" quantum="1M"/>
! <route>
! <service name="Timer"> <parent/> </service>
! <service name="LOG"> <parent/> </service>
! <service name="Timer"> <parent/> </service>
! <service name="LOG"> <parent/> </service>
! <service name="SIGNAL"> <parent/> </service>
! </route>
! </start>
! </config>
! <route>
! <service name="Timer"> <child name="timer"/> </service>
! <service name="LOG"> <parent/> </service>
! <service name="ROM"> <parent/> </service>
! <service name="RAM"> <parent/> </service>
! <service name="CAP"> <parent/> </service>
! <service name="CPU"> <parent/> </service>
! <service name="RM"> <parent/> </service>
! <service name="PD"> <parent/> </service>
! <service name="Timer"> <child name="timer"/> </service>
! <service name="LOG"> <parent/> </service>
! <service name="ROM"> <parent/> </service>
! <service name="RAM"> <parent/> </service>
! <service name="CAP"> <parent/> </service>
! <service name="CPU"> <parent/> </service>
! <service name="RM"> <parent/> </service>
! <service name="PD"> <parent/> </service>
! <service name="SIGNAL"> <parent/> </service>
! </route>
! </start>
! </config>

76
ports-okl4/config/init_config
View File

@ -1,76 +0,0 @@
<!---------------------------------------->
<!-- Example configuration for init, -->
<!-- starting a single Linux instance -->
<!-- as fullscreen app. with network -->
<!-- connection and a root-filesystem -->
<!-- in an image file -->
<!---------------------------------------->
<config>
<!-------------------------->
<!-- Global routing table -->
<!-------------------------->
<parent-provides>
<service name="ROM"/>
<service name="RAM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="CAP"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<!------------------->
<!-- Start entries -->
<!------------------->
<start name="ps2_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Input"/></provides>
</start>
<start name="pci_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="PCI"/></provides>
</start>
<start name="vesa_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Framebuffer"/></provides>
</start>
<start name="nic_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Nic"/></provides>
</start>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<!-- Block service providing rootfs used by OKLinux/Genode block driver -->
<start name="rom_loopdev">
<resource name="RAM" quantum="1M"/>
<provides><service name="Block"/></provides>
<config>
<filename>rootfs.img</filename>
</config>
</start>
<!-- Linux instance using a framebuffer, block and nic session -->
<start name="vmlinux">
<resource name="RAM" quantum="64M"/>
<config>
<commandline args="root=/dev/sda"/>
<initrd name="initrd.gz"/>
<screens>
<framebuffer/>
</screens>
<block/>
<nic/>
</config>
</start>
</config>

14
ports/run/libc_noux.run
View File

@ -38,13 +38,13 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="uart_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Terminal"/></provides>
<config>
<policy label="noux" uart="1"/>
</config>
</start>
<start name="uart_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Terminal"/></provides>
<config>
<policy label="noux" uart="1"/>
</config>
</start>
<start name="ram_fs">
<resource name="RAM" quantum="10M"/>
<provides><service name="File_system"/></provides>

1
qt4/run/calculatorform.run
View File

@ -32,6 +32,7 @@ set config {
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>

1
qt4/run/previewer.run
View File

@ -32,6 +32,7 @@ set config {
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>

1
qt4/run/qt4.run
View File

@ -34,6 +34,7 @@ set config {
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>

1
qt4/run/tetrix.run
View File

@ -32,6 +32,7 @@ set config {
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>

4
qt4/src/test/qpluginwidget/config.plugin
View File

@ -5,8 +5,8 @@
<service name="Nitpicker"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="testnit">
<resource name="RAM" quantum="1M"/>
</start>