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

base/cache.h: rename Cache_attribute to Cache

Browse Source 
The short name is better because the type will become prominently
visible at the API.

Issue #2243
This commit is contained in:
Norman Feske
2021-04-07 19:13:32 +02:00
parent 3ed8df9089
commit 468e7a825c
76 changed files with 226 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
repos/base/src/core/include/dataspace_component.h
View File

@ -45,7 +45,7 @@ namespace Genode {
/*
* Access memory cached, write-combined, or uncached respectively
*/
Cache_attribute const _cache { CACHED };
Cache const _cache { CACHED };
List<Rm_region> _regions { }; /* regions this is attached to */
Mutex _mutex { };
@ -79,7 +79,7 @@ namespace Genode {
* This constructor is used by RAM and ROM dataspaces.
*/
Dataspace_component(size_t size, addr_t core_local_addr,
Cache_attribute cache, bool writable,
Cache cache, bool writable,
Dataspace_owner *owner)
:
_phys_addr(core_local_addr), _core_local_addr(core_local_addr),
@ -98,7 +98,7 @@ namespace Genode {
* space is needed to send a mapping to another address space.
*/
Dataspace_component(size_t size, addr_t core_local_addr,
addr_t phys_addr, Cache_attribute cache,
addr_t phys_addr, Cache cache,
bool writable, Dataspace_owner *owner)
:
_phys_addr(phys_addr), _core_local_addr(core_local_addr),
@ -117,9 +117,9 @@ namespace Genode {
*/
virtual Native_capability sub_rm() { return Dataspace_capability(); }
addr_t core_local_addr() const { return _core_local_addr; }
bool io_mem() const { return _io_mem; }
Cache_attribute cacheability() const { return _cache; }
addr_t core_local_addr() const { return _core_local_addr; }
bool io_mem() const { return _io_mem; }
Cache cacheability() const { return _cache; }
/**
* Return dataspace base address to be used for map operations

12
repos/base/src/core/include/io_mem_session_component.h
View File

@ -35,10 +35,10 @@ namespace Genode {
*/
struct Dataspace_attr
{
size_t size { 0 };
addr_t core_local_addr { 0 };
addr_t phys_addr { 0 };
Cache_attribute cacheable { UNCACHED };
size_t size { 0 };
addr_t core_local_addr { 0 };
addr_t phys_addr { 0 };
Cache cacheable { UNCACHED };
/**
* Base address of request used for freeing mem-ranges
@ -59,7 +59,7 @@ namespace Genode {
* An invalid dataspace is represented by setting all
* arguments to zero.
*/
Dataspace_attr(size_t s, addr_t cla, addr_t pa, Cache_attribute c,
Dataspace_attr(size_t s, addr_t cla, addr_t pa, Cache c,
addr_t req_base)
:
size(s), core_local_addr(cla), phys_addr(pa),
@ -88,7 +88,7 @@ namespace Genode {
Io_dataspace_component _ds;
Rpc_entrypoint &_ds_ep;
Io_mem_dataspace_capability _ds_cap { };
Cache_attribute _cacheable { UNCACHED };
Cache _cacheable { UNCACHED };
Dataspace_attr _prepare_io_mem(const char *args, Range_allocator &ram_alloc);

2
repos/base/src/core/include/pd_session_component.h
View File

@ -315,7 +315,7 @@ class Genode::Pd_session_component : public Session_object<Pd_session>
** RAM allocation and accounting **
***********************************/
Ram_dataspace_capability alloc(size_t, Cache_attribute) override;
Ram_dataspace_capability alloc(size_t, Cache) override;
void free(Ram_dataspace_capability) override;

2
repos/base/src/core/include/ram_dataspace_factory.h
View File

@ -106,7 +106,7 @@ class Genode::Ram_dataspace_factory : public Ram_allocator,
** Ram_allocator interface **
*****************************/
Ram_dataspace_capability alloc(size_t, Cache_attribute) override;
Ram_dataspace_capability alloc(size_t, Cache) override;
void free(Ram_dataspace_capability) override;
size_t dataspace_size(Ram_dataspace_capability ds) const override;
};

4
repos/base/src/core/include/synced_ram_allocator.h
View File

@ -33,10 +33,10 @@ class Genode::Synced_ram_allocator : public Ram_allocator
Synced_ram_allocator(Ram_allocator &alloc) : _alloc(alloc) { }
Ram_dataspace_capability alloc(size_t size, Cache_attribute cached) override
Ram_dataspace_capability alloc(size_t size, Cache cache) override
{
Mutex::Guard mutex_guard(_mutex);
return _alloc.alloc(size, cached);
return _alloc.alloc(size, cache);
}
void free(Ram_dataspace_capability ds) override

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

@ -21,7 +21,7 @@ using namespace Genode;
Ram_dataspace_capability
Pd_session_component::alloc(size_t ds_size, Cache_attribute cached)
Pd_session_component::alloc(size_t ds_size, Cache cache)
{
/* zero-sized dataspaces are not allowed */
if (!ds_size) return Ram_dataspace_capability();
@ -62,7 +62,7 @@ Pd_session_component::alloc(size_t ds_size, Cache_attribute cached)
* \throw Out_of_ram
* \throw Out_of_caps
*/
Ram_dataspace_capability ram_ds = _ram_ds_factory.alloc(ds_size, cached);
Ram_dataspace_capability ram_ds = _ram_ds_factory.alloc(ds_size, cache);
/*
* We returned from '_ram_ds_factory.alloc' with a valid dataspace.

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

@ -21,7 +21,7 @@ using namespace Genode;
Ram_dataspace_capability
Ram_dataspace_factory::alloc(size_t ds_size, Cache_attribute cached)
Ram_dataspace_factory::alloc(size_t ds_size, Cache cache)
{
/* zero-sized dataspaces are not allowed */
if (!ds_size) return Ram_dataspace_capability();
@ -118,7 +118,7 @@ Ram_dataspace_factory::alloc(size_t ds_size, Cache_attribute cached)
* \throw Out_of_caps
*/
Dataspace_component &ds = *new (_ds_slab)
Dataspace_component(ds_size, (addr_t)ds_addr, cached, true, this);
Dataspace_component(ds_size, (addr_t)ds_addr, cache, true, this);
/* create native shared memory representation of dataspace */
try { _export_ram_ds(ds); }

2
repos/base/src/core/stack_area.cc
View File

@ -121,7 +121,7 @@ class Stack_area_region_map : public Region_map
struct Stack_area_ram_allocator : Ram_allocator
{
Ram_dataspace_capability alloc(size_t, Cache_attribute) override {
Ram_dataspace_capability alloc(size_t, Cache) override {
return reinterpret_cap_cast<Ram_dataspace>(Native_capability()); }
void free(Ram_dataspace_capability) override { }