ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-01 15:10:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

part_blk: API transition (fix 'deprecated' warnings)

Browse Source 
Issue #1987
This commit is contained in:
Christian Prochaska 2017-01-13 20:04:17 +01:00 committed by Norman Feske
parent dbb56a8068
commit 4e07f612cf
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
repos/os/src/server/part_blk/component.h
View File

@ -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 * This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2. * 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, Session_component(Ram_dataspace_capability rq_ds,
Partition *partition, Partition *partition,
Genode::Entrypoint &ep, Genode::Entrypoint &ep,
Genode::Region_map &rm,
Block::Driver &driver) 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_ds(rq_ds),
_rq_phys(Dataspace_client(_rq_ds).phys_addr()), _rq_phys(Dataspace_client(_rq_ds).phys_addr()),
_partition(partition), _partition(partition),
@ -282,7 +283,7 @@ class Block::Root :
ds_cap = _env.ram().alloc(tx_buf_size); ds_cap = _env.ram().alloc(tx_buf_size);
Session_component *session = new (md_alloc()) Session_component *session = new (md_alloc())
Session_component(ds_cap, _table.partition(num), Session_component(ds_cap, _table.partition(num),
_env.ep(), _driver); _env.ep(), _env.rm(), _driver);
log("session opened at partition ", num, " for '", label_str, "'"); log("session opened at partition ", num, " for '", label_str, "'");
return session; return session;

10
repos/os/src/server/part_blk/driver.h
View File

@ -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 * This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
@ -111,12 +111,12 @@ class Block::Driver
public: public:
Driver(Genode::Entrypoint &ep, Genode::Heap &heap) Driver(Genode::Env &env, Genode::Heap &heap)
: _r_slab(&heap), : _r_slab(&heap),
_block_alloc(&heap), _block_alloc(&heap),
_session(&_block_alloc, 4 * 1024 * 1024), _session(env, &_block_alloc, 4 * 1024 * 1024),
_source_ack(ep, *this, &Driver::_ack_avail), _source_ack(env.ep(), *this, &Driver::_ack_avail),
_source_submit(ep, *this, &Driver::_ready_to_submit) _source_submit(env.ep(), *this, &Driver::_ready_to_submit)
{ {
_session.info(&_blk_cnt, &_blk_size, &_ops); _session.info(&_blk_cnt, &_blk_size, &_ops);
} }

4
repos/os/src/server/part_blk/main.cc
View File

@ -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 * This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
@ -34,7 +34,7 @@ class Main
Genode::Env & _env; Genode::Env & _env;
Genode::Heap _heap { _env.ram(), _env.rm() }; Genode::Heap _heap { _env.ram(), _env.rm() };
Block::Driver _driver { _env.ep(), _heap }; Block::Driver _driver { _env, _heap };
Mbr_partition_table _mbr { _heap, _driver }; Mbr_partition_table _mbr { _heap, _driver };
Gpt _gpt { _heap, _driver }; Gpt _gpt { _heap, _driver };
Block::Root _root { _env, _heap, _driver, _table() }; Block::Root _root { _env, _heap, _driver, _table() };