Changeset 3115355 in mainline for uspace

Timestamp:

2007-12-31T10:14:38Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

27d293a

Parents:

badbd888

Message:

Simplify the IPC_M_DATA_WRITE protocol. Do not pass the source address space
virtual address to the recipient. This feature was not used anyway. Now
IPC_M_DATA_WRITE and IPC_M_DATA_READ are feature-aligned.

Location:

uspace

Files:

• lib/libc/generic/ipc.c (modified) (5 diffs)
• lib/libc/include/ipc/ipc.h (modified) (1 diff)
• srv/devmap/devmap.c (modified) (3 diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (1 diff)
• srv/vfs/vfs_mount.c (modified) (2 diffs)
• srv/vfs/vfs_open.c (modified) (1 diff)
• srv/vfs/vfs_rdwr.c (modified) (1 diff)
• srv/vfs/vfs_register.c (modified) (1 diff)

uspace/lib/libc/generic/ipc.c

@@ -736 +736 @@
 int ipc_data_write_send(int phoneid, void *src, size_t size)
 {
-        return ipc_call_sync_3_0(phoneid, IPC_M_DATA_WRITE, 0, (ipcarg_t) src,
+        return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
             (ipcarg_t) size);
 }
@@ -749 +749 @@
  * @param callid        Storage where the hash of the IPC_M_DATA_WRITE call will
  *                      be stored.
- * @param dst           Storage where the suggested destination address will
- *                      be stored. May be NULL.
  * @param size          Storage where the suggested size will be stored. May be
  *                      NULL
@@ -756 +754 @@
  * @return              Non-zero on success, zero on failure.
  */
-int ipc_data_write_receive(ipc_callid_t *callid, void **dst, size_t *size)
+int ipc_data_write_receive(ipc_callid_t *callid, size_t *size)
 {
         ipc_call_t data;
@@ -765 +763 @@
         if (IPC_GET_METHOD(data) != IPC_M_DATA_WRITE)
                 return 0;
-        if (dst)
-                *dst = (void *) IPC_GET_ARG1(data);
         if (size)
-                *size = (size_t) IPC_GET_ARG3(data);
+                *size = (size_t) IPC_GET_ARG2(data);
         return 1;
 }
@@ -785 +781 @@
 int ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size)
 {
-        return ipc_answer_3(callid, EOK, (ipcarg_t) dst, 0, (ipcarg_t) size);
+        return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);
 }
  

uspace/lib/libc/include/ipc/ipc.h

@@ -267 +267 @@
 extern int ipc_data_read_deliver(ipc_callid_t callid, void *src, size_t size);
 extern int ipc_data_write_send(int phoneid, void *src, size_t size);
-extern int ipc_data_write_receive(ipc_callid_t *callid, void **dst,
-    size_t *size);
+extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size);
 extern int ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size);
 

uspace/srv/devmap/devmap.c

@@ -203 +203 @@
          * Get driver name
          */
-        if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
+        if (!ipc_data_write_receive(&callid, &name_size)) {
                 printf("Unexpected request.\n");
                 free(driver);
@@ -369 +369 @@
         
         /* Get device name */
-        if (!ipc_data_write_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, &size)) {
                 free(device);
                 printf("Cannot read device name.\n");
@@ -490 +490 @@
          * read the name itself until the buffer is allocated).
          */
-        if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
+        if (!ipc_data_write_receive(&callid, &name_size)) {
                 ipc_answer_0(callid, EREFUSED);
                 ipc_answer_0(iid, EREFUSED);

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -339 +339 @@
         ipc_callid_t callid;
         size_t len;
-        if (!ipc_data_write_receive(&callid, NULL, &len)) {
+        if (!ipc_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);   
                 ipc_answer_0(rid, EINVAL);

uspace/srv/vfs/vfs_mount.c

@@ -87 +87 @@
          * system.
          */
-        if (!ipc_data_write_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -123 +123 @@
          * Now, we want the client to send us the mount point.
          */
-        if (!ipc_data_write_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);

uspace/srv/vfs/vfs_open.c

@@ -62 +62 @@
         ipc_callid_t callid;
 
-        if (!ipc_data_write_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);

uspace/srv/vfs/vfs_rdwr.c

@@ -74 +74 @@
                 res = ipc_data_read_receive(&callid, NULL);
         else 
-                res = ipc_data_write_receive(&callid, NULL, NULL);
+                res = ipc_data_write_receive(&callid, NULL);
         if (!res) {
                 ipc_answer_0(callid, EINVAL);

uspace/srv/vfs/vfs_register.c

@@ -165 +165 @@
          * VFS info structure from the client FS.
          */
-        if (!ipc_data_write_receive(&callid, NULL, &size)) {
+        if (!ipc_data_write_receive(&callid, &size)) {
                 /*
                  * The client doesn't obey the same protocol as we do.