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

loader: API transition (fix 'deprecated' warnings)

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

4
repos/os/src/server/loader/input.h
View File

@ -11,7 +11,7 @@
*/
/*
* Copyright (C) 2010-2013 Genode Labs GmbH
* Copyright (C) 2010-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.
@ -55,7 +55,7 @@ class Input::Session_component : public Rpc_object<Session>
Session_capability real_input,
Motion_delta &motion_delta)
:
_real_input(real_input), _motion_delta(motion_delta),
_real_input(rm, real_input), _motion_delta(motion_delta),
_ev_ds(rm, _real_input.dataspace()),
_ev_buf(_ev_ds.local_addr<Event>())
{ }

11
repos/os/src/server/loader/main.cc
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2010-2016 Genode Labs GmbH
* Copyright (C) 2010-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.
@ -160,6 +160,7 @@ class Loader::Session_component : public Rpc_object<Session>
struct Local_nitpicker_factory : Local_service<Nitpicker::Session_component>::Factory
{
Entrypoint &_ep;
Env &_env;
Region_map &_rm;
Ram_session &_ram;
@ -170,8 +171,8 @@ class Loader::Session_component : public Rpc_object<Session>
Constructible<Nitpicker::Session_component> session;
Local_nitpicker_factory(Entrypoint &ep, Region_map &rm, Ram_session &ram)
: _ep(ep), _rm(rm), _ram(ram) { }
Local_nitpicker_factory(Entrypoint &ep, Env &env, Region_map &rm, Ram_session &ram)
: _ep(ep), _env(env), _rm(rm), _ram(ram) { }
void constrain_geometry(Area size) { _max_size = size; }
@ -187,7 +188,7 @@ class Loader::Session_component : public Rpc_object<Session>
throw Parent::Service_denied();
}
session.construct(_ep, _rm, _ram, _max_size,
session.construct(_ep, _env, _rm, _ram, _max_size,
_parent_view, view_ready_sigh, args.string());
return *session;
}
@ -213,7 +214,7 @@ class Loader::Session_component : public Rpc_object<Session>
Local_rom_service _rom_service { _rom_factory };
Local_cpu_service _cpu_service { _env };
Local_pd_service _pd_service { _env };
Local_nitpicker_factory _nitpicker_factory { _env.ep(), _env.rm(), _local_ram };
Local_nitpicker_factory _nitpicker_factory { _env.ep(), _env, _env.rm(), _local_ram };
Local_nitpicker_service _nitpicker_service { _nitpicker_factory };
Signal_context_capability _fault_sigh;
Constructible<Child> _child;

6
repos/os/src/server/loader/nitpicker.h
View File

@ -6,7 +6,7 @@
*/
/*
* Copyright (C) 2009-2013 Genode Labs GmbH
* Copyright (C) 2009-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.
@ -150,6 +150,7 @@ class Nitpicker::Session_component : public Rpc_object<Session>
* Constructor
*/
Session_component(Entrypoint &ep,
Env &env,
Region_map &rm,
Ram_session &ram,
Area max_size,
@ -160,6 +161,7 @@ class Nitpicker::Session_component : public Rpc_object<Session>
_view_ready_sigh(view_ready_sigh),
_ep(ep),
_max_size(max_size),
_nitpicker(env),
/* import parent view */
_parent_view_handle(_nitpicker.view_handle(parent_view)),
@ -169,7 +171,7 @@ class Nitpicker::Session_component : public Rpc_object<Session>
_proxy_input(rm, _nitpicker.input_session(), _motion_delta),
_command_ds(&ram, sizeof(Command_buffer))
_command_ds(ram, env.rm(), sizeof(Command_buffer))
{
_ep.manage(_proxy_input);
_ep.manage(*this);

10
repos/os/src/server/loader/rom.h
View File

@ -4,10 +4,16 @@
* \date 2012-04-17
*/
/*
* Copyright (C) 2012-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.
*/
#ifndef _ROM_H_
#define _ROM_H_
//#include <util/string.h>
#include <rom_session/rom_session.h>
#include <base/rpc_server.h>
#include <os/attached_ram_dataspace.h>
@ -45,7 +51,7 @@ namespace Genode {
Ram_session &ram_session, Origin origin)
:
_name(name), _ram(ram_session),
_fg(&_ram, 0), _bg(&_ram, 0),
_fg(_ram, env.rm(), 0), _bg(_ram, env.rm(), 0),
_bg_has_pending_data(false),
_lock(Lock::LOCKED)
{