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

remove PSF parts from octoshock and tidy EXE loading apis

This commit is contained in:
zeromus 2015-07-20 23:09:27 -05:00
parent d915e2ed1f
commit 91e92725e0
3 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
output/dll/octoshock.dll
View File

Binary file not shown.

61
psx/octoshock/psx/psx.cpp
View File

@ -146,25 +146,6 @@ uint32 PSX_GetRandU32(uint32 mina, uint32 maxa)
return PSX_PRNG.RandU32(mina, maxa);
}
#ifdef WANT_PSF
class PSF1Loader : public PSFLoader
{
public:
PSF1Loader(MDFNFILE *fp);
virtual ~PSF1Loader();
virtual void HandleEXE(const uint8 *data, uint32 len, bool ignore_pcsp = false);
PSFTags tags;
};
#else
class PSF1Loader {};
#endif
static PSF1Loader *psf_loader = NULL;
static std::vector<CDIF*> *cdifs = NULL;
static std::vector<const char *> cdifs_scex_ids;
@ -1404,7 +1385,7 @@ EW_EXPORT s32 shock_Step(void* psx, eShockStep step)
SPU->StartFrame(espec.SoundRate, ResampleQuality);
Running = -1;
timestamp = CPU->Run(timestamp, psf_loader == NULL && psx_dbg_level >= PSX_DBG_BIOS_PRINT, psf_loader != NULL);
timestamp = CPU->Run(timestamp, psx_dbg_level >= PSX_DBG_BIOS_PRINT, /*psf_loader != NULL*/ false); //huh?
assert(timestamp);
ForceEventUpdates(timestamp);
@ -1818,42 +1799,16 @@ static void LoadEXE(const uint8 *data, const uint32 size, bool ignore_pcsp = fal
po += 4;
}
EW_EXPORT s32 shock_MountEXE(void* psx, void* exebuf, s32 size)
EW_EXPORT s32 shock_MountEXE(void* psx, void* exebuf, s32 size, s32 ignore_pcsp)
{
LoadEXE((uint8*)exebuf, (uint32)size);
LoadEXE((uint8*)exebuf, (uint32)size, !!ignore_pcsp);
return SHOCK_OK;
}
#ifdef WANT_PSF
PSF1Loader::PSF1Loader(MDFNFILE *fp)
{
tags = Load(0x01, 2033664, fp);
}
PSF1Loader::~PSF1Loader()
{
}
void PSF1Loader::HandleEXE(const uint8 *data, uint32 size, bool ignore_pcsp)
{
LoadEXE(data, size, ignore_pcsp);
}
#endif
static void Cleanup(void)
{
TextMem.resize(0);
if(psf_loader)
{
delete psf_loader;
psf_loader = NULL;
}
if(CDC)
{
delete CDC;
@ -1903,16 +1858,6 @@ static void Cleanup(void)
static void CloseGame(void)
{
if(!psf_loader)
{
for(int i = 0; i < 8; i++)
{
//DAW
//FIO->SaveMemcard(i, MDFN_MakeFName(MDFNMKF_SAV, 0, ext).c_str());
}
}
Cleanup();
}

2
psx/octoshock/psx/psx.h
View File

@ -339,7 +339,7 @@ EW_EXPORT s32 shock_Peripheral_MemcardTransact(void* psx, s32 address, ShockMemc
EW_EXPORT s32 shock_Peripheral_PollActive(void* psx, s32 address, s32 clear);
//Mounts a PS-EXE executable
EW_EXPORT s32 shock_MountEXE(void* psx, void* exebuf, s32 size);
EW_EXPORT s32 shock_MountEXE(void* psx, void* exebuf, s32 size, s32 ignore_pcsp);
//Sets the power to ON. Returns SHOCK_NOCANDO if already on.
EW_EXPORT s32 shock_PowerOn(void* psx);