Changeset 985e26d2 in mainline for contrib/arch/HelenOS.adl

Timestamp:

2010-01-07T19:06:59Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8190e63

Parents:

743e17b (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• contrib/arch/HelenOS.adl (modified) (1 diff)

contrib/arch/HelenOS.adl

@@ -6 +6 @@
         inst ns ns;
         
-        /* RAM disk */
-        inst rd rd;
+        /* Loader (clonable service) */
+        inst loader loader;
         
-        /* Klog */
+        /* Device mapper */
+        inst devmap devmap;
+        
+        /* Block device */
+        inst bd bd;
+        
+        /* VFS server */
+        inst vfs vfs;
+        
+        /* Console */
+        inst console console;
+        
+        /* Kernel log */
         inst klog klog;
         
         [/uspace/lib/libc/bind%ns]
+        [/uspace/lib/libc/bind%loader]
+        [/uspace/lib/libc/bind%devmap]
+        [/uspace/lib/libc/bind%bd]
+        [/uspace/lib/libc/bind%vfs]
+        [/uspace/lib/libc/bind%console]
+        [/uspace/lib/libc/bind%klog]
         
-        [/usrpace/lib/libc/bind%rd]
-        bind rd:ns to ns:ns;
-        bind rd:dm_driver to devmap:dm_driver;
+        bind ns:kbd to console:kbd;
+        bind ns:fb to console:fb;
+        bind ns:console to console:console;
+        bind ns:vfs to vfs:vfs;
+        bind ns:devmap_driver to devmap:devmap_driver;
+        bind ns:devmap_client to devmap:devmap_client;
+        bind ns:loader to loader:loader;
         
-        [/usrpace/lib/libc/bind%klog]
+        bind loader:ns to ns:ns;
+        
+        bind devmap:ns to ns:ns;
+        bind devmap:rd to bd:rd;
+        bind devmap:console to console:console;
+        
+        bind bd:ns to ns:ns;
+        bind bd:devmap_driver to devmap:devmap_driver;
+        
+        bind vfs:ns to ns:ns;
+        bind vfs:rd to bd:rd;
+        bind vfs:devmap_client to devmap:devmap_client;
+        bind vfs:device to console:console;
+        
+        bind console:ns to ns:ns;
+        bind console:devmap_driver to devmap:devmap_driver;
+        bind console:sys_console to kernel:sys_console;
+        
         bind klog:ns to ns:ns;
 };