Changeset 78d50bd in mainline for uspace/srv/bd/vbd/vbd.c

Timestamp:

2015-06-29T18:47:07Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3faa03d

Parents:

28ed0d9

Message:

Implement partition block device interface in VBD based on data from liblabel.

File:

• uspace/srv/bd/vbd/vbd.c (modified) (4 diffs)

uspace/srv/bd/vbd/vbd.c

@@ -51 +51 @@
 static void vbds_client_conn(ipc_callid_t, ipc_call_t *, void *);
 
+static service_id_t ctl_sid;
+
 static int vbds_init(void)
 {
@@ -66 +68 @@
         }
 
-        service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_VBD, &sid);
+        rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
@@ -191 +192 @@
 }
 
-static void vbds_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vbds_ctl_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_client_conn()");
@@ -243 +244 @@
 }
 
+static void vbds_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        service_id_t sid;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vbds_client_conn()");
+
+        sid = (service_id_t)IPC_GET_ARG1(*icall);
+
+        if (sid == ctl_sid)
+                vbds_ctl_conn(iid, icall, arg);
+        else
+                vbds_bd_conn(iid, icall, arg);
+}
+
 int main(int argc, char *argv[])
 {