diff --git a/headers/private/kernel/boot/vfs.h b/headers/private/kernel/boot/vfs.h index 0c8dbf1d45..aac6035899 100644 --- a/headers/private/kernel/boot/vfs.h +++ b/headers/private/kernel/boot/vfs.h @@ -46,28 +46,6 @@ class ConsoleNode : public Node { virtual ssize_t Write(const void *buffer, size_t bufferSize); }; -class Descriptor { - public: - Descriptor(Node *node, void *cookie); - ~Descriptor(); - - ssize_t Read(off_t pos, void *buffer, size_t bufferSize); - ssize_t Read(void *buffer, size_t bufferSize); - ssize_t Write(off_t pos, const void *buffer, size_t bufferSize); - ssize_t Write(const void *buffer, size_t bufferSize); - - off_t Offset() const { return fOffset; } - int32 RefCount() const { return fRefCount; } - - status_t Acquire(); - status_t Release(); - - private: - Node *fNode; - void *fCookie; - off_t fOffset; - int32 fRefCount; -}; extern "C" { #endif /* __cplusplus */ diff --git a/src/kernel/boot/loader/vfs.cpp b/src/kernel/boot/loader/vfs.cpp index 51ef184c5d..35f3e40d6a 100644 --- a/src/kernel/boot/loader/vfs.cpp +++ b/src/kernel/boot/loader/vfs.cpp @@ -13,6 +13,29 @@ #include +class Descriptor { + public: + Descriptor(Node *node, void *cookie); + ~Descriptor(); + + ssize_t Read(off_t pos, void *buffer, size_t bufferSize); + ssize_t Read(void *buffer, size_t bufferSize); + ssize_t Write(off_t pos, const void *buffer, size_t bufferSize); + ssize_t Write(const void *buffer, size_t bufferSize); + + off_t Offset() const { return fOffset; } + int32 RefCount() const { return fRefCount; } + + status_t Acquire(); + status_t Release(); + + private: + Node *fNode; + void *fCookie; + off_t fOffset; + int32 fRefCount; +}; + #define MAX_VFS_DESCRIPTORS 32 list gBootDevices;