libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-30 20:01:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some asserts for activating UMDs.

Browse Source
This commit is contained in:
Unknown W. Brackets 2012-12-01 16:40:13 -08:00
parent 952a937fe7
commit f3e23f2672
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Core/HLE/sceUmd.cpp
View File

@ -20,6 +20,8 @@
#include "sceUmd.h" #include "sceUmd.h"
#include "sceKernelThread.h" #include "sceKernelThread.h"
const int PSP_ERROR_UMD_INVALID_PORT = 0x80010016;
#define UMD_NOT_PRESENT 0x01 #define UMD_NOT_PRESENT 0x01
#define UMD_PRESENT 0x02 #define UMD_PRESENT 0x02
#define UMD_CHANGED 0x04 #define UMD_CHANGED 0x04
@ -76,11 +78,11 @@ void __KernelUmdDeactivate()
//int sceUmdCheckMedium(int a); //int sceUmdCheckMedium(int a);
void sceUmdCheckMedium() int sceUmdCheckMedium()
{ {
DEBUG_LOG(HLE,"1=sceUmdCheckMedium(?)"); DEBUG_LOG(HLE,"1=sceUmdCheckMedium(?)");
//ignore PARAM(0) //ignore PARAM(0)
RETURN(1); //non-zero: disc in drive return 1; //non-zero: disc in drive
} }
void sceUmdGetDiscInfo() void sceUmdGetDiscInfo()
@ -98,9 +100,21 @@ void sceUmdGetDiscInfo()
u32 sceUmdActivate(u32 unknown, const char *name) u32 sceUmdActivate(u32 unknown, const char *name)
{ {
if (unknown < 1 || unknown > 2)
return PSP_ERROR_UMD_INVALID_PORT;
u32 retVal = 0; u32 retVal = 0;
__KernelUmdActivate(); __KernelUmdActivate();
DEBUG_LOG(HLE,"%i=sceUmdActivate(%08x, %s)", retVal, unknown, name);
if (unknown == 1)
{
DEBUG_LOG(HLE, "%i=sceUmdActivate(%d, %s)", retVal, unknown, name);
}
else
{
ERROR_LOG(HLE, "UNTESTED %i=sceUmdActivate(%d, %s)", retVal, unknown, name);
}
u32 notifyArg = UMD_PRESENT | UMD_READABLE; u32 notifyArg = UMD_PRESENT | UMD_READABLE;
__KernelNotifyCallbackType(THREAD_CALLBACK_UMD, -1, notifyArg); __KernelNotifyCallbackType(THREAD_CALLBACK_UMD, -1, notifyArg);
return retVal; return retVal;
@ -108,7 +122,19 @@ u32 sceUmdActivate(u32 unknown, const char *name)
u32 sceUmdDeactivate(u32 unknown, const char *name) u32 sceUmdDeactivate(u32 unknown, const char *name)
{ {
DEBUG_LOG(HLE,"sceUmdDeactivate()"); // Why 18? No idea.
if (unknown < 0 || unknown > 18)
return PSP_ERROR_UMD_INVALID_PORT;
if (unknown == 1)
{
DEBUG_LOG(HLE, "0=sceUmdDeactivate(%d, %s)", unknown, name);
}
else
{
ERROR_LOG(HLE, "UNTESTED 0=sceUmdDeactivate(%d, %s)", unknown, name);
}
u8 triggerCallback = umdActivated; u8 triggerCallback = umdActivated;
__KernelUmdDeactivate(); __KernelUmdDeactivate();
@ -210,7 +236,7 @@ const HLEFunction sceUmdUser[] =
{ {
{0xC6183D47,&WrapU_UC<sceUmdActivate>,"sceUmdActivate"}, {0xC6183D47,&WrapU_UC<sceUmdActivate>,"sceUmdActivate"},
{0x6B4A146C,&WrapU_V<sceUmdGetDriveStat>,"sceUmdGetDriveStat"}, {0x6B4A146C,&WrapU_V<sceUmdGetDriveStat>,"sceUmdGetDriveStat"},
{0x46EBB729,sceUmdCheckMedium,"sceUmdCheckMedium"}, {0x46EBB729,WrapI_V<sceUmdCheckMedium>,"sceUmdCheckMedium"},
{0xE83742BA,&WrapU_UC<sceUmdDeactivate>,"sceUmdDeactivate"}, {0xE83742BA,&WrapU_UC<sceUmdDeactivate>,"sceUmdDeactivate"},
{0x8EF08FCE,sceUmdWaitDriveStat,"sceUmdWaitDriveStat"}, {0x8EF08FCE,sceUmdWaitDriveStat,"sceUmdWaitDriveStat"},
{0x56202973,sceUmdWaitDriveStatWithTimer,"sceUmdWaitDriveStatWithTimer"}, {0x56202973,sceUmdWaitDriveStatWithTimer,"sceUmdWaitDriveStatWithTimer"},