ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DISPATCH_HEADER -> X_DISPATCH_HEADER

This commit is contained in:
Dr. Chat 2015-06-12 18:59:08 -05:00
parent 6d4d1db310
commit 864e257474
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ void XEvent::Initialize(bool manual_reset, bool initial_state) {
native_handle_ = CreateEvent(NULL, manual_reset, initial_state, NULL);
}
void XEvent::InitializeNative(void* native_ptr, DISPATCH_HEADER& header) {
void XEvent::InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header) {
assert_null(native_handle_);
bool manual_reset;

2
src/xenia/kernel/objects/xevent.h
View File

@ -22,7 +22,7 @@ class XEvent : public XObject {
virtual ~XEvent();
void Initialize(bool manual_reset, bool initial_state);
void InitializeNative(void* native_ptr, DISPATCH_HEADER& header);
void InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header);
int32_t Set(uint32_t priority_increment, bool wait);
int32_t Pulse(uint32_t priority_increment, bool wait);

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

@ -27,7 +27,7 @@ void XMutant::Initialize(bool initial_owner) {
native_handle_ = CreateMutex(NULL, initial_owner ? TRUE : FALSE, NULL);
}
void XMutant::InitializeNative(void* native_ptr, DISPATCH_HEADER& header) {
void XMutant::InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header) {
assert_null(native_handle_);
// Haven't seen this yet, but it's possible.

2
src/xenia/kernel/objects/xmutant.h
View File

@ -22,7 +22,7 @@ class XMutant : public XObject {
virtual ~XMutant();
void Initialize(bool initial_owner);
void InitializeNative(void* native_ptr, DISPATCH_HEADER& header);
void InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header);
X_STATUS ReleaseMutant(uint32_t priority_increment, bool abandon, bool wait);

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

@ -27,7 +27,7 @@ void XSemaphore::Initialize(int32_t initial_count, int32_t maximum_count) {
native_handle_ = CreateSemaphore(NULL, initial_count, maximum_count, NULL);
}
void XSemaphore::InitializeNative(void* native_ptr, DISPATCH_HEADER& header) {
void XSemaphore::InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header) {
assert_null(native_handle_);
// NOT IMPLEMENTED

2
src/xenia/kernel/objects/xsemaphore.h
View File

@ -22,7 +22,7 @@ class XSemaphore : public XObject {
virtual ~XSemaphore();
void Initialize(int32_t initial_count, int32_t maximum_count);
void InitializeNative(void* native_ptr, DISPATCH_HEADER& header);
void InitializeNative(void* native_ptr, X_DISPATCH_HEADER& header);
int32_t ReleaseSemaphore(int32_t release_count);

4
src/xenia/kernel/xobject.cc
View File

@ -165,7 +165,7 @@ void XObject::SetNativePointer(uint32_t native_ptr, bool uninitialized) {
std::lock_guard<xe::recursive_mutex> lock(kernel_state_->object_mutex());
auto header =
kernel_state_->memory()->TranslateVirtual<DISPATCH_HEADER*>(native_ptr);
kernel_state_->memory()->TranslateVirtual<X_DISPATCH_HEADER*>(native_ptr);
// Memory uninitialized, so don't bother with the check.
if (!uninitialized) {
@ -195,7 +195,7 @@ object_ref<XObject> XObject::GetNativeObject(KernelState* kernel_state,
std::lock_guard<xe::recursive_mutex> lock(kernel_state->object_mutex());
auto header = reinterpret_cast<DISPATCH_HEADER*>(native_ptr);
auto header = reinterpret_cast<X_DISPATCH_HEADER*>(native_ptr);
if (as_type == -1) {
as_type = (header->type_flags >> 24) & 0xFF;

2
src/xenia/kernel/xobject.h
View File

@ -33,7 +33,7 @@ typedef struct {
xe::be<uint32_t> signal_state;
xe::be<uint32_t> wait_list_flink;
xe::be<uint32_t> wait_list_blink;
} DISPATCH_HEADER;
} X_DISPATCH_HEADER;
class XObject {
public: