Changeset b61d47d in mainline for uspace/srv

Timestamp:

2007-12-02T20:00:14Z (18 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.

Location:

uspace/srv

Files:

• console/console.c (modified) (2 diffs)
• devmap/devmap.c (modified) (5 diffs)
• devmap/devmap.h (modified) (2 diffs)
• fs/fat/fat.c (modified) (1 diff)
• ns/ns.c (modified) (1 diff)
• vfs/vfs_read.c (modified) (1 diff)

uspace/srv/console/console.c

@@ -483 +483 @@
         /* Connect to keyboard driver */
 
-        kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0);
+        kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
         while (kbd_phone < 0) {
                 usleep(10000);
-                kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0);
+                kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
         }
         
@@ -495 +495 @@
         /* Connect to framebuffer driver */
         
-        fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0);
+        fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
         while (fb_info.phone < 0) {
                 usleep(10000);
-                fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0);
+                fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
         }
         

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 */

uspace/srv/devmap/devmap.h

@@ -42 +42 @@
         DEVMAP_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
         DEVMAP_DRIVER_UNREGISTER,
-        DEVMAP_DEVICE_CONNECT_ME_TO,
         DEVMAP_DEVICE_REGISTER,
         DEVMAP_DEVICE_UNREGISTER,
@@ -83 +82 @@
 } devmap_device_t;
 
-/** Interface provided by DevMap. 
- *
+/** Interface provided by devmap. 
+ * Every process that connects to devmap must ask one of following
+ * interfaces otherwise connection will be refused.
  */
 typedef enum {
-        DEVMAP_DRIVER = 1,
-        DEVMAP_CLIENT
+                /** Connect as device driver */
+        DEVMAP_DRIVER = 1,      
+                /** Connect as client */
+        DEVMAP_CLIENT,
+                /** Create new connection to instance of device that
+                 * is specified by second argument of call. */
+        DEVMAP_CONNECT_TO_DEVICE
 } devmap_interface_t;
 

uspace/srv/fs/fat/fat.c

@@ -127 +127 @@
         printf("FAT: HelenOS FAT file system server.\n");
 
-        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0);
+        vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
         while (vfs_phone < EOK) {
                 usleep(10000);
-                vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0);
+                vfs_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VFS, 0, 0);
         }
         

uspace/srv/ns/ns.c

@@ -213 +213 @@
         }
         hs = hash_table_get_instance(hlp, hashed_service_t, link);
-        return ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call), 0,
-            IPC_FF_NONE);
+        return ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call), 
+                IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
 }
 

uspace/srv/vfs/vfs_read.c

@@ -97 +97 @@
          */
         ipc_forward_fast(callid, fs_phone, IPC_GET_METHOD(call),
-            IPC_GET_ARG1(call), IPC_FF_ROUTE_FROM_ME);
+            IPC_GET_ARG1(call), 0, IPC_FF_ROUTE_FROM_ME);
 
         vfs_release_phone(fs_phone);