DVDInterface: Reply to 0-length commands
This regression from the chunking PR was making a few games hang.
This commit is contained in:
parent
75435aea6f
commit
0341a6052b
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue