Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-01-31 10:32:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Just a few small things

Browse Source
This commit is contained in:
Henrik Rydgard 2012-11-07 20:59:56 +01:00
parent 3681aab3ed
commit caacaf6744
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/FileSystems/DirectoryFileSystem.cpp
View File

@ -32,6 +32,9 @@ DirectoryFileSystem::DirectoryFileSystem(IHandleAllocator *_hAlloc, std::string
std::string DirectoryFileSystem::GetLocalPath(std::string localpath)
{
if (localpath.empty())
return basePath;
if (localpath[0] == '/')
localpath.erase(0,1);
//Convert slashes

1
Core/HLE/sceKernelModule.cpp
View File

@ -47,6 +47,7 @@ enum {
static const char *blacklistedModules[] = {
"sceATRAC3plus_Library",
"sceFont_Library",
"SceFont_Library",
"sceNetAdhocctl_Library",
"sceNetAdhocDownload_Library",
"sceNetAdhocMatching_Library",

2
Core/HLE/sceKernelTime.cpp
View File

@ -54,7 +54,7 @@ void sceKernelGetSystemTimeLow()
{
// This clock should tick at 1 Mhz.
u64 t = CoreTiming::GetTicks() / CoreTiming::GetClockFrequencyMHz();
DEBUG_LOG(HLE,"%08x=sceKernelGetSystemTimeLow()",(u32)t);
// DEBUG_LOG(HLE,"%08x=sceKernelGetSystemTimeLow()",(u32)t);
RETURN((u32)t);
}

15
Core/HLE/sceUmd.cpp
View File

@ -29,17 +29,16 @@
u8 umdActivated = 1;
u32 umdStatus = 0;
u32 umdErrorStat = 0;
void __UmdInit() {
umdActivated = 1;
umdStatus = 0;
umdErrorStat = 0;
}
u8 __KernelUmdGetState()
{
u8 state = UMD_PRESENT;
@ -93,7 +92,7 @@ void sceUmdActivate()
void sceUmdDeactivate()
{
ERROR_LOG(HLE,"sceUmdDeactivate()");
DEBUG_LOG(HLE,"sceUmdDeactivate()");
bool triggerCallback = umdActivated;
__KernelUmdDeactivate();
@ -163,6 +162,12 @@ void sceUmdCancelWaitDriveStat()
RETURN(0);
}
void sceUmdGetErrorStat()
{
DEBUG_LOG(HLE,"%i=sceUmdGetErrorStat()", umdErrorStat);
RETURN(umdErrorStat);
}
const HLEFunction sceUmdUser[] =
{
@ -175,7 +180,7 @@ const HLEFunction sceUmdUser[] =
{0x4A9E5E29,sceUmdWaitDriveStatCB,"sceUmdWaitDriveStatCB"},
{0x6af9b50a,sceUmdCancelWaitDriveStat,"sceUmdCancelWaitDriveStat"},
{0x6B4A146C,sceUmdGetDriveStat,"sceUmdGetDriveStat"},
{0x20628E6F,0,"sceUmdGetErrorStat"},
{0x20628E6F,sceUmdGetErrorStat,"sceUmdGetErrorStat"},
{0x340B7686,sceUmdGetDiscInfo,"sceUmdGetDiscInfo"},
{0xAEE7404D,&WrapU_U<sceUmdRegisterUMDCallBack>,"sceUmdRegisterUMDCallBack"},
{0xBD2BDE07,&WrapU_U<sceUmdUnRegisterUMDCallBack>,"sceUmdUnRegisterUMDCallBack"},