Build RamFS for the Haiku kernel. Seems to work fine. Also fixed some
warnings. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20351 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
3fd2e5ccb4
commit
446ce41f36
@ -5,6 +5,7 @@ SubInclude HAIKU_TOP src add-ons kernel file_systems bfs ;
|
||||
SubInclude HAIKU_TOP src add-ons kernel file_systems googlefs ;
|
||||
SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ;
|
||||
SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
|
||||
SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
|
||||
SubInclude HAIKU_TOP src add-ons kernel file_systems udf ;
|
||||
SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;
|
||||
|
||||
|
@ -55,7 +55,7 @@ private:
|
||||
SIZE_MASK = 0x7fffffff,
|
||||
};
|
||||
|
||||
private:
|
||||
protected:
|
||||
BlockHeader();
|
||||
~BlockHeader();
|
||||
|
||||
@ -73,7 +73,7 @@ public:
|
||||
bool hasNext,
|
||||
BlockReference *reference = NULL);
|
||||
|
||||
private:
|
||||
protected:
|
||||
Block();
|
||||
~Block();
|
||||
};
|
||||
@ -94,7 +94,7 @@ public:
|
||||
// Block *previous, size_t size, bool hasNext, TFreeBlock *previousFree,
|
||||
// TFreeBlock *nextFree);
|
||||
|
||||
private:
|
||||
protected:
|
||||
TFreeBlock();
|
||||
~TFreeBlock();
|
||||
|
||||
|
@ -71,12 +71,14 @@ Index::Find(const uint8 *key, size_t length, IndexEntryIterator *iterator)
|
||||
void
|
||||
Index::Dump()
|
||||
{
|
||||
PRINT(("Index: `%s', type: %lx\n", GetName(), GetType()));
|
||||
for (IndexEntryIterator it(this); it.GetCurrent(); it.GetNext()) {
|
||||
Entry *entry = it.GetCurrent();
|
||||
PRINT((" entry: `%s', dir: %Ld\n", entry->GetName(),
|
||||
entry->GetParent()->GetID()));
|
||||
}
|
||||
D(
|
||||
PRINT(("Index: `%s', type: %lx\n", GetName(), GetType()));
|
||||
for (IndexEntryIterator it(this); it.GetCurrent(); it.GetNext()) {
|
||||
Entry *entry = it.GetCurrent();
|
||||
PRINT((" entry: `%s', dir: %Ld\n", entry->GetName(),
|
||||
entry->GetParent()->GetID()));
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,30 +1,14 @@
|
||||
SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 src test
|
||||
ramfs ;
|
||||
SubDir HAIKU_TOP src add-ons kernel file_systems ramfs ;
|
||||
|
||||
SetSubDirSupportedPlatforms r5 bone dano ;
|
||||
local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel
|
||||
file_systems userlandfs ] ;
|
||||
local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
|
||||
|
||||
local userlandFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel
|
||||
file_systems userlandfs r5 ] ;
|
||||
local userlandFSIncludes = [ FDirName $(userlandFSTop) headers ] ;
|
||||
|
||||
DEFINES += USER=1 ;
|
||||
|
||||
SubDirC++Flags -include
|
||||
[ FDirName $(userlandFSIncludes) shared Compatibility.h ] ;
|
||||
|
||||
SubDirSysHdrs [ FDirName $(userlandFSIncludes) public ] ;
|
||||
SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
|
||||
|
||||
if $(OSPLAT) = X86 {
|
||||
# SubDirC++Flags -include [ FDirName $(UFS_TOP) src kernel_add_on
|
||||
# kernel-cpp.h ] ;
|
||||
SubDirC++Flags -include [ FDirName $(SUBDIR) cpp.h ] ;
|
||||
}
|
||||
SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
|
||||
|
||||
SEARCH_SOURCE += [ FDirName $(userlandFSTop) src shared ] ;
|
||||
|
||||
Addon <test>ramfs
|
||||
: # relpath - obsolete
|
||||
KernelAddon ramfs
|
||||
: Debug.cpp
|
||||
Locker.cpp
|
||||
String.cpp
|
||||
@ -57,6 +41,6 @@ Addon <test>ramfs
|
||||
SizeIndex.cpp
|
||||
SymLink.cpp
|
||||
Volume.cpp
|
||||
: false # is executable
|
||||
: <test>UserlandFSServer
|
||||
|
||||
: $(TARGET_GCC_LIBGCC) $(HAIKU_LIBSUPC++)
|
||||
;
|
||||
|
Loading…
Reference in New Issue
Block a user