Changeset 985e26d2 in mainline for contrib/arch/uspace/srv/bd/bd.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/uspace/srv/bd/bd.adl (moved) (moved from contrib/arch/uspace/srv/bd/block_device.adl ) (2 diffs)

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

@@ -1 @@
-interface block_device extends service {
-                /* Establish connection */
-                ipcarg_t ipc_m_connect_me_to(void);
-                
+interface bd extends service {
                 /* Share out data buffer */
                 ipcarg_t ipc_m_share_out(in ipcarg_t as_area_base, in ipcarg_t as_area_size, in ipcarg_t flags, out ipcarg_t dst_as_area_base);
@@ -14 +11 @@
                 /* Write blocks via shared data buffer */
                 ipcarg_t write_blocks(in ipcarg_t index_lower, in ipcarg_t index_upper, in ipcarg_t count);
-                
-                /* Close connection */
-                ipcarg_t ipc_m_phone_hungup(void);
         protocol:
-                [block_device.bp]
+                [bd.bp]
 };
+
+architecture bd {
+        inst rd rd;
+        
+        [/uspace/lib/libc/subsume%rd]
+        
+        delegate rd to rd:rd;
+        
+        subsume rd:ns to ns;
+        subsume rd:devmap_driver to devmap_driver;
+};