Changeset 4f5dc18 in mainline for contrib/arch/uspace/srv/vfs/vfs.adl

Timestamp:

2009-11-03T21:36:54Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

• contrib/arch/uspace/srv/vfs/vfs.adl (modified) (2 diffs)

contrib/arch/uspace/srv/vfs/vfs.adl

@@ -88 +88 @@
         requires:
                 [/uspace/lib/libc/requires]
+                ns ns;
                 tmpfs tmpfs;
                 fat fat;
                 devfs devfs;
-                ns ns;
+        initialization:
+                !ns.ipc_m_connect_to_me /* vfs */
         protocol:
-                [/uspace/lib/libc/protocol] |
-                [vfs_server.bp]
+                [/uspace/lib/libc/protocol]
 };
 
@@ -110 +111 @@
         bind fat:vfs to io_dispatcher:vfs;
         bind devfs:vfs to io_dispatcher:vfs;
+        
+        bind tmpfs:tmpfs_nested to tmpfs:tmpfs;
+        bind tmpfs:fat_nested to fat:fat;
+        bind tmpfs:devfs_nested to devfs:devfs;
+        
+        bind fat:tmpfs_nested to tmpfs:tmpfs;
+        bind fat:fat_nested to fat:fat;
+        bind fat:devfs_nested to devfs:devfs;
         
         delegate vfs to io_dispatcher:vfs;