ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDROM: Fail reads immediately for audio/unlicensed CDs 

Fixes first track being unavailable on audio CDs in Vib-Ribbon.
This commit is contained in:
Connor McLaughlin 2021-01-01 01:38:13 +10:00
parent 9294bf6be3
commit 75aa52ab06
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/cdrom.cpp
View File

@ -238,6 +238,19 @@ bool CDROM::DoState(StateWrapper& sw)
return !sw.HasError(); return !sw.HasError();
} }
bool CDROM::IsMediaPS1Disc() const
{
return (m_disc_region != DiscRegion::Other);
}
bool CDROM::DoesMediaRegionMatchConsole() const
{
if (!g_settings.cdrom_region_check)
return true;
return System::GetRegion() != System::GetConsoleRegionForDiscRegion(m_disc_region);
}
void CDROM::InsertMedia(std::unique_ptr<CDImage> media) void CDROM::InsertMedia(std::unique_ptr<CDImage> media)
{ {
if (CanReadMedia()) if (CanReadMedia())
@ -913,6 +926,10 @@ void CDROM::ExecuteCommand()
{ {
SendErrorResponse(STAT_ERROR, 0x80); SendErrorResponse(STAT_ERROR, 0x80);
} }
else if ((!IsMediaPS1Disc() || !DoesMediaRegionMatchConsole()) && !m_mode.cdda)
{
SendErrorResponse(STAT_ERROR, ERROR_REASON_INVALID_COMMAND);
}
else else
{ {
SendACKAndStat(); SendACKAndStat();
@ -1166,6 +1183,9 @@ void CDROM::ExecuteCommand()
{ {
m_reader.WaitForReadToComplete(); m_reader.WaitForReadToComplete();
Log_DevPrintf("GetTN -> %u %u", m_reader.GetMedia()->GetFirstTrackNumber(),
m_reader.GetMedia()->GetLastTrackNumber());
m_response_fifo.Push(m_secondary_status.bits); m_response_fifo.Push(m_secondary_status.bits);
m_response_fifo.Push(BinaryToBCD(Truncate8(m_reader.GetMedia()->GetFirstTrackNumber()))); m_response_fifo.Push(BinaryToBCD(Truncate8(m_reader.GetMedia()->GetFirstTrackNumber())));
m_response_fifo.Push(BinaryToBCD(Truncate8(m_reader.GetMedia()->GetLastTrackNumber()))); m_response_fifo.Push(BinaryToBCD(Truncate8(m_reader.GetMedia()->GetLastTrackNumber())));
@ -1205,6 +1225,8 @@ void CDROM::ExecuteCommand()
m_response_fifo.Push(m_secondary_status.bits); m_response_fifo.Push(m_secondary_status.bits);
m_response_fifo.Push(BinaryToBCD(Truncate8(pos.minute))); m_response_fifo.Push(BinaryToBCD(Truncate8(pos.minute)));
m_response_fifo.Push(BinaryToBCD(Truncate8(pos.second))); m_response_fifo.Push(BinaryToBCD(Truncate8(pos.second)));
Log_DevPrintf("GetTD %u -> %u %u", track, pos.minute, pos.second);
SetInterrupt(Interrupt::ACK); SetInterrupt(Interrupt::ACK);
} }
@ -1750,8 +1772,7 @@ void CDROM::DoIDRead()
m_current_lba = 0; m_current_lba = 0;
m_reader.QueueReadSector(0); m_reader.QueueReadSector(0);
if (g_settings.cdrom_region_check && (m_disc_region == DiscRegion::Other || if (!IsMediaPS1Disc() || (g_settings.cdrom_region_check && !DoesMediaRegionMatchConsole()))
System::GetRegion() != System::GetConsoleRegionForDiscRegion(m_disc_region)))
{ {
stat_byte |= STAT_ID_ERROR; stat_byte |= STAT_ID_ERROR;
flags_byte |= (1 << 7); // Unlicensed flags_byte |= (1 << 7); // Unlicensed

2
src/core/cdrom.h
View File

@ -27,6 +27,8 @@ public:
bool HasMedia() const { return m_reader.HasMedia(); } bool HasMedia() const { return m_reader.HasMedia(); }
const std::string& GetMediaFileName() const { return m_reader.GetMediaFileName(); } const std::string& GetMediaFileName() const { return m_reader.GetMediaFileName(); }
bool IsMediaPS1Disc() const;
bool DoesMediaRegionMatchConsole() const;
void InsertMedia(std::unique_ptr<CDImage> media); void InsertMedia(std::unique_ptr<CDImage> media);
std::unique_ptr<CDImage> RemoveMedia(bool force = false); std::unique_ptr<CDImage> RemoveMedia(bool force = false);