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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -39 +39 @@
 #include <libarch/ddi.h>
 #include <ddi.h>
-#include <ipc/ipc.h>
 #include <ipc/bd.h>
 #include <async.h>
@@ -93 +92 @@
 static gxe_bd_t *dev;
 
-static dev_handle_t dev_handle[MAX_DISKS];
+static devmap_handle_t devmap_handle[MAX_DISKS];
 
 static fibril_mutex_t dev_lock[MAX_DISKS];
@@ -143 +142 @@
         for (i = 0; i < MAX_DISKS; i++) {
                 snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-                rc = devmap_device_register(name, &dev_handle[i]);
+                rc = devmap_device_register(name, &devmap_handle[i]);
                 if (rc != EOK) {
-                        devmap_hangup_phone(DEVMAP_DRIVER);
                         printf(NAME ": Unable to register device %s.\n", name);
                         return rc;
@@ -160 +158 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
-        dev_handle_t dh;
-        int flags;
+        sysarg_t method;
+        devmap_handle_t dh;
+        unsigned int flags;
         int retval;
         uint64_t ba;
@@ -174 +172 @@
         disk_id = -1;
         for (i = 0; i < MAX_DISKS; i++)
-                if (dev_handle[i] == dh)
+                if (devmap_handle[i] == dh)
                         disk_id = i;
 
         if (disk_id < 0) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         if (!async_share_out_receive(&callid, &comm_size, &flags)) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
 
         if (comm_size < block_size) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -197 +195 @@
         fs_va = as_get_mappable_page(comm_size);
         if (fs_va == NULL) {
-                ipc_answer_0(callid, EHANGUP);
+                async_answer_0(callid, EHANGUP);
                 return;
         }
@@ -205 +203 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case BD_READ_BLOCKS:
@@ -232 +230 @@
                         break;
                 case BD_GET_BLOCK_SIZE:
-                        ipc_answer_1(callid, EOK, block_size);
+                        async_answer_1(callid, EOK, block_size);
                         continue;
                 case BD_GET_NUM_BLOCKS:
@@ -241 +239 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }