From 2c4f728f7e60e886362d0f5f5a46a9471b6c2b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 28 Oct 2004 17:00:29 +0000 Subject: [PATCH] Added our preliminary mount replacements. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9567 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/Jamfile | 11 +++++++++ src/kernel/libroot/os/Jamfile | 39 ++++++++++++++----------------- src/kernel/libroot/os/fs_volume.c | 32 +++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 21 deletions(-) create mode 100644 src/kernel/libroot/os/fs_volume.c diff --git a/src/kernel/libroot/Jamfile b/src/kernel/libroot/Jamfile index ae93d16ca9..fee1c1a030 100755 --- a/src/kernel/libroot/Jamfile +++ b/src/kernel/libroot/Jamfile @@ -7,6 +7,17 @@ KernelObjects : -fPIC -DPIC ; +# kernel libroot os files + +KernelMergeObject kernel_os_main.o : + driver_settings.c + : -fno-pic + ; + +SEARCH on [ FGristFiles + driver_settings.c + ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ; + # kernel libroot posix files SEARCH_SOURCE += [ FDirName $(SUBDIR) posix ] ; diff --git a/src/kernel/libroot/os/Jamfile b/src/kernel/libroot/os/Jamfile index 2d9f22ec35..ac2c71cbbc 100644 --- a/src/kernel/libroot/os/Jamfile +++ b/src/kernel/libroot/os/Jamfile @@ -3,23 +3,24 @@ SubDir OBOS_TOP src kernel libroot os ; SubDirHdrs [ FCurrentObjectsDir ] ; KernelMergeObject os_main.o : - <$(SOURCE_GRIST)>area.c - <$(SOURCE_GRIST)>atomic.c - <$(SOURCE_GRIST)>debug.c - <$(SOURCE_GRIST)>driver_settings.c - <$(SOURCE_GRIST)>fs_attr.c - <$(SOURCE_GRIST)>fs_index.c - <$(SOURCE_GRIST)>fs_info.c - <$(SOURCE_GRIST)>fs_query.cpp - <$(SOURCE_GRIST)>image.c - <$(SOURCE_GRIST)>parsedate.cpp - <$(SOURCE_GRIST)>port.c - <$(SOURCE_GRIST)>sem.c - <$(SOURCE_GRIST)>system_info.c - <$(SOURCE_GRIST)>team.c - <$(SOURCE_GRIST)>thread.c - <$(SOURCE_GRIST)>time.c - <$(SOURCE_GRIST)>syscalls.S + area.c + atomic.c + debug.c + driver_settings.c + fs_attr.c + fs_index.c + fs_info.c + fs_query.cpp + fs_volume.c + image.c + parsedate.cpp + port.c + sem.c + system_info.c + team.c + thread.c + time.c + syscalls.S : -fPIC -DPIC ; @@ -27,8 +28,4 @@ KernelMergeObject os_main.o : # We need to specify the dependency on the generated syscalls file explicitly. Depends [ FGristFiles syscalls.o ] : syscalls.S.inc ; -MergeObjectFromObjects kernel_os_main.o : - <$(SOURCE_GRIST)>driver_settings.o - ; - SubInclude OBOS_TOP src kernel libroot os arch ; diff --git a/src/kernel/libroot/os/fs_volume.c b/src/kernel/libroot/os/fs_volume.c new file mode 100644 index 0000000000..b5c85c9af8 --- /dev/null +++ b/src/kernel/libroot/os/fs_volume.c @@ -0,0 +1,32 @@ +/* +** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. +** Distributed under the terms of the Haiku License. +*/ + + +#include +#include + + +status_t +fs_mount_volume(const char *fileSystem, const char *where, + const char *device, uint32 flags, const char *parameters) +{ + return _kern_mount(where, device, fileSystem, flags, (void *)parameters); +} + + +status_t +fs_unmount_volume(const char *path, uint32 flags) +{ + return _kern_unmount(path/*, flags*/); +} + + +status_t +fs_initialize_volume(const char *fileSystem, const char *volumeName, + const char *device, uint32 flags, const char *parameters) +{ + return B_ERROR; +} +