Assign cap quotas in run scripts

Ref #74
2017-05-29 23:41:50 -05:00
parent 5a1bd02ef4
commit 4e006e0423
6 changed files with 36 additions and 72 deletions
--- a/run/chuck.run
+++ b/run/chuck.run
@@ -27,6 +27,7 @@ create_boot_directory

 append config {
 <config>
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -34,7 +35,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
--- a/run/chuck_keyboard.run
+++ b/run/chuck_keyboard.run
@@ -30,6 +30,7 @@ create_boot_directory

 append config {
 <config>
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -37,7 +38,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
@@ -59,7 +59,6 @@ append_if [have_spec ps2] config {
 		<route>
 			<service name="ROM">      <parent/>    </service>
 			<service name="CPU">      <parent/>    </service>
-			<service name="RAM">      <parent/>    </service>
 			<service name="PD">       <parent/>    </service>
 			<service name="IO_PORT">  <parent/>    </service>
 			<service name="LOG">      <parent/>    </service>
@@ -75,7 +74,6 @@ append_if [have_spec sdl] config {
 		<route>
 			<service name="ROM">   <parent/> </service>
 			<service name="CPU">   <parent/> </service>
-			<service name="RAM">   <parent/> </service>
 			<service name="PD">    <parent/> </service>
 			<service name="LOG">   <parent/> </service>
 			<service name="Timer"> <child name="timer"/> </service>
--- a/run/chuck_mouse.run
+++ b/run/chuck_mouse.run
@@ -30,6 +30,7 @@ create_boot_directory

 append config {
 <config>
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="IO_MEM"/>
@@ -37,7 +38,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 	</parent-provides>
@@ -59,7 +59,6 @@ append_if [have_spec ps2] config {
 		<route>
 			<service name="ROM">      <parent/>    </service>
 			<service name="CPU">      <parent/>    </service>
-			<service name="RAM">      <parent/>    </service>
 			<service name="PD">       <parent/>    </service>
 			<service name="IO_PORT">  <parent/>    </service>
 			<service name="LOG">      <parent/>    </service>
@@ -75,7 +74,6 @@ append_if [have_spec sdl] config {
 		<route>
 			<service name="ROM">   <parent/> </service>
 			<service name="CPU">   <parent/> </service>
-			<service name="RAM">   <parent/> </service>
 			<service name="PD">    <parent/> </service>
 			<service name="LOG">   <parent/> </service>
 			<service name="Timer"> <child name="timer"/> </service>
--- a/run/log_fader.run
+++ b/run/log_fader.run
@@ -47,7 +47,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="ROM"/>
 	</parent-provides>
 	<default-route>
@@ -59,6 +58,7 @@ append config {
 		<service name="Nitpicker"> <child name="nitpicker" /> </service>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
+	<default caps="128"/>
 	<start name="fb_sdl">
 		<resource name="RAM" quantum="4M"/>
 		<provides>
--- a/run/rom_verify.run
+++ b/run/rom_verify.run
@@ -20,17 +20,17 @@ set test_digest [lindex [exec $sha256sum bin/test-log] 0]

 append config {
 <config>
+	<default caps="128"/>
 	<parent-provides>
-		<service name="ROM"/>
-		<service name="RAM"/>
-		<service name="IRQ"/>
+		<service name="CPU"/>
 		<service name="IO_MEM"/>
 		<service name="IO_PORT"/>
+		<service name="IRQ"/>
+		<service name="LOG"/>
 		<service name="PD"/>
 		<service name="RM"/>
-		<service name="CPU"/>
-		<service name="LOG"/>
-	</parent-provides>
+		<service name="ROM"/>
+</parent-provides>
 	<default-route>
 		<any-service><parent/><any-child/></any-service>
 	</default-route>
--- a/run/tyrian.run
+++ b/run/tyrian.run
@@ -1,8 +1,3 @@
-#
-# OpenTyrian crashes without the proper framebuferr resolution,
-# so run it in nit_fb.
-#
-
 #
 # Build
 #
@@ -14,8 +9,6 @@ set build_components {
 	drivers/input
 	drivers/input/dummy
 	drivers/timer
-	server/nit_fb
-	server/nitpicker
 	app/opentyrian
 }

@@ -41,6 +34,7 @@ create_boot_directory

 append config {
 <config>
+	<default caps="128"/>
 	<parent-provides>
 		<service name="CAP"/>
 		<service name="CPU"/>
@@ -49,7 +43,6 @@ append config {
 		<service name="IRQ"/>
 		<service name="LOG"/>
 		<service name="PD"/>
-		<service name="RAM"/>
 		<service name="RM"/>
 		<service name="ROM"/>
 		<service name="SIGNAL"/>
@@ -60,16 +53,30 @@ append config {

 append_platform_drv_config

+append_if [have_spec sdl] config {
+	<start name="fb_sdl">
+		<resource name="RAM" quantum="4M"/>
+		<provides>
+			<service name="Input"/>
+			<service name="Framebuffer"/>
+		</provides>
+		<config width="640" height="400" />
+	</start>
+	<alias name="input_drv" child="fb_sdl"/>
+	<alias name="fb_drv" child="fb_sdl"/>}
+
 append_if [have_spec vesa] config {
 	<start name="fb_drv">
 		<resource name="RAM" quantum="4M"/>
 		<provides><service name="Framebuffer"/></provides>
+		<config width="640" height="400" />
 	</start>}

 append_if [have_spec pl11x] config {
 	<start name="fb_drv">
 		<resource name="RAM" quantum="2M"/>
 		<provides><service name="Framebuffer"/></provides>
+		<config width="640" height="400" />
 	</start>}

 append_if [have_spec ps2] config {
@@ -84,61 +91,22 @@ append config {
 		<provides><service name="Timer"/></provides>
 	</start>
 	<start name="audio_drv">
+		<binary name="} [audio_drv_binary] {"/>
 		<resource name="RAM" quantum="6M"/>
 		<provides><service name="Audio_out"/></provides>
 	</start>

-	<start name="dummy_input_drv">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="Input"/></provides>
-	</start>
-
-	<start name="nitpicker">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="Nitpicker"/></provides>
-		<route>
-			<any-service>
-				<child name="fb_drv"/>
-				<child name="dummy_input_drv"/>
-				<parent/> <any-child/>
-			</any-service>
-		</route>
-		<config>
-			<domain name="default" layer="1" content="client" label="no" />
-			<policy domain="default"/>
-		</config>
-	</start>
-
-	<start name="nit_fb" priority="-1">
-		<resource name="RAM" quantum="8M" />
-		<provides>
-			<service name="Framebuffer" />
-			<service name="Input" />
-		</provides>
-		<config width="640" height="400" />
-	</start>
-
 	<start name="opentyrian">
 		<exit propagate="yes"/>
 		<resource name="RAM" quantum="128M"/>
-		<route>
-			<service name="Framebuffer">
-				<child name="nit_fb"/>
-			</service>
-			<any-service>
-				<child name="ps2_drv"/>
-				<parent/> <any-child/>
-			</any-service>
-		</route>
 		<config>
 			<sdl_audio_volume value="100"/>
-			<libc stdout="/dev/log" stderr="/dev/log">
-				<vfs>
-					<tar name="tyrian.tar"/>
-					<ram/>
-					<dir name="dev"> <log/> </dir>
-				</vfs>
-			</libc>
+			<libc stdout="/dev/log" stderr="/dev/log"/>
+			<vfs>
+				<dir name="dev"> <log/> </dir>
+				<tar name="tyrian.tar"/>
+				<ram/>
+			</vfs>
 		</config>
 	</start>
 </config>}
@@ -152,17 +120,16 @@ install_config $config
 file copy -force app/opentyrian/tyrian.tar bin

 # generic modules
-set boot_modules {
+append boot_modules {
 	core init
-	audio_drv
+} [audio_drv_binary] {
 	dummy_input_drv
 	ld.lib.so
 	libc.lib.so
 	libm.lib.so
 	libpng.lib.so
-	nitpicker
-	nit_fb
 	pthread.lib.so
+	posix.lib.so
 	sdl.lib.so
 	sdl_net.lib.so
 	stdcxx.lib.so
@@ -171,6 +138,7 @@ set boot_modules {
 }

 # platform-specific modules
+lappend_if [have_spec linux] boot_modules fb_sdl
 lappend_if [have_spec vesa]  boot_modules fb_drv
 lappend_if [have_spec ps2]   boot_modules ps2_drv
 lappend_if [have_spec pl11x] boot_modules fb_drv