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

- Renamed SHIM_SET_RETURN macro to SHIM_SET_RETURN_64.

Browse Source 
- Added SHIM_SET_RETURN_32 macro, which sign-extends to 64-bit.
- Updated all uses of SHIM_SET_RETURN to the appropriate macro (either SHIM_SET_RETURN_32 or SHIM_SET_RETURN_64).
This commit is contained in:
gibbed
2014-01-19 07:24:16 -08:00
parent 870a59f225
commit 7e22d3be92
18 changed files with 158 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/xenia/kernel/xam_input.cc
View File

@@ -35,7 +35,7 @@ SHIM_CALL XamResetInactivity_shim(
unk);
// Result ignored.
SHIM_SET_RETURN(0);
SHIM_SET_RETURN_64(0);
}
@@ -50,7 +50,7 @@ SHIM_CALL XamEnableInactivityProcessing_shim(
unk);
// Expects 0.
SHIM_SET_RETURN(0);
SHIM_SET_RETURN_64(0);
}
@@ -68,7 +68,7 @@ SHIM_CALL XamInputGetCapabilities_shim(
caps_ptr);
if (!caps_ptr) {
SHIM_SET_RETURN(X_ERROR_BAD_ARGUMENTS);
SHIM_SET_RETURN_32(X_ERROR_BAD_ARGUMENTS);
return;
}
@@ -79,7 +79,7 @@ SHIM_CALL XamInputGetCapabilities_shim(
if (XSUCCEEDED(result)) {
caps.Write(SHIM_MEM_BASE, caps_ptr);
}
SHIM_SET_RETURN(result);
SHIM_SET_RETURN_32(result);
}
@@ -107,7 +107,7 @@ SHIM_CALL XamInputGetState_shim(
input_state.Write(SHIM_MEM_BASE, state_ptr);
}
}
SHIM_SET_RETURN(result);
SHIM_SET_RETURN_32(result);
}
@@ -123,7 +123,7 @@ SHIM_CALL XamInputSetState_shim(
vibration_ptr);
if (!vibration_ptr) {
SHIM_SET_RETURN(X_ERROR_BAD_ARGUMENTS);
SHIM_SET_RETURN_32(X_ERROR_BAD_ARGUMENTS);
return;
}
@@ -131,7 +131,7 @@ SHIM_CALL XamInputSetState_shim(
X_INPUT_VIBRATION vibration(SHIM_MEM_BASE, vibration_ptr);
X_RESULT result = input_system->SetState(user_index, vibration);
SHIM_SET_RETURN(result);
SHIM_SET_RETURN_32(result);
}
@@ -153,7 +153,7 @@ SHIM_CALL XamInputGetKeystroke_shim(
keystroke_ptr);
if (!keystroke_ptr) {
SHIM_SET_RETURN(X_ERROR_BAD_ARGUMENTS);
SHIM_SET_RETURN_32(X_ERROR_BAD_ARGUMENTS);
return;
}
@@ -164,7 +164,7 @@ SHIM_CALL XamInputGetKeystroke_shim(
if (XSUCCEEDED(result)) {
keystroke.Write(SHIM_MEM_BASE, keystroke_ptr);
}
SHIM_SET_RETURN(result);
SHIM_SET_RETURN_32(result);
}
@@ -184,7 +184,7 @@ SHIM_CALL XamInputGetKeystrokeEx_shim(
keystroke_ptr);
if (!keystroke_ptr) {
SHIM_SET_RETURN(X_ERROR_BAD_ARGUMENTS);
SHIM_SET_RETURN_32(X_ERROR_BAD_ARGUMENTS);
return;
}
@@ -196,7 +196,7 @@ SHIM_CALL XamInputGetKeystrokeEx_shim(
SHIM_SET_MEM_32(user_index_ptr, keystroke.user_index);
keystroke.Write(SHIM_MEM_BASE, keystroke_ptr);
}
SHIM_SET_RETURN(result);
SHIM_SET_RETURN_32(result);
}