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:
Ingo Weinhold 2007-03-07 08:09:27 +00:00
parent 3fd2e5ccb4
commit 446ce41f36
4 changed files with 20 additions and 33 deletions

View File

@ -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 googlefs ;
SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ; 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 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 udf ;
SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ; SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;

View File

@ -55,7 +55,7 @@ private:
SIZE_MASK = 0x7fffffff, SIZE_MASK = 0x7fffffff,
}; };
private: protected:
BlockHeader(); BlockHeader();
~BlockHeader(); ~BlockHeader();
@ -73,7 +73,7 @@ public:
bool hasNext, bool hasNext,
BlockReference *reference = NULL); BlockReference *reference = NULL);
private: protected:
Block(); Block();
~Block(); ~Block();
}; };
@ -94,7 +94,7 @@ public:
// Block *previous, size_t size, bool hasNext, TFreeBlock *previousFree, // Block *previous, size_t size, bool hasNext, TFreeBlock *previousFree,
// TFreeBlock *nextFree); // TFreeBlock *nextFree);
private: protected:
TFreeBlock(); TFreeBlock();
~TFreeBlock(); ~TFreeBlock();

View File

@ -71,12 +71,14 @@ Index::Find(const uint8 *key, size_t length, IndexEntryIterator *iterator)
void void
Index::Dump() Index::Dump()
{ {
PRINT(("Index: `%s', type: %lx\n", GetName(), GetType())); D(
for (IndexEntryIterator it(this); it.GetCurrent(); it.GetNext()) { PRINT(("Index: `%s', type: %lx\n", GetName(), GetType()));
Entry *entry = it.GetCurrent(); for (IndexEntryIterator it(this); it.GetCurrent(); it.GetNext()) {
PRINT((" entry: `%s', dir: %Ld\n", entry->GetName(), Entry *entry = it.GetCurrent();
entry->GetParent()->GetID())); PRINT((" entry: `%s', dir: %Ld\n", entry->GetName(),
} entry->GetParent()->GetID()));
}
)
} }

View File

@ -1,30 +1,14 @@
SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 src test SubDir HAIKU_TOP src add-ons kernel file_systems ramfs ;
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 ] ; SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
if $(OSPLAT) = X86 { SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
# SubDirC++Flags -include [ FDirName $(UFS_TOP) src kernel_add_on
# kernel-cpp.h ] ;
SubDirC++Flags -include [ FDirName $(SUBDIR) cpp.h ] ;
}
SEARCH_SOURCE += [ FDirName $(userlandFSTop) src shared ] ; KernelAddon ramfs
Addon <test>ramfs
: # relpath - obsolete
: Debug.cpp : Debug.cpp
Locker.cpp Locker.cpp
String.cpp String.cpp
@ -57,6 +41,6 @@ Addon <test>ramfs
SizeIndex.cpp SizeIndex.cpp
SymLink.cpp SymLink.cpp
Volume.cpp Volume.cpp
: false # is executable
: <test>UserlandFSServer : $(TARGET_GCC_LIBGCC) $(HAIKU_LIBSUPC++)
; ;