base: remove env_deprecated from rpc_cap_alloc

Issue #4784
This commit is contained in:
Norman Feske
2023-03-10 14:09:14 +01:00
parent 223e185b83
commit 441186468c
9 changed files with 81 additions and 21 deletions

View File

@ -16,7 +16,6 @@
#include <util/retry.h>
#include <base/rpc_server.h>
#include <pd_session/client.h>
#include <deprecated/env.h>
/* base-internal includes */
#include <base/internal/globals.h>
@ -27,6 +26,20 @@
using namespace Genode;
static Parent *_parent_ptr;
static Parent &_parent()
{
if (_parent_ptr)
return *_parent_ptr;
error("missing call of init_rpc_cap_alloc");
for (;;);
}
void Genode::init_rpc_cap_alloc(Parent &parent) { _parent_ptr = &parent; }
Native_capability Rpc_entrypoint::_alloc_rpc_cap(Pd_session &pd, Native_capability ep,
addr_t entry)
{
@ -48,9 +61,9 @@ Native_capability Rpc_entrypoint::_alloc_rpc_cap(Pd_session &pd, Native_capabili
catch (Out_of_ram) { ram_upgrade = Ram_quota { 2*1024*sizeof(long) }; }
catch (Out_of_caps) { cap_upgrade = Cap_quota { 4 }; }
env_deprecated()->parent()->upgrade(Parent::Env::pd(),
String<100>("ram_quota=", ram_upgrade, ", "
"cap_quota=", cap_upgrade).string());
_parent().upgrade(Parent::Env::pd(),
String<100>("ram_quota=", ram_upgrade, ", "
"cap_quota=", cap_upgrade).string());
}
}