Shuffling filesystem to xboxkrnl.

This doesn't really change anything yet, just moves things.
Also fixed some bad over-including.

src/xenia/kernel/kernel_module.cc

@@ -0,0 +1,29 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/kernel/kernel_module.h>
+
+#include <xenia/kernel/export.h>
+#include <xenia/kernel/runtime.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+
+
+KernelModule::KernelModule(Runtime* runtime) {
+  runtime_  = runtime;
+  memory_   = runtime->memory();
+  export_resolver_ = runtime->export_resolver();
+}
+
+KernelModule::~KernelModule() {
+  export_resolver_.reset();
+  xe_memory_release(memory_);
+}

src/xenia/kernel/kernel_module.h

@@ -13,29 +13,19 @@
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/export.h>
-#include <xenia/kernel/runtime.h>
-
 
 namespace xe {
 namespace kernel {
 
 
+class ExportResolver;
 class Runtime;
 
 
 class KernelModule {
 public:
-  KernelModule(Runtime* runtime) {
+  KernelModule(Runtime* runtime);
-    runtime_  = runtime;
+  virtual ~KernelModule();
-    memory_   = runtime->memory();
-    export_resolver_ = runtime->export_resolver();
-  }
-
-  virtual ~KernelModule() {
-    export_resolver_.reset();
-    xe_memory_release(memory_);
-  }
 
 protected:
   Runtime*        runtime_;

src/xenia/kernel/modules/xam/xam_info.cc

@@ -10,6 +10,7 @@
 #include <xenia/kernel/modules/xam/xam_info.h>
 
 #include <xenia/kernel/shim_utils.h>
+#include <xenia/kernel/xex2.h>
 #include <xenia/kernel/modules/xam/xam_private.h>
 #include <xenia/kernel/modules/xam/xam_state.h>
 

src/xenia/kernel/modules/xboxkrnl/async_request.h

@@ -21,6 +21,7 @@ namespace kernel {
 namespace xboxkrnl {
 
 class XEvent;
+class XObject;
 
 
 class XAsyncRequest {

src/xenia/kernel/modules/xboxkrnl/fs/device.cc

@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/device.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 Device::Device(const char* path) {

src/xenia/kernel/modules/xboxkrnl/fs/device.h

@@ -7,17 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_DEVICE_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICE_H_
-#define XENIA_KERNEL_FS_DEVICE_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICE_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -36,8 +37,9 @@ protected:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_DEVICE_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICE_H_

src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.cc

@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/devices/disc_image_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h>
 
-#include <xenia/kernel/fs/gdfx.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/gdfx.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace {

src/xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h

@@ -7,17 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
-#define XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/fs/device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/device.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -41,8 +42,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_DISC_IMAGE_DEVICE_H_

src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.cc

@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/devices/local_directory_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace {

src/xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h

@@ -7,17 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
-#define XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
-#include <xenia/kernel/fs/device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/device.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -34,8 +35,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_

src/xenia/kernel/modules/xboxkrnl/fs/entry.cc

@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 Entry::Entry(Type type, Device* device, const char* path) :

src/xenia/kernel/modules/xboxkrnl/fs/entry.h

@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_ENTRY_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_ENTRY_H_
-#define XENIA_KERNEL_FS_ENTRY_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_ENTRY_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
@@ -16,6 +16,7 @@
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -81,8 +82,9 @@ public:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_ENTRY_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_ENTRY_H_

src/xenia/kernel/modules/xboxkrnl/fs/filesystem.cc

@@ -7,15 +7,15 @@
  ******************************************************************************
  */
 
-#include <xenia/kernel/fs/filesystem.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/filesystem.h>
 
-#include <xenia/kernel/fs/devices/disc_image_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/disc_image_device.h>
-#include <xenia/kernel/fs/devices/local_directory_device.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/devices/local_directory_device.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 FileSystem::FileSystem() {

src/xenia/kernel/modules/xboxkrnl/fs/filesystem.h

@@ -7,19 +7,20 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_FILESYSTEM_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_FILESYSTEM_H_
-#define XENIA_KERNEL_FS_FILESYSTEM_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_FILESYSTEM_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
 #include <vector>
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -48,8 +49,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_FILESYSTEM_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_FILESYSTEM_H_

src/xenia/kernel/modules/xboxkrnl/fs/gdfx.cc

@@ -9,12 +9,12 @@
  * - abgx360
  */
 
-#include <xenia/kernel/fs/gdfx.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/gdfx.h>
 
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace {

src/xenia/kernel/modules/xboxkrnl/fs/gdfx.h

@@ -7,19 +7,20 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_FS_GDFX_H_
+#ifndef XENIA_KERNEL_MODULES_XBOXKRNL_FS_GDFX_H_
-#define XENIA_KERNEL_FS_GDFX_H_
+#define XENIA_KERNEL_MODULES_XBOXKRNL_FS_GDFX_H_
 
 #include <xenia/common.h>
 #include <xenia/core.h>
 
 #include <vector>
 
-#include <xenia/kernel/fs/entry.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {
 namespace kernel {
+namespace xboxkrnl {
 namespace fs {
 
 
@@ -98,8 +99,9 @@ private:
 
 
 }  // namespace fs
+}  // namespace xboxkrnl
 }  // namespace kernel
 }  // namespace xe
 
 
-#endif  // XENIA_KERNEL_FS_GDFX_H_
+#endif  // XENIA_KERNEL_MODULES_XBOXKRNL_FS_GDFX_H_

src/xenia/kernel/modules/xboxkrnl/kernel_state.cc

@@ -9,6 +9,7 @@
 
 #include <xenia/kernel/modules/xboxkrnl/kernel_state.h>
 
+#include <xenia/kernel/runtime.h>
 #include <xenia/kernel/modules/xboxkrnl/xobject.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xmodule.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xthread.h>

src/xenia/kernel/modules/xboxkrnl/kernel_state.h

@@ -16,16 +16,25 @@
 #include <xenia/kernel/export.h>
 #include <xenia/kernel/kernel_module.h>
 #include <xenia/kernel/xbox.h>
-#include <xenia/kernel/fs/filesystem.h>
 #include <xenia/kernel/modules/xboxkrnl/object_table.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/filesystem.h>
+
+
+namespace xe {
+namespace cpu {
+class Processor;
+}
+}
 
 
 namespace xe {
 namespace kernel {
 namespace xboxkrnl {
 
-
 class XModule;
+namespace fs {
+class FileSystem;
+}
 
 
 class KernelState {

src/xenia/kernel/modules/xboxkrnl/objects/xfile.cc

@@ -14,8 +14,8 @@
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
 using namespace xe::kernel::xboxkrnl;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 XFile::XFile(KernelState* kernel_state, FileEntry* entry) :

src/xenia/kernel/modules/xboxkrnl/objects/xfile.h

@@ -13,8 +13,8 @@
 #include <xenia/kernel/modules/xboxkrnl/xobject.h>
 
 #include <xenia/kernel/xbox.h>
-#include <xenia/kernel/fs/entry.h>
 #include <xenia/kernel/modules/xboxkrnl/async_request.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/entry.h>
 
 
 namespace xe {

src/xenia/kernel/modules/xboxkrnl/objects/xmodule.cc

@@ -9,6 +9,8 @@
 
 #include <xenia/kernel/modules/xboxkrnl/objects/xmodule.h>
 
+#include <xenia/cpu/cpu.h>
+#include <xenia/kernel/runtime.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xthread.h>
 
 

src/xenia/kernel/modules/xboxkrnl/objects/xthread.cc

@@ -9,6 +9,7 @@
 
 #include <xenia/kernel/modules/xboxkrnl/objects/xthread.h>
 
+#include <xenia/cpu/cpu.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xevent.h>
 #include <xenia/kernel/modules/xboxkrnl/objects/xmodule.h>
 

src/xenia/kernel/modules/xboxkrnl/objects/xthread.h

@@ -15,6 +15,13 @@
 #include <xenia/kernel/xbox.h>
 
 
+namespace xe {
+namespace cpu {
+class ThreadState;
+}
+}
+
+
 namespace xe {
 namespace kernel {
 namespace xboxkrnl {

src/xenia/kernel/modules/xboxkrnl/sources.gypi

@@ -37,6 +37,7 @@
   ],
 
   'includes': [
+    'fs/sources.gypi',
     'objects/sources.gypi',
   ],
 }

src/xenia/kernel/modules/xboxkrnl/xboxkrnl_io.cc

@@ -17,8 +17,8 @@
 
 using namespace xe;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
 using namespace xe::kernel::xboxkrnl;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 namespace xe {

src/xenia/kernel/modules/xboxkrnl/xboxkrnl_video.cc

@@ -9,6 +9,7 @@
 
 #include <xenia/kernel/modules/xboxkrnl/xboxkrnl_video.h>
 
+#include <xenia/cpu/cpu.h>
 #include <xenia/gpu/gpu.h>
 #include <xenia/kernel/shim_utils.h>
 #include <xenia/kernel/modules/xboxkrnl/kernel_state.h>

src/xenia/kernel/runtime.cc

@@ -10,12 +10,13 @@
 #include <xenia/kernel/runtime.h>
 
 #include <xenia/kernel/modules/modules.h>
+#include <xenia/kernel/modules/xboxkrnl/fs/filesystem.h>
 
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::kernel;
-using namespace xe::kernel::fs;
+using namespace xe::kernel::xboxkrnl::fs;
 
 
 Runtime::Runtime(shared_ptr<cpu::Processor> processor,

src/xenia/kernel/runtime.h

@@ -16,7 +16,6 @@
 
 #include <xenia/kernel/export.h>
 #include <xenia/kernel/xex2.h>
-#include <xenia/kernel/fs/filesystem.h>
 
 
 namespace xe {
@@ -26,6 +25,9 @@ namespace cpu {
 namespace kernel {
 namespace xboxkrnl {
   class XboxkrnlModule;
+namespace fs {
+  class FileSystem;
+}
 }
 namespace xam {
   class XamModule;
@@ -50,7 +52,7 @@ public:
   xe_memory_ref memory();
   shared_ptr<cpu::Processor> processor();
   shared_ptr<ExportResolver> export_resolver();
-  shared_ptr<fs::FileSystem> filesystem();
+  shared_ptr<xboxkrnl::fs::FileSystem> filesystem();
 
   int LaunchXexFile(const xechar_t* path);
   int LaunchDiscImage(const xechar_t* path);
@@ -61,7 +63,7 @@ private:
   xe_memory_ref   memory_;
   shared_ptr<cpu::Processor> processor_;
   shared_ptr<ExportResolver> export_resolver_;
-  shared_ptr<fs::FileSystem> filesystem_;
+  shared_ptr<xboxkrnl::fs::FileSystem> filesystem_;
 
   auto_ptr<xboxkrnl::XboxkrnlModule> xboxkrnl_;
   auto_ptr<xam::XamModule> xam_;

src/xenia/kernel/sources.gypi

@@ -4,6 +4,7 @@
     'export.cc',
     'export.h',
     'kernel.h',
+    'kernel_module.cc',
     'kernel_module.h',
     'runtime.cc',
     'runtime.h',
@@ -15,7 +16,6 @@
   ],
 
   'includes': [
-    'fs/sources.gypi',
     'modules/sources.gypi',
     'util/sources.gypi',
   ],