dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-08 08:33:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6015 from JosJuice/dvd-0-length

Browse Source 
Fix handling of DVD commands that read 0 bytes
This commit is contained in:
Pierre Bourdon 2017-09-03 21:04:25 +02:00 committed by GitHub
commit 5b6764a4fe
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/DVD/DVDInterface.cpp
View File

@ -1213,7 +1213,7 @@ void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition, u
const u32 bytes_per_chunk = const u32 bytes_per_chunk =
partition == DiscIO::PARTITION_NONE ? DVD_ECC_BLOCK_SIZE : DiscIO::VolumeWii::BLOCK_DATA_SIZE; partition == DiscIO::PARTITION_NONE ? DVD_ECC_BLOCK_SIZE : DiscIO::VolumeWii::BLOCK_DATA_SIZE;
while (length > 0) do
{ {
// The length of this read - "+1" so that if this read is already // The length of this read - "+1" so that if this read is already
// aligned to a block we'll read the entire block. // aligned to a block we'll read the entire block.
@ -1222,6 +1222,8 @@ void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition, u
// The last chunk may be short // The last chunk may be short
chunk_length = std::min(chunk_length, length); chunk_length = std::min(chunk_length, length);
// TODO: If the emulated software requests 0 bytes of data, should we seek or not?
if (dvd_offset >= buffer_start && dvd_offset < buffer_end) if (dvd_offset >= buffer_start && dvd_offset < buffer_end)
{ {
// Number of ticks it takes to transfer the data from the buffer to memory. // Number of ticks it takes to transfer the data from the buffer to memory.
@ -1266,7 +1268,7 @@ void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition, u
offset += chunk_length; offset += chunk_length;
length -= chunk_length; length -= chunk_length;
dvd_offset += DVD_ECC_BLOCK_SIZE; dvd_offset += DVD_ECC_BLOCK_SIZE;
} } while (length > 0);
// Update the buffer based on this read. Based on experimental testing, // Update the buffer based on this read. Based on experimental testing,
// we will only reuse the old buffer while reading forward. Note that the // we will only reuse the old buffer while reading forward. Note that the

2
Source/Core/Core/HW/DVD/DVDThread.cpp
View File

@ -326,7 +326,7 @@ static void FinishRead(u64 id, s64 cycles_late)
(CoreTiming::GetTicks() - request.time_started_ticks) / (CoreTiming::GetTicks() - request.time_started_ticks) /
(SystemTimers::GetTicksPerSecond() / 1000000)); (SystemTimers::GetTicksPerSecond() / 1000000));
if (buffer.empty()) if (buffer.size() != request.length)
{ {
PanicAlertT("The disc could not be read (at 0x%" PRIx64 " - 0x%" PRIx64 ").", PanicAlertT("The disc could not be read (at 0x%" PRIx64 " - 0x%" PRIx64 ").",
request.dvd_offset, request.dvd_offset + request.length); request.dvd_offset, request.dvd_offset + request.length);