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

usb_session: pass Region_map explicitly

Browse Source 
Issue #2280.
This commit is contained in:
Josef Söntgen
2017-02-13 14:55:37 +01:00
committed by Christian Helmuth
parent a2cff03539
commit 3c57a8b3c2
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repos/dde_linux/src/lib/usb/raw/raw.cc
View File

@ -5,7 +5,7 @@
*/ */
/* /*
* Copyright (C) 2014-2016 Genode Labs GmbH * Copyright (C) 2014-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.
@ -552,10 +552,12 @@ class Usb::Session_component : public Session_rpc_object,
DEVICE_REMOVE, DEVICE_REMOVE,
}; };
Session_component(Genode::Ram_dataspace_capability tx_ds, Genode::Entrypoint &ep, Session_component(Genode::Ram_dataspace_capability tx_ds,
Genode::Entrypoint &ep,
Genode::Region_map &rm,
unsigned long vendor, unsigned long product, unsigned long vendor, unsigned long product,
long bus, long dev) long bus, long dev)
: Session_rpc_object(tx_ds, ep.rpc_ep()), : Session_rpc_object(tx_ds, ep.rpc_ep(), rm),
_ep(ep), _ep(ep),
_vendor(vendor), _product(product), _bus(bus), _dev(dev), _vendor(vendor), _product(product), _bus(bus), _dev(dev),
_packet_avail(ep, *this, &Session_component::_receive), _packet_avail(ep, *this, &Session_component::_receive),
@ -818,7 +820,7 @@ class Usb::Root : public Genode::Root_component<Session_component>
Ram_dataspace_capability tx_ds = _env.ram().alloc(tx_buf_size); Ram_dataspace_capability tx_ds = _env.ram().alloc(tx_buf_size);
Session_component *session = new (md_alloc()) Session_component *session = new (md_alloc())
Session_component(tx_ds, _env.ep(), vendor, product, bus, dev); Session_component(tx_ds, _env.ep(), _env.rm(), vendor, product, bus, dev);
::Session::list()->insert(session); ::Session::list()->insert(session);
return session; return session;
} catch (Genode::Session_policy::No_policy_defined) { } catch (Genode::Session_policy::No_policy_defined) {

7
repos/os/include/usb_session/rpc_object.h
View File

@ -5,7 +5,7 @@
*/ */
/* /*
* Copyright (C) 2014 Genode Labs GmbH * Copyright (C) 2014-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.
@ -36,8 +36,9 @@ class Usb::Session_rpc_object : public Genode::Rpc_object<Session, Session_rpc_o
* \param ep entry point used for packet-stream channel * \param ep entry point used for packet-stream channel
*/ */
Session_rpc_object(Genode::Dataspace_capability tx_ds, Session_rpc_object(Genode::Dataspace_capability tx_ds,
Genode::Rpc_entrypoint &ep) Genode::Rpc_entrypoint &ep,
: _tx(tx_ds, *Genode::env()->rm_session(), ep) { } Genode::Region_map &rm)
: _tx(tx_ds, rm, ep) { }
/** /**
* Return capability to packet-stream channel * Return capability to packet-stream channel