Changeset b61d47d in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2007-12-02T20:00:14Z (17 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

90c35436

Parents:

8df2eab

Message:

Function ipc_connect_me_to sends 3 user defined arguments now.
One argument added also to ipc_forward_fast.
Fixed devmap and improved its test.

File:

• uspace/srv/devmap/devmap.c (modified) (5 diffs)

uspace/srv/devmap/devmap.c

@@ -449 +449 @@
  * Find device driver owning requested device and forward
  * the message to it.
- *
- *
  */
 static void devmap_forward(ipc_callid_t callid, ipc_call_t *call)
@@ -460 +458 @@
          * Get handle from request
          */
-        handle = IPC_GET_ARG1(*call);
+        handle = IPC_GET_ARG2(*call);
         dev = devmap_device_find_handle(handle);
 
@@ -470 +468 @@
         } 
 
-        /* FIXME: is this correct method how to pass argument on forwarding ?*/
         ipc_forward_fast(callid, dev->driver->phone, (ipcarg_t)(dev->handle),
-            0, IPC_FF_NONE);
+            IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
         return;
 }
@@ -670 +667 @@
                         continue; /* Exit thread */
 
-                case DEVMAP_DEVICE_CONNECT_ME_TO:
-                        /* Connect client to selected device */
-                        printf("DEVMAP: connect to device %d.\n",
-                            IPC_GET_ARG1(call));
-                        devmap_forward(callid, &call);
-                        break;
-
                 case DEVMAP_DEVICE_GET_HANDLE:
                         devmap_get_handle(callid, &call);
@@ -710 +700 @@
                 devmap_connection_client(iid, icall);
                 break;
+        case DEVMAP_CONNECT_TO_DEVICE:
+                        /* Connect client to selected device */
+                printf("DEVMAP: connect to device %d.\n",
+                    IPC_GET_ARG2(*icall));
+                devmap_forward(iid, icall);
+                break;
         default:
                 ipc_answer_0(iid, ENOENT); /* No such interface */