Changeset 38c706cc in mainline for uspace/srv

Timestamp:

2007-12-04T19:54:53Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

6364d3c

Parents:

90c35436

Message:

Extended IPC_M_CONNECT_TO_ME to use 3 user defined parameters.
Phone identifier is passed in ARG5.

Location:

uspace/srv

Files:

• console/console.c (modified) (3 diffs)
• devmap/devmap.c (modified) (2 diffs)
• fb/main.c (modified) (1 diff)
• fs/fat/fat.c (modified) (1 diff)
• kbd/generic/kbd.c (modified) (2 diffs)
• ns/ns.c (modified) (1 diff)
• pci/pci.c (modified) (1 diff)
• rd/rd.c (modified) (1 diff)
• vfs/vfs.c (modified) (1 diff)
• vfs/vfs_register.c (modified) (1 diff)

uspace/srv/console/console.c

@@ -382 +382 @@
         async_serialize_start();
         gcons_notify_connect(consnum);
-        conn->client_phone = IPC_GET_ARG3(call);
+        conn->client_phone = IPC_GET_ARG5(*icall);
         screenbuffer_clear(&conn->screenbuffer);
         
@@ -489 +489 @@
         }
         
-        if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0)
+        if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
                 return -1;
         async_new_connection(phonehash, 0, NULL, keyboard_events);
@@ -551 +551 @@
 
         /* Register at NS */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
                 return -1;
         }

uspace/srv/devmap/devmap.c

@@ -270 +270 @@
         }
 
-        driver->phone = IPC_GET_ARG3(call);
+        driver->phone = IPC_GET_ARG5(call);
         
         ipc_answer_0(callid, EOK);
@@ -736 +736 @@
 
         /* Register device mapper at naming service */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, &phonead) != 0) 
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_DEVMAP, 0, 0, &phonead) != 0) 
                 return -1;
         

uspace/srv/fb/main.c

@@ -73 +73 @@
                 sysio_init();
 
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, &phonead) != 0) 
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
                 return -1;
         

uspace/srv/fs/fat/fat.c

@@ -154 +154 @@
          */
         ipcarg_t phonehash;
-        ipc_connect_to_me(vfs_phone, 0, 0, &phonehash);
+        ipc_connect_to_me(vfs_phone, 0, 0, 0, &phonehash);
 
         /*

uspace/srv/kbd/generic/kbd.c

@@ -109 +109 @@
                                 break;
                         }
-                        phone2cons = IPC_GET_ARG3(call);
+                        phone2cons = IPC_GET_ARG5(call);
                         retval = 0;
                         break;
@@ -134 +134 @@
         async_set_interrupt_received(irq_handler);
         /* Register service at nameserver */
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead) != 0)
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
                 return -1;
 

uspace/srv/ns/ns.c

@@ -140 +140 @@
                          */
                         retval = register_service(IPC_GET_ARG1(call),
-                            IPC_GET_ARG3(call), &call);
+                            IPC_GET_ARG5(call), &call);
                         break;
                 case IPC_M_CONNECT_ME_TO:

uspace/srv/pci/pci.c

@@ -58 +58 @@
 
         printf("%s: registering at naming service.\n", NAME);
-        if (ipc_connect_to_me(PHONE_NS, SERVICE_PCI, 0, &ns_in_phone_hash) != 0) {
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_PCI, 0, 0, &ns_in_phone_hash) != 0) {
                 printf("Failed to register %s at naming service.\n", NAME);
                 return -1;

uspace/srv/rd/rd.c

@@ -212 +212 @@
                 
                 /* Register service at nameserver */
-                if (ipc_connect_to_me(PHONE_NS, SERVICE_RD, 0, &phonead) != 0)
+                if (ipc_connect_to_me(PHONE_NS, SERVICE_RD, 0, 0, &phonead) != 0)
                         return -1;
                 

uspace/srv/vfs/vfs.c

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

uspace/srv/vfs/vfs_register.c

@@ -253 +253 @@
                 return;
         }
-        fs_info->phone = IPC_GET_ARG3(call);
+        fs_info->phone = IPC_GET_ARG5(call);
         ipc_answer_0(callid, EOK);