Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 8227d634855cabb163487dd2efe9a1b301377b9d) +++ uspace/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -115,4 +115,5 @@ srv/bd/part/guid_part \ srv/bd/part/mbr_part \ + srv/bd/vbd \ srv/fs/exfat \ srv/fs/udf \ @@ -231,4 +232,5 @@ lib/softrend \ lib/draw \ + lib/label \ lib/math \ lib/nettl \ Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 8227d634855cabb163487dd2efe9a1b301377b9d) +++ uspace/lib/c/include/ipc/services.h (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -61,4 +61,6 @@ #define SERVICE_NAME_UDP "net/udp" #define SERVICE_NAME_TCP "net/tcp" +#define SERVICE_NAME_VBD "vbd" +#define SERVICE_NAME_VOLSRV "volsrv" #endif Index: uspace/lib/label/Makefile =================================================================== --- uspace/lib/label/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/lib/label/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2015 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +EXTRA_CFLAGS = -Iinclude -I$(LIBBLOCK_PREFIX) + +LIBRARY = liblabel + +SOURCES = \ + src/label.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/label/src/label.c =================================================================== --- uspace/lib/label/src/label.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/lib/label/src/label.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2015 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup liblabel + * @{ + */ +/** + * @file Disk label library. + */ + +/** @} + */ Index: uspace/srv/bd/vbd/Makefile =================================================================== --- uspace/srv/bd/vbd/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/bd/vbd/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,35 @@ +# +# Copyright (c) 2015 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../../.. +BINARY = vbd + +SOURCES = \ + vbd.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/bd/vbd/vbd.c =================================================================== --- uspace/srv/bd/vbd/vbd.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/bd/vbd/vbd.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2015 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup dnsres + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "vbd" + +static void vbd_client_conn(ipc_callid_t, ipc_call_t *, void *); + +static int vbd_init(void) +{ + int rc; + log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_init()"); + + async_set_client_connection(vbd_client_conn); + + rc = loc_server_register(NAME); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc); + return EEXIST; + } + + service_id_t sid; + rc = loc_service_register(SERVICE_NAME_VBD, &sid); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc); + return EEXIST; + } + + return EOK; +} + + +static void vbd_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "vbd_client_conn()"); + + /* Accept the connection */ + async_answer_0(iid, EOK); + + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + sysarg_t method = IPC_GET_IMETHOD(call); + + if (!method) { + /* The other side has hung up */ + async_answer_0(callid, EOK); + return; + } + + switch (method) { + default: + async_answer_0(callid, EINVAL); + } + } +} + +int main(int argc, char *argv[]) +{ + int rc; + + printf("%s: Virtual Block Device service\n", NAME); + + if (log_init(NAME) != EOK) { + printf(NAME ": Failed to initialize logging.\n"); + return 1; + } + + rc = vbd_init(); + if (rc != EOK) + return 1; + + printf(NAME ": Accepting connections.\n"); + task_retval(0); + async_manager(); + + return 0; +} + +/** @} + */ Index: uspace/srv/volsrv/Makefile =================================================================== --- uspace/srv/volsrv/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/volsrv/Makefile (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2015 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +BINARY = volsrv + +SOURCES = \ + disk.c \ + volsrv.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/volsrv/disk.c =================================================================== --- uspace/srv/volsrv/disk.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/volsrv/disk.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2015 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup volsrv + * @{ + */ +/** + * @file Disk device handling + * @brief + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "disk.h" +#include "types/disk.h" + +static int vol_disk_add(service_id_t); + +static LIST_INITIALIZE(vol_disks); +static FIBRIL_MUTEX_INITIALIZE(vol_disks_lock); + +/** Check for new disk devices */ +static int vol_disk_check_new(void) +{ + bool already_known; + category_id_t disk_cat; + service_id_t *svcs; + size_t count, i; + int rc; + + fibril_mutex_lock(&vol_disks_lock); + + rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'disk'."); + fibril_mutex_unlock(&vol_disks_lock); + return ENOENT; + } + + rc = loc_category_get_svcs(disk_cat, &svcs, &count); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of disk " + "devices."); + fibril_mutex_unlock(&vol_disks_lock); + return EIO; + } + + for (i = 0; i < count; i++) { + already_known = false; + + list_foreach(vol_disks, ldisks, vol_disk_t, disk) { + if (disk->svc_id == svcs[i]) { + already_known = true; + break; + } + } + + if (!already_known) { + log_msg(LOG_DEFAULT, LVL_NOTE, "Found disk '%lu'", + (unsigned long) svcs[i]); + rc = vol_disk_add(svcs[i]); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Could not add " + "disk."); + } + } + } + + fibril_mutex_unlock(&vol_disks_lock); + return EOK; +} + +static vol_disk_t *vol_disk_new(void) +{ + vol_disk_t *disk = calloc(1, sizeof(vol_disk_t)); + + if (disk == NULL) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating disk " + "structure. Out of memory."); + return NULL; + } + + link_initialize(&disk->ldisks); + + return disk; +} + +static void vol_disk_delete(vol_disk_t *disk) +{ + if (disk == NULL) + return; + + free(disk->svc_name); + free(disk); +} + +static int vol_disk_add(service_id_t sid) +{ + vol_disk_t *disk; + int rc; + + assert(fibril_mutex_is_locked(&vol_disks_lock)); + + log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_disk_add()"); + disk = vol_disk_new(); + if (disk == NULL) + return ENOMEM; + + disk->svc_id = sid; + + rc = loc_service_get_name(sid, &disk->svc_name); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting service name."); + goto error; + } + + log_msg(LOG_DEFAULT, LVL_NOTE, "Probe disk %s", disk->svc_name); +/* rc = inetcfg_link_add(sid); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed configuring link " + "'%s'.\n", nlink->svc_name); + goto error; + } +*/ + list_append(&disk->ldisks, &vol_disks); + + return EOK; + +error: + vol_disk_delete(disk); + return rc; +} + +static void vol_disk_cat_change_cb(void) +{ + (void) vol_disk_check_new(); +} + +int vol_disk_discovery_start(void) +{ + int rc; + + rc = loc_register_cat_change_cb(vol_disk_cat_change_cb); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback " + "for disk discovery (%d).", rc); + return rc; + } + + return vol_disk_check_new(); +} + +/** @} + */ Index: uspace/srv/volsrv/disk.h =================================================================== --- uspace/srv/volsrv/disk.h (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/volsrv/disk.h (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2015 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup volsrv + * @{ + */ +/** + * @file + * @brief + */ + +#ifndef DISK_H_ +#define DISK_H_ + +#include + +extern int vol_disk_discovery_start(void); + +#endif + +/** @} + */ Index: uspace/srv/volsrv/types/disk.h =================================================================== --- uspace/srv/volsrv/types/disk.h (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/volsrv/types/disk.h (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2015 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup volsrv + * @{ + */ +/** + * @file + * @brief + */ + +#ifndef TYPES_DISK_H_ +#define TYPES_DISK_H_ + +/** Disk */ +typedef struct { + /** Link to vol_disks */ + link_t ldisks; + /** Service ID */ + service_id_t svc_id; + /** Service name */ + char *svc_name; +} vol_disk_t; + +#endif + +/** @} + */ Index: uspace/srv/volsrv/volsrv.c =================================================================== --- uspace/srv/volsrv/volsrv.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) +++ uspace/srv/volsrv/volsrv.c (revision 1356f85ab4d59ae2070c30ebad2252295c6532ac) @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2015 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup volsrv + * @{ + */ +/** + * @file Volume service + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "disk.h" + +#define NAME "volsrv" + +static void vol_client_conn(ipc_callid_t, ipc_call_t *, void *); + +static int vol_init(void) +{ + int rc; + log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()"); + + rc = vol_disk_discovery_start(); + if (rc != EOK) + return rc; + + async_set_client_connection(vol_client_conn); + + rc = loc_server_register(NAME); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc); + return EEXIST; + } + + service_id_t sid; + rc = loc_service_register(SERVICE_NAME_VOLSRV, &sid); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc); + return EEXIST; + } + + return EOK; +} + + +static void vol_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_client_conn()"); + + /* Accept the connection */ + async_answer_0(iid, EOK); + + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + sysarg_t method = IPC_GET_IMETHOD(call); + + if (!method) { + /* The other side has hung up */ + async_answer_0(callid, EOK); + return; + } + + switch (method) { + default: + async_answer_0(callid, EINVAL); + } + } +} + +int main(int argc, char *argv[]) +{ + int rc; + + printf("%s: Volume service\n", NAME); + + if (log_init(NAME) != EOK) { + printf(NAME ": Failed to initialize logging.\n"); + return 1; + } + + rc = vol_init(); + if (rc != EOK) + return 1; + + printf(NAME ": Accepting connections.\n"); + task_retval(0); + async_manager(); + + return 0; +} + +/** @} + */