Changeset ea5f46d in mainline for contrib/arch/uspace/srv/bd

Timestamp:

2009-09-15T16:07:26Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2a70672

Parents:

1993f9a

Message:

hierarchical composition of components
(tmpfs, fat, devfs are logical subcomponents of vfs, kbd and fb are subcomponents of console, rd is subcomponent of bd)

Location:

contrib/arch/uspace/srv/bd

Files:

• bd.adl (moved) (moved from contrib/arch/uspace/srv/bd/block_device.adl ) (2 diffs)
• bd.bp (moved) (moved from contrib/arch/uspace/srv/bd/block_device.bp )
• rd/rd.adl (modified) (1 diff)

contrib/arch/uspace/srv/bd/bd.adl

@@ -1 @@
-interface block_device extends service {
+interface bd extends service {
                 /* Establish connection */
                 ipcarg_t ipc_m_connect_me_to(void);
@@ -18 +18 @@
                 ipcarg_t ipc_m_phone_hungup(void);
         protocol:
-                [block_device.bp]
+                [bd.bp]
 };
+
+architecture bd {
+        inst rd rd;
+        
+        [/uspace/lib/libc/subsume%rd]
+        
+        delegate bd to rd:bd;
+        
+        subsume rd:ns to ns;
+        subsume rd:devmap to devmap;
+};

contrib/arch/uspace/srv/bd/rd/rd.adl

@@ -1 +1 @@
 frame rd {
         provides:
-                block_device bd;
+                bd bd;
         requires:
                 [/uspace/lib/libc/requires%]
-                naming_service ns;
-                device_mapper_driver dm_driver;
+                ns ns;
+                devmap_driver devmap_driver;
         protocol:
                 [/uspace/lib/libc/protocol] +