namespace sts -> namespace ams
namespace sts::ams -> ams::exosphere, ams::. This is to facilitate future use of ams:: namespace code in mesosphere, as we'll want to include ams::util, ams::result, ams::svc...
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
#include <stratosphere.hpp>
|
||||
#include "os_inter_process_event.hpp"
|
||||
|
||||
namespace sts::os::impl {
|
||||
namespace ams::os::impl {
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace sts::os::impl {
|
||||
}
|
||||
|
||||
Result InterProcessEvent::Initialize(bool autoclear) {
|
||||
STS_ASSERT(!this->is_initialized);
|
||||
AMS_ASSERT(!this->is_initialized);
|
||||
Handle rh, wh;
|
||||
R_TRY(CreateEventHandles(&rh, &wh));
|
||||
this->Initialize(rh, true, wh, true, autoclear);
|
||||
@@ -48,8 +48,8 @@ namespace sts::os::impl {
|
||||
}
|
||||
|
||||
void InterProcessEvent::Initialize(Handle read_handle, bool manage_read_handle, Handle write_handle, bool manage_write_handle, bool autoclear) {
|
||||
STS_ASSERT(!this->is_initialized);
|
||||
STS_ASSERT(read_handle != INVALID_HANDLE || write_handle != INVALID_HANDLE);
|
||||
AMS_ASSERT(!this->is_initialized);
|
||||
AMS_ASSERT(read_handle != INVALID_HANDLE || write_handle != INVALID_HANDLE);
|
||||
this->read_handle = read_handle;
|
||||
this->manage_read_handle = manage_read_handle;
|
||||
this->write_handle = write_handle;
|
||||
@@ -59,30 +59,30 @@ namespace sts::os::impl {
|
||||
}
|
||||
|
||||
Handle InterProcessEvent::DetachReadableHandle() {
|
||||
STS_ASSERT(this->is_initialized);
|
||||
AMS_ASSERT(this->is_initialized);
|
||||
const Handle handle = this->read_handle;
|
||||
STS_ASSERT(handle != INVALID_HANDLE);
|
||||
AMS_ASSERT(handle != INVALID_HANDLE);
|
||||
this->read_handle = INVALID_HANDLE;
|
||||
this->manage_read_handle = false;
|
||||
return handle;
|
||||
}
|
||||
|
||||
Handle InterProcessEvent::DetachWritableHandle() {
|
||||
STS_ASSERT(this->is_initialized);
|
||||
AMS_ASSERT(this->is_initialized);
|
||||
const Handle handle = this->write_handle;
|
||||
STS_ASSERT(handle != INVALID_HANDLE);
|
||||
AMS_ASSERT(handle != INVALID_HANDLE);
|
||||
this->write_handle = INVALID_HANDLE;
|
||||
this->manage_write_handle = false;
|
||||
return handle;
|
||||
}
|
||||
|
||||
Handle InterProcessEvent::GetReadableHandle() const {
|
||||
STS_ASSERT(this->is_initialized);
|
||||
AMS_ASSERT(this->is_initialized);
|
||||
return this->read_handle;
|
||||
}
|
||||
|
||||
Handle InterProcessEvent::GetWritableHandle() const {
|
||||
STS_ASSERT(this->is_initialized);
|
||||
AMS_ASSERT(this->is_initialized);
|
||||
return this->write_handle;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user