From beebd394fcf0574d5b38725aca87fadc85ed9ac8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 27 Jun 2016 09:13:09 +0200 Subject: [PATCH] lib/vfs: seperate implemention and API headers Issue #1891 --- .../lib}/vfs/block_file_system.h | 0 repos/os/src/lib/vfs/file_system_factory.cc | 24 +++++++++---------- .../{include => src/lib}/vfs/fs_file_system.h | 0 .../lib}/vfs/inline_file_system.h | 0 .../lib}/vfs/log_file_system.h | 0 .../lib}/vfs/null_file_system.h | 0 .../lib}/vfs/ram_file_system.h | 0 .../lib}/vfs/rom_file_system.h | 0 .../lib}/vfs/rtc_file_system.h | 0 .../lib}/vfs/symlink_file_system.h | 0 .../lib}/vfs/tar_file_system.h | 0 .../lib}/vfs/terminal_file_system.h | 0 .../lib}/vfs/zero_file_system.h | 0 repos/ports/src/noux/main.cc | 7 ------ 14 files changed, 12 insertions(+), 19 deletions(-) rename repos/os/{include => src/lib}/vfs/block_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/fs_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/inline_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/log_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/null_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/ram_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/rom_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/rtc_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/symlink_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/tar_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/terminal_file_system.h (100%) rename repos/os/{include => src/lib}/vfs/zero_file_system.h (100%) diff --git a/repos/os/include/vfs/block_file_system.h b/repos/os/src/lib/vfs/block_file_system.h similarity index 100% rename from repos/os/include/vfs/block_file_system.h rename to repos/os/src/lib/vfs/block_file_system.h diff --git a/repos/os/src/lib/vfs/file_system_factory.cc b/repos/os/src/lib/vfs/file_system_factory.cc index b07e5ec0c2..42319a8274 100644 --- a/repos/os/src/lib/vfs/file_system_factory.cc +++ b/repos/os/src/lib/vfs/file_system_factory.cc @@ -16,18 +16,18 @@ #include /* supported builtin file systems */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "block_file_system.h" +#include "fs_file_system.h" +#include "inline_file_system.h" +#include "log_file_system.h" +#include "null_file_system.h" +#include "ram_file_system.h" +#include "rom_file_system.h" +#include "rtc_file_system.h" +#include "symlink_file_system.h" +#include "tar_file_system.h" +#include "terminal_file_system.h" +#include "zero_file_system.h" class Default_file_system_factory : public Vfs::Global_file_system_factory diff --git a/repos/os/include/vfs/fs_file_system.h b/repos/os/src/lib/vfs/fs_file_system.h similarity index 100% rename from repos/os/include/vfs/fs_file_system.h rename to repos/os/src/lib/vfs/fs_file_system.h diff --git a/repos/os/include/vfs/inline_file_system.h b/repos/os/src/lib/vfs/inline_file_system.h similarity index 100% rename from repos/os/include/vfs/inline_file_system.h rename to repos/os/src/lib/vfs/inline_file_system.h diff --git a/repos/os/include/vfs/log_file_system.h b/repos/os/src/lib/vfs/log_file_system.h similarity index 100% rename from repos/os/include/vfs/log_file_system.h rename to repos/os/src/lib/vfs/log_file_system.h diff --git a/repos/os/include/vfs/null_file_system.h b/repos/os/src/lib/vfs/null_file_system.h similarity index 100% rename from repos/os/include/vfs/null_file_system.h rename to repos/os/src/lib/vfs/null_file_system.h diff --git a/repos/os/include/vfs/ram_file_system.h b/repos/os/src/lib/vfs/ram_file_system.h similarity index 100% rename from repos/os/include/vfs/ram_file_system.h rename to repos/os/src/lib/vfs/ram_file_system.h diff --git a/repos/os/include/vfs/rom_file_system.h b/repos/os/src/lib/vfs/rom_file_system.h similarity index 100% rename from repos/os/include/vfs/rom_file_system.h rename to repos/os/src/lib/vfs/rom_file_system.h diff --git a/repos/os/include/vfs/rtc_file_system.h b/repos/os/src/lib/vfs/rtc_file_system.h similarity index 100% rename from repos/os/include/vfs/rtc_file_system.h rename to repos/os/src/lib/vfs/rtc_file_system.h diff --git a/repos/os/include/vfs/symlink_file_system.h b/repos/os/src/lib/vfs/symlink_file_system.h similarity index 100% rename from repos/os/include/vfs/symlink_file_system.h rename to repos/os/src/lib/vfs/symlink_file_system.h diff --git a/repos/os/include/vfs/tar_file_system.h b/repos/os/src/lib/vfs/tar_file_system.h similarity index 100% rename from repos/os/include/vfs/tar_file_system.h rename to repos/os/src/lib/vfs/tar_file_system.h diff --git a/repos/os/include/vfs/terminal_file_system.h b/repos/os/src/lib/vfs/terminal_file_system.h similarity index 100% rename from repos/os/include/vfs/terminal_file_system.h rename to repos/os/src/lib/vfs/terminal_file_system.h diff --git a/repos/os/include/vfs/zero_file_system.h b/repos/os/src/lib/vfs/zero_file_system.h similarity index 100% rename from repos/os/include/vfs/zero_file_system.h rename to repos/os/src/lib/vfs/zero_file_system.h diff --git a/repos/ports/src/noux/main.cc b/repos/ports/src/noux/main.cc index bddef3e7df..e66319639e 100644 --- a/repos/ports/src/noux/main.cc +++ b/repos/ports/src/noux/main.cc @@ -32,13 +32,6 @@ #include /* supported file systems */ -#include -#include -#include -#include -#include -#include -#include #include #include