Move chunk types out of File_system namespace
This commit is contained in:
parent
253df72ce3
commit
4f39d8bd3a
|
@ -20,9 +20,10 @@
|
|||
#include <util/string.h>
|
||||
#include <file_system_session/file_system_session.h>
|
||||
|
||||
namespace File_system {
|
||||
namespace Ram_fs {
|
||||
|
||||
using namespace Genode;
|
||||
using namespace File_system;
|
||||
|
||||
using Genode::Noncopyable;
|
||||
|
||||
|
@ -36,7 +37,7 @@ namespace File_system {
|
|||
/**
|
||||
* Common base class of both 'Chunk' and 'Chunk_index'
|
||||
*/
|
||||
class File_system::Chunk_base : Noncopyable
|
||||
class Ram_fs::Chunk_base : Noncopyable
|
||||
{
|
||||
public:
|
||||
|
||||
|
@ -98,7 +99,7 @@ class File_system::Chunk_base : Noncopyable
|
|||
* Chunk of bytes used as leaf in hierarchy of chunk indices
|
||||
*/
|
||||
template <Genode::size_t CHUNK_SIZE>
|
||||
class File_system::Chunk : public Chunk_base
|
||||
class Ram_fs::Chunk : public Chunk_base
|
||||
{
|
||||
private:
|
||||
|
||||
|
@ -178,7 +179,7 @@ class File_system::Chunk : public Chunk_base
|
|||
|
||||
|
||||
template <Genode::size_t NUM_ENTRIES, typename ENTRY_TYPE>
|
||||
class File_system::Chunk_index : public Chunk_base
|
||||
class Ram_fs::Chunk_index : public Chunk_base
|
||||
{
|
||||
public:
|
||||
|
||||
|
|
|
@ -26,9 +26,9 @@ namespace Vfs_ram {
|
|||
|
||||
using namespace Genode;
|
||||
using namespace Vfs;
|
||||
using namespace Ram_fs;
|
||||
using File_system::Chunk;
|
||||
using File_system::Chunk_index;
|
||||
|
||||
using Ram_fs::Chunk;
|
||||
using Ram_fs::Chunk_index;
|
||||
|
||||
struct Io_handle;
|
||||
struct Watch_handle;
|
||||
|
@ -236,10 +236,10 @@ class Vfs_ram::File : public Vfs_ram::Node
|
|||
{
|
||||
private:
|
||||
|
||||
typedef Chunk <num_level_3_entries()> Chunk_level_3;
|
||||
typedef Chunk_index<num_level_2_entries(), Chunk_level_3> Chunk_level_2;
|
||||
typedef Chunk_index<num_level_1_entries(), Chunk_level_2> Chunk_level_1;
|
||||
typedef Chunk_index<num_level_0_entries(), Chunk_level_1> Chunk_level_0;
|
||||
typedef Chunk <Ram_fs::num_level_3_entries()> Chunk_level_3;
|
||||
typedef Chunk_index<Ram_fs::num_level_2_entries(), Chunk_level_3> Chunk_level_2;
|
||||
typedef Chunk_index<Ram_fs::num_level_1_entries(), Chunk_level_2> Chunk_level_1;
|
||||
typedef Chunk_index<Ram_fs::num_level_0_entries(), Chunk_level_1> Chunk_level_0;
|
||||
|
||||
Chunk_level_0 _chunk;
|
||||
file_size _length = 0;
|
||||
|
|
|
@ -25,8 +25,6 @@
|
|||
|
||||
namespace Ram_fs
|
||||
{
|
||||
using File_system::Chunk;
|
||||
using File_system::Chunk_index;
|
||||
using File_system::file_size_t;
|
||||
using File_system::SEEK_TAIL;
|
||||
class File;
|
||||
|
|
|
@ -659,6 +659,7 @@ static void preload_content(Genode::Env &env,
|
|||
Genode::Xml_node node,
|
||||
Ram_fs::Directory &dir)
|
||||
{
|
||||
using namespace Genode;
|
||||
using namespace File_system;
|
||||
|
||||
for (unsigned i = 0; i < node.num_sub_nodes(); i++) {
|
||||
|
|
Loading…
Reference in New Issue