joel16/uofw
1
0
Fork 0
mirror of https://github.com/joel16/uofw.git synced 2025-02-21 11:22:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

include/threadman_kernel.h: Removed deprecated SceEventFlagWaitTypes enumeration. Use the #define values of format SCE_KERNEL_EW_* instead.

Browse Source
This commit is contained in:
Felix-Dev 2015-06-04 20:21:26 +02:00
parent 416f987f3d
commit ba8e22e4b4
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/threadman_kernel.h
View File

@ -89,16 +89,6 @@ typedef struct {
#define SCE_KERNEL_EA_SINGLE (0x0000) /** Multiple thread waits are prohibited. */
#define SCE_KERNEL_EA_MULTI (0x0200) /** Multiple thread waits are permitted. */
// NOTE: Deprecated. These types will be replaced by the below wait modes in future revisions.
enum SceEventFlagWaitTypes {
/** Wait for all bits in the pattern to be set */
SCE_EVENT_WAITAND = 0,
/** Wait for one or more bits in the pattern to be set */
SCE_EVENT_WAITOR = 1,
/** Clear the wait pattern when it matches */
SCE_EVENT_WAITCLEAR = 0x20
};
/* Event flag wait modes. */
#define SCE_KERNEL_EW_AND (0x00) /** Wait for all bits in the bit pattern to be set. */
#define SCE_KERNEL_EW_OR (0x01) /** Wait for one or more bits in the bit pattern to be set. */

6
src/me_wrapper/me_wrapper.c
View File

@ -135,7 +135,7 @@ int sub_0x1000020(){
meTable[9] = 0;
sceDdrFlush(5);
sceSysregInterruptToOther();
sceKernelWaitEventFlag(meRpc.event, 1, SCE_EVENT_WAITCLEAR, 0, 0);
sceKernelWaitEventFlag(meRpc.event, 1, SCE_KERNEL_EW_CLEAR_PAT, 0, 0);
sceKernelUnlockMutex(meRpc.mutex, 1);
return 0;
}
@ -166,7 +166,7 @@ int sub_0x1000002(int arg)
meTable[9] = 0;
sceDdrFlush(5);
sceSysregInterruptToOther();
sceKernelWaitEventFlag(meRpc.event, 1, SCE_EVENT_WAITCLEAR, 0, 0);
sceKernelWaitEventFlag(meRpc.event, 1, SCE_KERNEL_EW_CLEAR_PAT, 0, 0);
return 0;
}
@ -1203,7 +1203,7 @@ int sceMeCore_driver_FA398D71(int cmd, ...)
va_end(ap);
sceDdrFlush(5);
sceSysregInterruptToOther();
sceKernelWaitEventFlag(meRpc.event, 1, SCE_EVENT_WAITCLEAR, 0, 0);
sceKernelWaitEventFlag(meRpc.event, 1, SCE_KERNEL_EW_CLEAR_PAT, 0, 0);
ret = meTable[10];
sceKernelUnlockMutex(meRpc.mutex, 1);
return ret;

6
src/mediaman/mediaman.c
View File

@ -660,7 +660,7 @@ s32 sceUmdWaitDriveStat(s32 umdState)
if (!(umdState & UMD_SUPPORTED_WAIT_DRIVE_STATES))
return SCE_ERROR_ERRNO_INVALID_ARGUMENT;
status = sceKernelWaitEventFlag(eventId, umdState, SCE_EVENT_WAITOR, &resultBits, NULL);
status = sceKernelWaitEventFlag(eventId, umdState, SCE_KERNEL_EW_OR, &resultBits, NULL);
pspSetK1(oldK1);
return status;
@ -686,7 +686,7 @@ s32 sceUmdWaitDriveStatWithTimer(u32 umdState, u32 timeout)
else
pTimeout = NULL;
status = sceKernelWaitEventFlag(eventId, umdState, SCE_EVENT_WAITOR, &resultBits, pTimeout);
status = sceKernelWaitEventFlag(eventId, umdState, SCE_KERNEL_EW_OR, &resultBits, pTimeout);
pspSetK1(oldK1);
return status;
@ -712,7 +712,7 @@ s32 sceUmdWaitDriveStatCB(u32 umdState, u32 timeout)
else
pTimeout = NULL;
status = sceKernelWaitEventFlagCB(eventId, umdState, SCE_EVENT_WAITOR, &outBits, pTimeout);
status = sceKernelWaitEventFlagCB(eventId, umdState, SCE_KERNEL_EW_OR, &outBits, pTimeout);
pspSetK1(oldK1);
return status;
}