From 5c53bc392445d49e2b48cfcd2c2533e2a2e1e37b Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 10 Dec 2014 19:51:58 +0000 Subject: [PATCH] start log of changes from upstream, with commentary. upgrade to mednafen 0.9.36.5 --- psx/octoshock/docs/upstreaminfo.txt | 5 +++++ psx/octoshock/psx/cdc.cpp | 8 +------- psx/octoshock/psx/cdc.h | 1 - psx/octoshock/psx/psx.cpp | 4 +++- 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 psx/octoshock/docs/upstreaminfo.txt diff --git a/psx/octoshock/docs/upstreaminfo.txt b/psx/octoshock/docs/upstreaminfo.txt new file mode 100644 index 0000000000..9472c9d415 --- /dev/null +++ b/psx/octoshock/docs/upstreaminfo.txt @@ -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 \ No newline at end of file diff --git a/psx/octoshock/psx/cdc.cpp b/psx/octoshock/psx/cdc.cpp index 56514c1523..6938182eeb 100644 --- a/psx/octoshock/psx/cdc.cpp +++ b/psx/octoshock/psx/cdc.cpp @@ -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 }, diff --git a/psx/octoshock/psx/cdc.h b/psx/octoshock/psx/cdc.h index 33edf5fc2a..f2925aef93 100644 --- a/psx/octoshock/psx/cdc.h +++ b/psx/octoshock/psx/cdc.h @@ -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); diff --git a/psx/octoshock/psx/psx.cpp b/psx/octoshock/psx/psx.cpp index 71f38c59b0..7e7866230d 100644 --- a/psx/octoshock/psx/psx.cpp +++ b/psx/octoshock/psx/psx.cpp @@ -525,7 +525,9 @@ template 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