Screw convention; moving include files alongside source files.

They now will show up in xcode/etc.

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

@@ -0,0 +1,157 @@
+/**
+ ******************************************************************************
+ * 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/fs/devices/disc_image_device.h>
+
+#include <xenia/kernel/fs/gdfx.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+using namespace xe::kernel::fs;
+
+
+namespace {
+
+
+class DiscImageMemoryMapping : public MemoryMapping {
+public:
+  DiscImageMemoryMapping(uint8_t* address, size_t length, xe_mmap_ref mmap) :
+      MemoryMapping(address, length) {
+    mmap_ = xe_mmap_retain(mmap);
+  }
+
+  virtual ~DiscImageMemoryMapping() {
+    xe_mmap_release(mmap_);
+  }
+
+private:
+  xe_mmap_ref mmap_;
+};
+
+
+class DiscImageFileEntry : public FileEntry {
+public:
+  DiscImageFileEntry(Device* device, const char* path,
+                     xe_mmap_ref mmap, GDFXEntry* gdfx_entry) :
+      FileEntry(device, path),
+      gdfx_entry_(gdfx_entry) {
+    mmap_ = xe_mmap_retain(mmap);
+  }
+
+  virtual ~DiscImageFileEntry() {
+    xe_mmap_release(mmap_);
+  }
+
+  virtual MemoryMapping* CreateMemoryMapping(
+      xe_file_mode file_mode, const size_t offset, const size_t length) {
+    if (file_mode & kXEFileModeWrite) {
+      // Only allow reads.
+      return NULL;
+    }
+
+    size_t real_offset = gdfx_entry_->offset + offset;
+    size_t real_length = length ?
+        MIN(length, gdfx_entry_->size) : gdfx_entry_->size;
+    return new DiscImageMemoryMapping(
+        xe_mmap_get_addr(mmap_) + real_offset,
+        real_length,
+        mmap_);
+  }
+
+private:
+  xe_mmap_ref mmap_;
+  GDFXEntry*  gdfx_entry_;
+};
+
+
+}
+
+
+DiscImageDevice::DiscImageDevice(xe_pal_ref pal, const char* path,
+                                 const xechar_t* local_path) :
+    Device(pal, path) {
+  local_path_ = xestrdup(local_path);
+  mmap_ = NULL;
+  gdfx_ = NULL;
+}
+
+DiscImageDevice::~DiscImageDevice() {
+  delete gdfx_;
+  xe_mmap_release(mmap_);
+  xe_free(local_path_);
+}
+
+int DiscImageDevice::Init() {
+  mmap_ = xe_mmap_open(pal_, kXEFileModeRead, local_path_, 0, 0);
+  if (!mmap_) {
+    XELOGE(XT("Disc image could not be mapped"));
+    return 1;
+  }
+
+  gdfx_ = new GDFX(mmap_);
+  GDFX::Error error = gdfx_->Load();
+  if (error != GDFX::kSuccess) {
+    XELOGE(XT("GDFX init failed: %d"), error);
+    return 1;
+  }
+
+  //gdfx_->Dump();
+
+  return 0;
+}
+
+Entry* DiscImageDevice::ResolvePath(const char* path) {
+  // The filesystem will have stripped our prefix off already, so the path will
+  // be in the form:
+  // some\PATH.foo
+
+  XELOGFS(XT("DiscImageDevice::ResolvePath(%s)"), path);
+
+  GDFXEntry* gdfx_entry = gdfx_->root_entry();
+
+  // Walk the path, one separator at a time.
+  // We copy it into the buffer and shift it left over and over.
+  char remaining[XE_MAX_PATH];
+  XEIGNORE(xestrcpya(remaining, XECOUNT(remaining), path));
+  while (remaining[0]) {
+    char* next_slash = xestrchra(remaining, '\\');
+    if (next_slash == remaining) {
+      // Leading slash - shift
+      XEIGNORE(xestrcpya(remaining, XECOUNT(remaining), remaining + 1));
+      continue;
+    }
+
+    // Make the buffer just the name.
+    if (next_slash) {
+      *next_slash = 0;
+    }
+
+    // Look up in the entry.
+    gdfx_entry = gdfx_entry->GetChild(remaining);
+    if (!gdfx_entry) {
+      // Not found.
+      return NULL;
+    }
+
+    // Shift the buffer down, unless we are at the end.
+    if (!next_slash) {
+      break;
+    }
+    XEIGNORE(xestrcpya(remaining, XECOUNT(remaining), next_slash + 1));
+  }
+
+  if (gdfx_entry->attributes & GDFXEntry::kAttrFolder) {
+    //return new DiscImageDirectoryEntry(mmap_, gdfx_entry);
+    XEASSERTALWAYS();
+    return NULL;
+  } else {
+    return new DiscImageFileEntry(this, path, mmap_, gdfx_entry);
+  }
+}

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

@@ -0,0 +1,48 @@
+/**
+ ******************************************************************************
+ * 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. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+#define XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_
+
+#include <xenia/common.h>
+#include <xenia/core.h>
+
+#include <xenia/kernel/fs/device.h>
+
+
+namespace xe {
+namespace kernel {
+namespace fs {
+
+
+class GDFX;
+
+
+class DiscImageDevice : public Device {
+public:
+  DiscImageDevice(xe_pal_ref pal, const char* path, const xechar_t* local_path);
+  virtual ~DiscImageDevice();
+
+  int Init();
+
+  virtual Entry* ResolvePath(const char* path);
+
+private:
+  xechar_t*   local_path_;
+  xe_mmap_ref mmap_;
+  GDFX*       gdfx_;
+};
+
+
+}  // namespace fs
+}  // namespace kernel
+}  // namespace xe
+
+
+#endif  // XENIA_KERNEL_FS_DEVICES_DISC_IMAGE_DEVICE_H_

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

@@ -0,0 +1,112 @@
+/**
+ ******************************************************************************
+ * 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/fs/devices/local_directory_device.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+using namespace xe::kernel::fs;
+
+
+namespace {
+
+
+class LocalFileMemoryMapping : public MemoryMapping {
+public:
+  LocalFileMemoryMapping(uint8_t* address, size_t length, xe_mmap_ref mmap) :
+      MemoryMapping(address, length) {
+    mmap_ = xe_mmap_retain(mmap);
+  }
+  virtual ~LocalFileMemoryMapping() {
+    xe_mmap_release(mmap_);
+  }
+private:
+  xe_mmap_ref mmap_;
+};
+
+
+class LocalFileEntry : public FileEntry {
+public:
+  LocalFileEntry(Device* device, const char* path, const xechar_t* local_path) :
+      FileEntry(device, path) {
+    local_path_ = xestrdup(local_path);
+  }
+  virtual ~LocalFileEntry() {
+    xe_free(local_path_);
+  }
+
+  const xechar_t* local_path() { return local_path_; }
+
+  virtual MemoryMapping* CreateMemoryMapping(
+      xe_file_mode file_mode, const size_t offset, const size_t length) {
+    xe_pal_ref pal = device()->pal();
+    xe_mmap_ref mmap = xe_mmap_open(pal, file_mode, local_path_,
+                                    offset, length);
+    xe_pal_release(pal);
+    if (!mmap) {
+      return NULL;
+    }
+
+    LocalFileMemoryMapping* lfmm = new LocalFileMemoryMapping(
+        (uint8_t*)xe_mmap_get_addr(mmap), xe_mmap_get_length(mmap),
+        mmap);
+    xe_mmap_release(mmap);
+
+    return lfmm;
+  }
+
+private:
+  xechar_t*   local_path_;
+};
+
+
+}
+
+
+LocalDirectoryDevice::LocalDirectoryDevice(xe_pal_ref pal, const char* path,
+                                           const xechar_t* local_path) :
+    Device(pal, path) {
+  local_path_ = xestrdup(local_path);
+}
+
+LocalDirectoryDevice::~LocalDirectoryDevice() {
+  xe_free(local_path_);
+}
+
+Entry* LocalDirectoryDevice::ResolvePath(const char* path) {
+  // The filesystem will have stripped our prefix off already, so the path will
+  // be in the form:
+  // some\PATH.foo
+
+  XELOGFS(XT("LocalDirectoryDevice::ResolvePath(%s)"), path);
+
+  xechar_t full_path[XE_MAX_PATH];
+  xesnprintf(full_path, XECOUNT(full_path), XT("%s%c%s"),
+             local_path_, XE_PATH_SEPARATOR, path);
+
+  // Swap around path separators.
+  if (XE_PATH_SEPARATOR != '\\') {
+    for (size_t n = 0; n < XECOUNT(full_path); n++) {
+      if (full_path[n] == 0) {
+        break;
+      }
+      if (full_path[n] == '\\') {
+        full_path[n] = XE_PATH_SEPARATOR;
+      }
+    }
+  }
+
+  // TODO(benvanik): get file info
+  // TODO(benvanik): fail if does not exit
+  // TODO(benvanik): switch based on type
+
+  LocalFileEntry* file_entry = new LocalFileEntry(this, path, full_path);
+  return file_entry;
+}

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

@@ -0,0 +1,42 @@
+/**
+ ******************************************************************************
+ * 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. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+#define XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_
+
+#include <xenia/common.h>
+#include <xenia/core.h>
+
+#include <xenia/kernel/fs/device.h>
+
+
+namespace xe {
+namespace kernel {
+namespace fs {
+
+
+class LocalDirectoryDevice : public Device {
+public:
+  LocalDirectoryDevice(xe_pal_ref pal, const char* path,
+                       const xechar_t* local_path);
+  virtual ~LocalDirectoryDevice();
+
+  virtual Entry* ResolvePath(const char* path);
+
+private:
+  xechar_t*   local_path_;
+};
+
+
+}  // namespace fs
+}  // namespace kernel
+}  // namespace xe
+
+
+#endif  // XENIA_KERNEL_FS_DEVICES_LOCAL_DIRECTORY_DEVICE_H_

src/xenia/kernel/fs/devices/sources.gypi

@@ -0,0 +1,9 @@
+# Copyright 2013 Ben Vanik. All Rights Reserved.
+{
+  'sources': [
+    'disc_image_device.cc',
+    'disc_image_device.h',
+    'local_directory_device.cc',
+    'local_directory_device.h',
+  ],
+}