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

start log of changes from upstream, with commentary. upgrade to mednafen 0.9.36.5

This commit is contained in:
zeromus 2014-12-10 19:51:58 +00:00
parent 5f6bb8d8fd
commit 5c53bc3924
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
psx/octoshock/docs/upstreaminfo.txt Normal file
View File

@ -0,0 +1,5 @@
0.9.36.2 (approx) -> 0.9.36.5
[NO] cdrom/CDAccess.* : added support for SBI files
[OK] psx/CDC : removed stub for Command_Sync (WHY?)
[OK] psx/psx.cpp : fixed bug (SPU-related: clarified read order by turning into two statements)
[NO] psx/psx.cpp : StateAction bugfix

8
psx/octoshock/psx/cdc.cpp
View File

@ -1528,12 +1528,6 @@ bool PS_CDC::CommandCheckDiscPresent(void)
return(true);
}
int32 PS_CDC::Command_Sync(const int arg_count, const uint8 *args)
{
PSX_WARNING("[CDC] Unimplemented command: 0x%02x", PendingCommand);
return(0);
}
int32 PS_CDC::Command_Nop(const int arg_count, const uint8 *args)
{
WriteResult(MakeStatus());
@ -2363,7 +2357,7 @@ int32 PS_CDC::Command_0x1d(const int arg_count, const uint8 *args)
PS_CDC::CDC_CTEntry PS_CDC::Commands[0x20] =
{
{ /* 0x00, */ 0, 0, "Sync", &PS_CDC::Command_Sync, NULL },
{ /* 0x00, */ 0, 0, NULL, NULL, NULL },
{ /* 0x01, */ 0, 0, "Nop", &PS_CDC::Command_Nop, NULL },
{ /* 0x02, */ 3, 3, "Setloc", &PS_CDC::Command_Setloc, NULL },
{ /* 0x03, */ 0, 1, "Play", &PS_CDC::Command_Play, NULL },

1
psx/octoshock/psx/cdc.h
View File

@ -230,7 +230,6 @@ class PS_CDC
static CDC_CTEntry Commands[0x20];
int32 Command_Sync(const int arg_count, const uint8 *args);
int32 Command_Nop(const int arg_count, const uint8 *args);
int32 Command_Setloc(const int arg_count, const uint8 *args);
int32 Command_Play(const int arg_count, const uint8 *args);

4
psx/octoshock/psx/psx.cpp
View File

@ -525,7 +525,9 @@ template<typename T, bool IsWrite, bool Access24> static INLINE void MemRW(pscpu
if(timestamp >= events[PSX_EVENT__SYNFIRST].next->event_time)
PSX_EventHandler(timestamp);
V = SPU->Read(timestamp, A) | (SPU->Read(timestamp, A | 2) << 16);
//0.9.36.5 - clarified read order by turning into two statements
V = SPU->Read(timestamp, A);
V |= SPU->Read(timestamp, A | 2) << 16;
}
}
else