Changeset b0f00a9 in mainline for uspace/srv/bd/gxe_bd/gxe_bd.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (8 diffs)

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -43 +43 @@
 #include <as.h>
 #include <fibril_synch.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -92 +92 @@
 static gxe_bd_t *dev;
 
-static devmap_handle_t devmap_handle[MAX_DISKS];
+static service_id_t service_id[MAX_DISKS];
 
 static fibril_mutex_t dev_lock[MAX_DISKS];
 
 static int gxe_bd_init(void);
-static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 static int gxe_bd_read_blocks(int disk_id, uint64_t ba, unsigned cnt,
     void *buf);
@@ -126 +126 @@
         char name[16];
 
-        rc = devmap_driver_register(NAME, gxe_bd_connection);
+        rc = loc_server_register(NAME, gxe_bd_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -142 +142 @@
         for (i = 0; i < MAX_DISKS; i++) {
                 snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-                rc = devmap_device_register(name, &devmap_handle[i]);
+                rc = loc_service_register(name, &service_id[i]);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s.\n", name);
@@ -153 +153 @@
 }
 
-static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void gxe_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         void *fs_va = NULL;
@@ -159 +159 @@
         ipc_call_t call;
         sysarg_t method;
-        devmap_handle_t dh;
+        service_id_t dsid;
         unsigned int flags;
         int retval;
@@ -167 +167 @@
 
         /* Get the device handle. */
-        dh = IPC_GET_ARG1(*icall);
+        dsid = IPC_GET_ARG1(*icall);
 
         /* Determine which disk device is the client connecting to. */
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (devmap_handle[i] == dh)
+                if (service_id[i] == dsid)
                         disk_id = i;
 
@@ -201 +201 @@
         (void) async_share_out_finalize(callid, fs_va);
 
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
-                switch (method) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!method) {
                         /* The other side has hung up. */
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (method) {
                 case BD_READ_BLOCKS:
                         ba = MERGE_LOUP32(IPC_GET_ARG1(call),