fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming xe::fs to xe::filesystem and xe::kernel::fs to xe::vfs.

Browse Source 
Progress on #294.
This commit is contained in:
Ben Vanik
2015-06-27 13:31:21 -07:00
parent bc75b0ab87
commit 0716cf84c0
45 changed files with 374 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/objects/xfile.cc
View File

@@ -15,7 +15,7 @@
namespace xe {
namespace kernel {
XFile::XFile(KernelState* kernel_state, fs::Mode mode)
XFile::XFile(KernelState* kernel_state, vfs::Mode mode)
: mode_(mode), position_(0), XObject(kernel_state, kTypeFile) {
async_event_ = new XEvent(kernel_state);
async_event_->Initialize(false, false);

8
src/xenia/kernel/objects/xfile.h
View File

@@ -10,8 +10,8 @@
#ifndef XENIA_KERNEL_XBOXKRNL_XFILE_H_
#define XENIA_KERNEL_XBOXKRNL_XFILE_H_
#include "xenia/kernel/fs/entry.h"
#include "xenia/kernel/xobject.h"
#include "xenia/vfs/entry.h"
#include "xenia/xbox.h"
@@ -139,7 +139,7 @@ class XFile : public XObject {
virtual const std::string& path() const = 0;
virtual const std::string& name() const = 0;
virtual fs::Device* device() const = 0;
virtual vfs::Device* device() const = 0;
size_t position() const { return position_; }
void set_position(size_t value) { position_ = value; }
@@ -160,7 +160,7 @@ class XFile : public XObject {
virtual void* GetWaitHandle();
protected:
XFile(KernelState* kernel_state, fs::Mode mode);
XFile(KernelState* kernel_state, vfs::Mode mode);
virtual X_STATUS ReadSync(void* buffer, size_t buffer_length,
size_t byte_offset, size_t* out_bytes_read) = 0;
virtual X_STATUS WriteSync(const void* buffer, size_t buffer_length,
@@ -169,7 +169,7 @@ class XFile : public XObject {
}
private:
fs::Mode mode_;
vfs::Mode mode_;
XEvent* async_event_;
// TODO(benvanik): create flags, open state, etc.

4
src/xenia/kernel/objects/xuser_module.cc
View File

@@ -51,7 +51,7 @@ X_STATUS XUserModule::LoadFromFile(std::string path) {
// If the FS supports mapping, map the file in and load from that.
if (fs_entry->can_map()) {
// Map.
auto mmap = fs_entry->CreateMemoryMapping(fs::Mode::READ, 0, 0);
auto mmap = fs_entry->CreateMemoryMapping(vfs::Mode::READ, 0, 0);
if (!mmap) {
return result;
}
@@ -70,7 +70,7 @@ X_STATUS XUserModule::LoadFromFile(std::string path) {
// Open file for reading.
XFile* file_ptr = nullptr;
result = kernel_state()->file_system()->Open(
std::move(fs_entry), kernel_state(), fs::Mode::READ, false, &file_ptr);
std::move(fs_entry), kernel_state(), vfs::Mode::READ, false, &file_ptr);
object_ref<XFile> file(file_ptr);
if (result) {
return result;