Index: uspace/drv/block/ddisk/Makefile
===================================================================
--- uspace/drv/block/ddisk/Makefile	(revision f2e78b0daf913315c45d6f0ebdb97e2b34543b4b)
+++ uspace/drv/block/ddisk/Makefile	(revision f2e78b0daf913315c45d6f0ebdb97e2b34543b4b)
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2013 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 = ../../..
+LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBSCSI_PREFIX)/libscsi.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBSCSI_PREFIX)/include
+BINARY = ddisk
+
+SOURCES = \
+	ddisk.c
+
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision f2e78b0daf913315c45d6f0ebdb97e2b34543b4b)
+++ uspace/drv/block/ddisk/ddisk.c	(revision f2e78b0daf913315c45d6f0ebdb97e2b34543b4b)
@@ -0,0 +1,459 @@
+/*
+ * Copyright (c) 2015 Jakub Jermar
+ * Copyright (c) 2013 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.
+ */
+
+/** @file
+ * MSIM ddisk block device driver
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <errno.h>
+#include <str_error.h>
+#include <ddf/driver.h>
+#include <ddf/log.h>
+#include <device/hw_res_parsed.h>
+#include <ddi.h>
+#include <bd_srv.h>
+#include <fibril_synch.h>
+#include <as.h>
+
+#define NAME	"ddisk"
+
+#define DDISK_FUN_NAME	"a"
+
+#define DDISK_BLOCK_SIZE	512
+
+static int ddisk_dev_add(ddf_dev_t *dev);
+static int ddisk_dev_remove(ddf_dev_t *dev);
+static int ddisk_dev_gone(ddf_dev_t *dev);
+static int ddisk_fun_online(ddf_fun_t *fun);
+static int ddisk_fun_offline(ddf_fun_t *fun);
+
+static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
+
+static driver_ops_t driver_ops = {
+	.dev_add = ddisk_dev_add,
+	.dev_remove = ddisk_dev_remove,
+	.dev_gone = ddisk_dev_gone,
+	.fun_online = ddisk_fun_online,
+	.fun_offline = ddisk_fun_offline
+};
+
+static driver_t ddisk_driver = {
+	.name = NAME,
+	.driver_ops = &driver_ops
+};
+
+typedef struct {
+	int irq;
+	uintptr_t base;
+} ddisk_res_t;
+
+typedef struct {
+	ioport32_t dma_buffer;
+	ioport32_t block;
+	union {
+		ioport32_t status;
+		ioport32_t command;
+	};
+	ioport32_t size;
+} ddisk_regs_t;
+
+struct ddisk_dev;
+
+typedef struct ddisk_fun {
+	ddf_fun_t *fun;
+	struct ddisk_dev *ddisk_dev;
+	
+	size_t blocks;
+
+	bd_srvs_t bds;
+} ddisk_fun_t;
+
+typedef struct ddisk_dev {
+	fibril_mutex_t lock;
+	ddf_dev_t *dev;
+	ddisk_res_t ddisk_res;
+	ddisk_fun_t *ddisk_fun; 	
+	ddisk_regs_t *ddisk_regs;
+	uintptr_t dma_buffer_phys;
+	void *dma_buffer;
+} ddisk_dev_t;
+
+static int ddisk_bd_open(bd_srvs_t *, bd_srv_t *);
+static int ddisk_bd_close(bd_srv_t *);
+static int ddisk_bd_read_blocks(bd_srv_t *, uint64_t, size_t, void *, size_t);
+static int ddisk_bd_write_blocks(bd_srv_t *, uint64_t, size_t, const void *,
+    size_t);
+static int ddisk_bd_get_block_size(bd_srv_t *, size_t *);
+static int ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+
+bd_ops_t ddisk_bd_ops = {
+	.open = ddisk_bd_open,
+	.close = ddisk_bd_close,
+	.read_blocks = ddisk_bd_read_blocks,
+	.write_blocks = ddisk_bd_write_blocks,
+	.get_block_size = ddisk_bd_get_block_size,
+	.get_num_blocks = ddisk_bd_get_num_blocks,
+};
+
+int ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+	return EOK;
+}
+
+int ddisk_bd_close(bd_srv_t *bd)
+{
+	return EOK;
+}
+
+int
+ddisk_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf,
+    size_t size)
+{
+	if (size < cnt * DDISK_BLOCK_SIZE)
+		return EINVAL;		
+
+	return ENOTSUP;
+}
+
+int ddisk_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
+    const void *buf, size_t size)
+{
+	if (size < cnt * DDISK_BLOCK_SIZE)
+		return EINVAL;		
+
+	return ENOTSUP;
+}
+
+int ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+{
+	*rsize = DDISK_BLOCK_SIZE; 
+	return EOK;
+}
+
+int ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+{
+	ddisk_fun_t *ddisk_fun = (ddisk_fun_t *) bd->srvs->sarg;
+
+	*rnb = ddisk_fun->blocks;
+	return EOK;	
+}
+
+static int ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res)
+{
+	async_sess_t *parent_sess;
+	hw_res_list_parsed_t hw_res;
+	int rc;
+
+	parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+	if (parent_sess == NULL)
+		return ENOMEM;
+
+	hw_res_list_parsed_init(&hw_res);
+	rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+	if (rc != EOK)
+		return rc;
+
+	if ((hw_res.mem_ranges.count != 1) || (hw_res.irqs.count != 1)) {
+		rc = EINVAL;
+		goto error;
+	}
+
+	addr_range_t *regs = &hw_res.mem_ranges.ranges[0];
+	ddisk_res->base = RNGABS(*regs);
+	ddisk_res->irq = hw_res.irqs.irqs[0]; 
+
+	if (RNGSZ(*regs) < sizeof(ddisk_regs_t)) {
+		rc = EINVAL;
+		goto error;
+	}
+
+	rc = EOK;
+error:
+	hw_res_list_parsed_clean(&hw_res);
+	return rc;
+}
+
+static int ddisk_fun_create(ddisk_dev_t *ddisk_dev)
+{
+	int rc;
+	ddf_fun_t *fun = NULL;
+	ddisk_fun_t *ddisk_fun = NULL;
+
+	fun = ddf_fun_create(ddisk_dev->dev, fun_exposed, DDISK_FUN_NAME);
+	if (fun == NULL) {
+		ddf_msg(LVL_ERROR, "Failed creating DDF function.");
+		rc = ENOMEM;
+		goto error;
+	}
+
+	/* Allocate soft state */
+	ddisk_fun = ddf_fun_data_alloc(fun, sizeof(ddisk_fun_t));
+	if (!ddisk_fun) {
+		ddf_msg(LVL_ERROR, "Failed allocating softstate.");
+		rc = ENOMEM;
+		goto error;
+	}
+
+	ddisk_fun->fun = fun;
+	ddisk_fun->ddisk_dev = ddisk_dev;
+
+	bd_srvs_init(&ddisk_fun->bds);
+	ddisk_fun->bds.ops = &ddisk_bd_ops;
+	ddisk_fun->bds.sarg = ddisk_fun;
+
+	/* Set up a connection handler. */
+	ddf_fun_set_conn_handler(fun, ddisk_bd_connection);
+
+	ddisk_fun->blocks = pio_read_32(&ddisk_dev->ddisk_regs->size) /
+	    DDISK_BLOCK_SIZE;
+
+	rc = ddf_fun_bind(fun);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Failed binding DDF function %s: %s",
+		    DDISK_FUN_NAME, str_error(rc));
+		goto error;
+	}
+
+	ddf_fun_add_to_category(fun, "bd");
+
+	ddisk_dev->ddisk_fun = ddisk_fun;
+	return EOK;
+error:
+	if (fun != NULL)
+		ddf_fun_destroy(fun);
+
+	return rc;
+}
+
+static int ddisk_fun_remove(ddisk_fun_t *ddisk_fun)
+{
+	int rc;
+
+	if (ddisk_fun->fun == NULL)
+		return EOK;
+
+	ddf_msg(LVL_DEBUG, "ddisk_fun_remove(%p, '%s')", ddisk_fun,
+	    DDISK_FUN_NAME);
+	rc = ddf_fun_offline(ddisk_fun->fun);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Error offlining function '%s'.",
+		    DDISK_FUN_NAME);
+		goto error;
+	}
+
+	rc = ddf_fun_unbind(ddisk_fun->fun);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Failed unbinding function '%s'.",
+		    DDISK_FUN_NAME);
+		goto error;
+	}
+
+	ddf_fun_destroy(ddisk_fun->fun);
+	ddisk_fun->fun = NULL;
+	rc = EOK;
+error:
+	return rc;
+}
+
+static int ddisk_fun_unbind(ddisk_fun_t *ddisk_fun)
+{
+	int rc;
+
+	if (ddisk_fun->fun == NULL)
+		return EOK;
+
+	ddf_msg(LVL_DEBUG, "ddisk_fun_unbind(%p, '%s')", ddisk_fun,
+	    DDISK_FUN_NAME);
+	rc = ddf_fun_unbind(ddisk_fun->fun);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Failed unbinding function '%s'.",
+		    DDISK_FUN_NAME);
+		goto error;
+	}
+
+	ddf_fun_destroy(ddisk_fun->fun);
+	ddisk_fun->fun = NULL;
+	rc = EOK;
+error:
+	return rc;
+}
+
+/** Add new device
+ *
+ * @param  dev New device
+ * @return     EOK on success or negative error code.
+ */
+static int ddisk_dev_add(ddf_dev_t *dev)
+{
+	ddisk_dev_t *ddisk_dev;
+	ddisk_res_t res;
+	int rc;
+
+	rc = ddisk_get_res(dev, &res);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
+		return EINVAL;
+	}
+
+	ddisk_dev = ddf_dev_data_alloc(dev, sizeof(ddisk_dev_t));
+	if (!ddisk_dev) {
+		ddf_msg(LVL_ERROR, "Failed allocating soft state.");
+		rc = ENOMEM;
+		goto error;
+	}
+
+	fibril_mutex_initialize(&ddisk_dev->lock);
+	ddisk_dev->dev = dev;
+	ddisk_dev->ddisk_res = res;
+
+	/*
+	 * Enable access to ddisk's PIO registers.
+	 */
+	void *vaddr;
+	rc = pio_enable((void *) res.base, sizeof(ddisk_regs_t), &vaddr);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Cannot initialize device I/O space.");
+		goto error;
+	}
+	ddisk_dev->ddisk_regs = vaddr;
+
+	if ((int32_t) pio_read_32(&ddisk_dev->ddisk_regs->size) <= 0) {
+		ddf_msg(LVL_WARN, "No disk detected.");
+		rc = EIO;
+		goto error;
+	}
+
+	/*
+	 * Allocate DMA buffer.
+	 */
+	ddisk_dev->dma_buffer = AS_AREA_ANY;
+	rc = dmamem_map_anonymous(DDISK_BLOCK_SIZE, DMAMEM_4GiB,
+	    AS_AREA_READ | AS_AREA_WRITE, 0, &ddisk_dev->dma_buffer_phys,
+	    &ddisk_dev->dma_buffer);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Cannot allocate DMA memory.");
+		goto error;
+	}
+
+	ddf_msg(LVL_NOTE, "Allocated DMA buffer at %p virtual and %p physical.",
+	    ddisk_dev->dma_buffer, (void *) ddisk_dev->dma_buffer_phys);
+
+	rc = ddisk_fun_create(ddisk_dev);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Failed initializing ddisk controller.");
+		rc = EIO;
+		goto error;
+	}
+
+	ddf_msg(LVL_NOTE, "Device at %p with %d blocks (%dB) using interrupt %d",
+	    (void *) ddisk_dev->ddisk_res.base, ddisk_dev->ddisk_fun->blocks,
+	    ddisk_dev->ddisk_fun->blocks * DDISK_BLOCK_SIZE, ddisk_dev->ddisk_res.irq);
+
+	return EOK;
+error:
+	if (ddisk_dev->ddisk_regs)
+		pio_disable(ddisk_dev->ddisk_regs, sizeof(ddisk_regs_t));
+	if (ddisk_dev->dma_buffer)
+		dmamem_unmap_anonymous(ddisk_dev->dma_buffer);
+	return rc;
+}
+
+
+static int ddisk_dev_remove_common(ddisk_dev_t *ddisk_dev, bool surprise)
+{
+	int rc;
+
+	if (!surprise)
+		rc = ddisk_fun_remove(ddisk_dev->ddisk_fun);
+	else
+		rc = ddisk_fun_unbind(ddisk_dev->ddisk_fun);
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Unable to cleanup function '%s'.",
+		    DDISK_FUN_NAME);
+		return rc;
+	}
+	
+	rc = pio_disable(ddisk_dev->ddisk_regs, sizeof(ddisk_regs_t));
+	if (rc != EOK) {
+		ddf_msg(LVL_ERROR, "Unable to disable PIO.");
+		return rc;	
+	}
+
+	dmamem_unmap_anonymous(ddisk_dev->dma_buffer);
+
+	return EOK;
+}
+
+static int ddisk_dev_remove(ddf_dev_t *dev)
+{
+	ddisk_dev_t *ddisk_dev = (ddisk_dev_t *) ddf_dev_data_get(dev);
+
+	ddf_msg(LVL_DEBUG, "ddisk_dev_remove(%p)", dev);
+
+	return ddisk_dev_remove_common(ddisk_dev, false);
+}
+
+static int ddisk_dev_gone(ddf_dev_t *dev)
+{
+	ddisk_dev_t *ddisk_dev = (ddisk_dev_t *) ddf_dev_data_get(dev);
+
+	ddf_msg(LVL_DEBUG, "ddisk_dev_gone(%p)", dev);
+
+	return ddisk_dev_remove_common(ddisk_dev, true);
+}
+
+static int ddisk_fun_online(ddf_fun_t *fun)
+{
+	ddf_msg(LVL_DEBUG, "ddisk_fun_online()");
+	return ddf_fun_online(fun);
+}
+
+static int ddisk_fun_offline(ddf_fun_t *fun)
+{
+	ddf_msg(LVL_DEBUG, "ddisk_fun_offline()");
+	return ddf_fun_offline(fun);
+}
+
+/** Block device connection handler */
+static void ddisk_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+	ddisk_fun_t *ddfun;
+
+	ddfun = (ddisk_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
+	bd_conn(iid, icall, &ddfun->bds);
+}
+
+int main(int argc, char *argv[])
+{
+	printf(NAME ": HelenOS MSIM ddisk device driver\n");
+	ddf_log_init(NAME);
+	return ddf_driver_main(&ddisk_driver);
+}
Index: uspace/drv/block/ddisk/ddisk.ma
===================================================================
--- uspace/drv/block/ddisk/ddisk.ma	(revision f2e78b0daf913315c45d6f0ebdb97e2b34543b4b)
+++ uspace/drv/block/ddisk/ddisk.ma	(revision f2e78b0daf913315c45d6f0ebdb97e2b34543b4b)
@@ -0,0 +1,1 @@
+10 msim/ddisk