Changeset 0a1a313 in mainline

Timestamp:

2009-10-07T10:58:07Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b988db0

Parents:

100aaf5

Message:

fix protocols w.r.t. nested calls

Location:

contrib/arch/uspace

Files:

• lib/libfs/fnc.libfs_mount (modified) (1 diff)
• srv/vfs/vfs.bp (modified) (5 diffs)

contrib/arch/uspace/lib/libfs/fnc.libfs_mount

@@ -4 +4 @@
                 alternative (fs; tmpfs; fat; devfs) {
                         !fs.ipc_m_connect_to_me ;
-                        !fs.mounted ;
-                        !fs.ipc_m_data_write /* forward */
+                        !fs.mounted {
+                                !fs.ipc_m_data_write /* forward */
+                        }
                 }
         }

contrib/arch/uspace/srv/vfs/vfs.bp

@@ -22 +22 @@
                                                         /* root fs */
                                                         alternative (fs; tmpfs; fat; devfs) {
-                                                                !fs.mounted ;
-                                                                !fs.ipc_m_data_write /* mount options */
+                                                                !fs.mounted {
+                                                                        !fs.ipc_m_data_write /* mount options */
+                                                                }
                                                         }
                                                 ) +
@@ -93 +94 @@
                                 alternative (fs; tmpfs; fat; devfs) {
                                         [fnc.vfs_grab_phone] ;
-                                        !fs.read ;
-                                        !fs.ipc_m_data_read /* forward payload */ ;
+                                        !fs.read {
+                                                !fs.ipc_m_data_read /* forward payload */ ;
+                                        } ;
                                         [fnc.vfs_release_phone]
                                 }
@@ -106 +108 @@
                                 alternative (fs; tmpfs; fat; devfs) {
                                         [fnc.vfs_grab_phone] ;
-                                        !fs.write ;
-                                        !fs.ipc_m_data_write /* forward payload */ ;
+                                        !fs.write {
+                                                !fs.ipc_m_data_write /* forward payload */ ;
+                                        } ;
                                         [fnc.vfs_release_phone]
                                 }
@@ -129 +132 @@
                                 alternative (fs; tmpfs; fat; devfs) {
                                         [fnc.vfs_grab_phone] ;
-                                        !fs.stat ;
-                                        !fs.ipc_m_data_read /* forward struct stat */ ;
+                                        !fs.stat {
+                                                !fs.ipc_m_data_read /* forward struct stat */ ;
+                                        } ;
                                         [fnc.vfs_release_phone]
                                 }
@@ -144 +148 @@
                                         [fnc.vfs_lookup_internal] ;
                                         tentative {
-                                                !fs.stat ;
-                                                !fs.ipc_m_data_read /* forward struct stat */
+                                                !fs.stat {
+                                                        !fs.ipc_m_data_read /* forward struct stat */
+                                                }
                                         }
                                 }