Changeset 96b02eb9 in mainline for uspace/srv/vfs

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

uspace/srv/vfs

Files:

• vfs.c (modified) (1 diff)
• vfs.h (modified) (1 diff)
• vfs_lookup.c (modified) (2 diffs)
• vfs_node.c (modified) (1 diff)
• vfs_ops.c (modified) (10 diffs)
• vfs_register.c (modified) (1 diff)

uspace/srv/vfs/vfs.c

@@ -173 +173 @@
          * Register at the naming service.
          */
-        ipcarg_t phonead;
+        sysarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_VFS, 0, 0, &phonead);
         

uspace/srv/vfs/vfs.h

@@ -54 +54 @@
         fs_handle_t fs_handle;
         fibril_mutex_t phone_lock;
-        ipcarg_t phone;
+        sysarg_t phone;
 } fs_info_t;
 

uspace/srv/vfs/vfs_lookup.c

@@ -161 +161 @@
         ipc_call_t answer;
         int phone = vfs_grab_phone(root->fs_handle);
-        aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
-            (ipcarg_t) (first + len - 1) % PLB_SIZE,
-            (ipcarg_t) root->devmap_handle, (ipcarg_t) lflag, (ipcarg_t) index,
+        aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (sysarg_t) first,
+            (sysarg_t) (first + len - 1) % PLB_SIZE,
+            (sysarg_t) root->devmap_handle, (sysarg_t) lflag, (sysarg_t) index,
             &answer);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         vfs_release_phone(root->fs_handle, phone);
@@ -210 +210 @@
         ipc_call_t answer;
         aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-            (ipcarg_t) result->triplet.devmap_handle,
-            (ipcarg_t) result->triplet.index, &answer);
-        
-        ipcarg_t rc;
+            (sysarg_t) result->triplet.devmap_handle,
+            (sysarg_t) result->triplet.index, &answer);
+        
+        sysarg_t rc;
         async_wait_for(req, &rc);
         vfs_release_phone(result->triplet.fs_handle, phone);

uspace/srv/vfs/vfs_node.c

@@ -129 +129 @@
                  */
                 int phone = vfs_grab_phone(node->fs_handle);
-                ipcarg_t rc;
+                sysarg_t rc;
                 rc = async_req_2_0(phone, VFS_OUT_DESTROY,
-                    (ipcarg_t)node->devmap_handle, (ipcarg_t)node->index);
+                    (sysarg_t)node->devmap_handle, (sysarg_t)node->index);
                 assert(rc == EOK);
                 vfs_release_phone(node->fs_handle, phone);

uspace/srv/vfs/vfs_ops.c

@@ -79 +79 @@
         size_t rsize;
         unsigned rlnkcnt;
-        ipcarg_t rc;
+        sysarg_t rc;
         int phone;
         aid_t msg;
@@ -126 +126 @@
                         phone = vfs_grab_phone(fs_handle);
                         msg = async_send_1(phone, VFS_OUT_MOUNTED,
-                            (ipcarg_t) devmap_handle, &answer);
+                            (sysarg_t) devmap_handle, &answer);
                         /* send the mount options */
                         rc = async_data_write_start(phone, (void *)opts,
@@ -188 +188 @@
         phone = vfs_grab_phone(mp_res.triplet.fs_handle);
         msg = async_send_4(phone, VFS_OUT_MOUNT,
-            (ipcarg_t) mp_res.triplet.devmap_handle,
-            (ipcarg_t) mp_res.triplet.index,
-            (ipcarg_t) fs_handle,
-            (ipcarg_t) devmap_handle, &answer);
+            (sysarg_t) mp_res.triplet.devmap_handle,
+            (sysarg_t) mp_res.triplet.index,
+            (sysarg_t) fs_handle,
+            (sysarg_t) devmap_handle, &answer);
         
         /* send connection */
@@ -716 +716 @@
 
         /* Wait for reply from the FS server. */
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(msg, &rc);
         
@@ -747 +747 @@
                 
                 /* Wait for reply from the FS server. */
-                ipcarg_t rc;
+                sysarg_t rc;
                 async_wait_for(msg, &rc);
                 
@@ -839 +839 @@
          * don't have to bother.
          */
-        ipcarg_t rc;
+        sysarg_t rc;
         ipc_call_t answer;
         if (read) {
@@ -973 +973 @@
     fs_index_t index, aoff64_t size)
 {
-        ipcarg_t rc;
+        sysarg_t rc;
         int fs_phone;
         
         fs_phone = vfs_grab_phone(fs_handle);
-        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) devmap_handle,
-            (ipcarg_t) index, LOWER32(size), UPPER32(size));
+        rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (sysarg_t) devmap_handle,
+            (sysarg_t) index, LOWER32(size), UPPER32(size));
         vfs_release_phone(fs_handle, fs_phone);
         return (int)rc;
@@ -1005 +1005 @@
 
         fibril_mutex_unlock(&file->lock);
-        ipc_answer_0(rid, (ipcarg_t)rc);
+        ipc_answer_0(rid, (sysarg_t)rc);
 }
 
@@ -1011 +1011 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        ipcarg_t rc;
+        sysarg_t rc;
 
         vfs_file_t *file = vfs_file_get(fd);
@@ -1084 +1084 @@
         ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
         
-        ipcarg_t rv;
+        sysarg_t rv;
         async_wait_for(msg, &rv);
         vfs_release_phone(node->fs_handle, fs_phone);

uspace/srv/vfs/vfs_register.c

@@ -235 +235 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
+        ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);