Changes in uspace/srv/bd/file_bd/file_bd.c [47b7006:15f3c3f] in mainline

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (6 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -45 +45 @@
 #include <as.h>
 #include <fibril_synch.h>
-#include <devmap.h>
+#include <loc.h>
 #include <sys/types.h>
 #include <sys/typefmt.h>
@@ -61 +61 @@
 static FILE *img;
 
-static devmap_handle_t devmap_handle;
+static service_id_t service_id;
 static fibril_mutex_t dev_lock;
 
 static void print_usage(void);
 static int file_bd_init(const char *fname);
-static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 static int file_bd_read_blocks(uint64_t ba, size_t cnt, void *buf);
 static int file_bd_write_blocks(uint64_t ba, size_t cnt, const void *buf);
@@ -117 +117 @@
                 return -1;
 
-        rc = devmap_device_register(device_name, &devmap_handle);
+        rc = loc_service_register(device_name, &service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register device '%s'.\n",
@@ -142 +142 @@
         long img_size;
 
-        rc = devmap_driver_register(NAME, file_bd_connection);
+        rc = loc_server_register(NAME, file_bd_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -170 +170 @@
 }
 
-static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         void *fs_va = NULL;
@@ -198 +198 @@
         (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),