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

base: remove internal use of 'env_deprecated'

Browse Source 
Fixes #4784
This commit is contained in:
Norman Feske
2023-06-21 17:51:04 +02:00
parent de99945af0
commit 7e1a2ac684
9 changed files with 28 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
repos/base/src/core/include/core_env.h
View File

@ -17,7 +17,6 @@
/* Genode includes */
#include <base/env.h>
#include <deprecated/env.h>
/* base-internal includes */
#include <base/internal/globals.h>
@ -36,7 +35,7 @@ namespace Core {
}
class Core::Core_env : public Env_deprecated, Noncopyable
class Core::Core_env : public Noncopyable
{
private:
@ -87,16 +86,12 @@ class Core::Core_env : public Env_deprecated, Noncopyable
Rpc_entrypoint &signal_ep();
/******************************
** Env_deprecated interface **
******************************/
Parent *parent() override { return nullptr; }
Region_map *rm_session() override { return &_region_map; }
Pd_session *pd_session() override { return &_pd_session; }
Cpu_session *cpu_session() override { ASSERT_NEVER_CALLED; }
Cpu_session_capability cpu_session_cap() override { ASSERT_NEVER_CALLED; }
Pd_session_capability pd_session_cap() override { return _pd_session.cap(); }
Parent *parent() { return nullptr; }
Region_map *rm_session() { return &_region_map; }
Pd_session *pd_session() { return &_pd_session; }
Cpu_session *cpu_session() { ASSERT_NEVER_CALLED; }
Cpu_session_capability cpu_session_cap() { ASSERT_NEVER_CALLED; }
Pd_session_capability pd_session_cap() { return _pd_session.cap(); }
};
#endif /* _CORE__INCLUDE__CORE_ENV_H_ */

4
repos/base/src/core/main.cc
View File

@ -74,10 +74,6 @@ Core_env &Core::core_env()
}
Env_deprecated *Genode::env_deprecated() {
return &core_env(); }
Core::Platform &Core::platform_specific()
{
static Platform _platform;