From 4e07f612cf35f1d0ffcbbea1fb033f9a5a0107e7 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 13 Jan 2017 20:04:17 +0100 Subject: [PATCH] part_blk: API transition (fix 'deprecated' warnings) Issue #1987 --- repos/os/src/server/part_blk/component.h | 7 ++++--- repos/os/src/server/part_blk/driver.h | 10 +++++----- repos/os/src/server/part_blk/main.cc | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/repos/os/src/server/part_blk/component.h b/repos/os/src/server/part_blk/component.h index f4457ef080..30f39259ca 100644 --- a/repos/os/src/server/part_blk/component.h +++ b/repos/os/src/server/part_blk/component.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2013-2016 Genode Labs GmbH + * Copyright (C) 2013-2017 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU General Public License version 2. @@ -125,8 +125,9 @@ class Block::Session_component : public Block::Session_rpc_object, Session_component(Ram_dataspace_capability rq_ds, Partition *partition, Genode::Entrypoint &ep, + Genode::Region_map &rm, Block::Driver &driver) - : Session_rpc_object(rq_ds, ep.rpc_ep()), + : Session_rpc_object(rm, rq_ds, ep.rpc_ep()), _rq_ds(rq_ds), _rq_phys(Dataspace_client(_rq_ds).phys_addr()), _partition(partition), @@ -282,7 +283,7 @@ class Block::Root : ds_cap = _env.ram().alloc(tx_buf_size); Session_component *session = new (md_alloc()) Session_component(ds_cap, _table.partition(num), - _env.ep(), _driver); + _env.ep(), _env.rm(), _driver); log("session opened at partition ", num, " for '", label_str, "'"); return session; diff --git a/repos/os/src/server/part_blk/driver.h b/repos/os/src/server/part_blk/driver.h index 8eafc767fc..8935cbe5df 100644 --- a/repos/os/src/server/part_blk/driver.h +++ b/repos/os/src/server/part_blk/driver.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2013 Genode Labs GmbH + * Copyright (C) 2013-2017 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU General Public License version 2. @@ -111,12 +111,12 @@ class Block::Driver public: - Driver(Genode::Entrypoint &ep, Genode::Heap &heap) + Driver(Genode::Env &env, Genode::Heap &heap) : _r_slab(&heap), _block_alloc(&heap), - _session(&_block_alloc, 4 * 1024 * 1024), - _source_ack(ep, *this, &Driver::_ack_avail), - _source_submit(ep, *this, &Driver::_ready_to_submit) + _session(env, &_block_alloc, 4 * 1024 * 1024), + _source_ack(env.ep(), *this, &Driver::_ack_avail), + _source_submit(env.ep(), *this, &Driver::_ready_to_submit) { _session.info(&_blk_cnt, &_blk_size, &_ops); } diff --git a/repos/os/src/server/part_blk/main.cc b/repos/os/src/server/part_blk/main.cc index 962e43ebfc..6467975366 100644 --- a/repos/os/src/server/part_blk/main.cc +++ b/repos/os/src/server/part_blk/main.cc @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2011-2016 Genode Labs GmbH + * Copyright (C) 2011-2017 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU General Public License version 2. @@ -34,7 +34,7 @@ class Main Genode::Env & _env; Genode::Heap _heap { _env.ram(), _env.rm() }; - Block::Driver _driver { _env.ep(), _heap }; + Block::Driver _driver { _env, _heap }; Mbr_partition_table _mbr { _heap, _driver }; Gpt _gpt { _heap, _driver }; Block::Root _root { _env, _heap, _driver, _table() };