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

DVDInterface: Handle DTK beyond 4 GiB 

Might as well do this while I'm already breaking
savestate compatibility.
This commit is contained in:
JosJuice 2016-08-14 17:11:39 +02:00
parent a450e33fb3
commit 98fb037dee
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -228,10 +228,10 @@ static UDICR s_DICR;
static UDIIMMBUF s_DIIMMBUF; static UDIIMMBUF s_DIIMMBUF;
static UDICFG s_DICFG; static UDICFG s_DICFG;
static u32 s_audio_position; static u64 s_audio_position;
static u32 s_current_start; static u64 s_current_start;
static u32 s_current_length; static u32 s_current_length;
static u32 s_next_start; static u64 s_next_start;
static u32 s_next_length; static u32 s_next_length;
static u32 s_pending_samples; static u32 s_pending_samples;
@ -977,9 +977,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
} }
else if (!s_stop_at_track_end) else if (!s_stop_at_track_end)
{ {
// Setting s_next_start (a u32) like this discards two bits, s_next_start = static_cast<u64>(command_1) << 2;
// but GC games can't be 4 GiB big, so it shouldn't matter
s_next_start = command_1 << 2;
s_next_length = command_2; s_next_length = command_2;
if (!s_stream) if (!s_stream)
{ {
@ -1012,17 +1010,17 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
case 0x01: // Returns the current offset case 0x01: // Returns the current offset
INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status AudioPos:%08x", INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status AudioPos:%08x",
s_audio_position); s_audio_position);
WriteImmediate(s_audio_position >> 2, output_address, reply_to_ios); WriteImmediate(static_cast<u32>(s_audio_position >> 2), output_address, reply_to_ios);
break; break;
case 0x02: // Returns the start offset case 0x02: // Returns the start offset
INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status CurrentStart:%08x", INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status CurrentStart:%08x",
s_current_start); s_current_start);
WriteImmediate(s_current_start >> 2, output_address, reply_to_ios); WriteImmediate(static_cast<u32>(s_current_start >> 2), output_address, reply_to_ios);
break; break;
case 0x03: // Returns the total length case 0x03: // Returns the total length
INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status CurrentLength:%08x", INFO_LOG(DVDINTERFACE, "(Audio): Stream Status: Request Audio status CurrentLength:%08x",
s_current_length); s_current_length);
WriteImmediate(s_current_length >> 2, output_address, reply_to_ios); WriteImmediate(static_cast<u32>(s_current_length >> 2), output_address, reply_to_ios);
break; break;
default: default:
INFO_LOG(DVDINTERFACE, "(Audio): Subcommand: %02x Request Audio status %s", INFO_LOG(DVDINTERFACE, "(Audio): Subcommand: %02x Request Audio status %s",