Changeset 27d293a in mainline for uspace/srv

Timestamp:

2007-12-31T16:46:43Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

215e375

Parents:

3115355

Message:

Rename IPC_M_AS_AREA_SEND to IPC_M_SHARE_OUT. Rename IPC_M_AS_AREA_RECV to
IPC_M_SHARE_IN. Provide user-friendly wrappers for these methods so that even
dummies can get it right. Some applications using simpler protocols still use
these methods directly.

Location:

uspace/srv

Files:

• console/console.c (modified) (1 diff)
• console/gcons.c (modified) (2 diffs)
• fb/ega.c (modified) (1 diff)
• fb/fb.c (modified) (1 diff)
• ns/ns.c (modified) (1 diff)
• rd/rd.c (modified) (1 diff)
• vfs/vfs_register.c (modified) (3 diffs)

uspace/srv/console/console.c

@@ -538 +538 @@
             PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
         if (!interbuffer) {
-                if (async_req_3_0(fb_info.phone, IPC_M_AS_AREA_SEND,
-                    (ipcarg_t) interbuffer, 0, AS_AREA_READ) != 0) {
+                if (ipc_share_out_send(fb_info.phone, interbuffer,
+                    AS_AREA_READ) != EOK) {
                         munmap(interbuffer,
                             sizeof(keyfield_t) * fb_info.cols * fb_info.rows);

uspace/srv/console/gcons.c

@@ -326 +326 @@
         if (rc)
                 goto exit;
-        rc = async_req_3_0(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
-            PROTO_READ);
+        rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
@@ -388 +387 @@
         if (rc)
                 goto exit;
-        rc = async_req_3_0(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
-            PROTO_READ);
+        rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;

uspace/srv/fb/ega.c

@@ -209 +209 @@
                         ipc_answer_0(callid, EOK);
                         return; /* Exit thread */
-                case IPC_M_AS_AREA_SEND:
+                case IPC_M_SHARE_OUT:
                         /* We accept one area for data interchange */
                         intersize = IPC_GET_ARG2(call);

uspace/srv/fb/fb.c

@@ -748 +748 @@
 
         switch (IPC_GET_METHOD(*call)) {
-        case IPC_M_AS_AREA_SEND:
+        case IPC_M_SHARE_OUT:
                 /* We accept one area for data interchange */
                 if (IPC_GET_ARG1(*call) == shm_id) {

uspace/srv/ns/ns.c

@@ -118 +118 @@
                 callid = ipc_wait_for_call(&call);
                 switch (IPC_GET_METHOD(call)) {
-                case IPC_M_AS_AREA_RECV:
+                case IPC_M_SHARE_IN:
                         switch (IPC_GET_ARG3(call)) {
                         case SERVICE_MEM_REALTIME:

uspace/srv/rd/rd.c

@@ -104 +104 @@
          * Now we wait for the client to send us its communication as_area.
          */
-        callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) == IPC_M_AS_AREA_SEND) {
-                if (IPC_GET_ARG1(call) >= (ipcarg_t) BLOCK_SIZE) {
+        size_t size;
+        if (ipc_share_out_receive(&callid, &size, NULL)) {
+                if (size >= BLOCK_SIZE) {
                         /*
                          * The client sends an as_area that can absorb the whole
                          * block.
                          */
-                        ipc_answer_1(callid, EOK, (uintptr_t) fs_va);
+                        (void) ipc_share_out_deliver(callid, fs_va);
                 } else {
                         /*

uspace/srv/vfs/vfs_register.c

@@ -271 +271 @@
          * The client will want us to send him the address space area with PLB.
          */
-        callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) != IPC_M_AS_AREA_RECV) {
+
+        if (!ipc_share_in_receive(&callid, &size)) {
                 dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
                 list_remove(&fs_info->fs_link);
@@ -286 +286 @@
          * We can only send the client address space area PLB_SIZE bytes long.
          */
-        size = IPC_GET_ARG2(call);
         if (size != PLB_SIZE) {
                 dprintf("Client suggests wrong size of PFB, size = %d\n", size);
@@ -301 +300 @@
          * Commit to read-only sharing the PLB with the client.
          */
-        ipc_answer_2(callid, EOK, (ipcarg_t) plb,
-            (ipcarg_t) (AS_AREA_READ | AS_AREA_CACHEABLE));     
+        (void) ipc_share_in_deliver(callid, plb,
+            AS_AREA_READ | AS_AREA_CACHEABLE);
 
         dprintf("Sharing PLB.\n");