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

cdvdgigaherz: Remove non-SPTI raw sector reading code 

There doesn't seem to be any issues calling CreateFile with
GENERIC_WRITE access (which is necessary for SPTI) on a standard user
account, so the SPTI code should work in all cases.
This commit is contained in:
Jonathan Li 2016-10-15 18:50:39 +01:00
parent f314c2a4d9
commit 8f11049c9f
2 changed files with 50 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/cdvdGigaherz/src/CDVD.h
View File

@ -65,13 +65,8 @@ class IOCtlSrc
IOCtlSrc(IOCtlSrc &); IOCtlSrc(IOCtlSrc &);
HANDLE device; HANDLE device;
bool m_can_use_spti;
bool OpenOK; bool OpenOK;
s32 last_read_mode;
s32 last_sector_count;
char sectorbuffer[32 * 2048]; char sectorbuffer[32 * 2048];
char fName[256]; char fName[256];

144
plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp
View File

@ -35,20 +35,16 @@ s32 IOCtlSrc::Reopen()
CloseHandle(device); CloseHandle(device);
} }
DWORD share = FILE_SHARE_READ;
DWORD flags = FILE_ATTRIBUTE_READONLY | FILE_FLAG_SEQUENTIAL_SCAN;
DWORD size; DWORD size;
OpenOK = false; OpenOK = false;
// SPTI only works if the device is opened with GENERIC_WRITE access. // SPTI only works if the device is opened with GENERIC_WRITE access.
m_can_use_spti = true; device = CreateFile(fName, GENERIC_READ | GENERIC_WRITE,
device = CreateFile(fName, GENERIC_READ | GENERIC_WRITE | FILE_READ_ATTRIBUTES, share, NULL, OPEN_EXISTING, flags, 0); FILE_SHARE_READ, nullptr, OPEN_EXISTING,
if (device == INVALID_HANDLE_VALUE) { FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
device = CreateFile(fName, GENERIC_READ | FILE_READ_ATTRIBUTES, share, NULL, OPEN_EXISTING, flags, 0); if (device == INVALID_HANDLE_VALUE)
if (device == INVALID_HANDLE_VALUE) return -1;
return -1;
m_can_use_spti = false;
}
// Dual layer DVDs cannot read from layer 1 without this ioctl // Dual layer DVDs cannot read from layer 1 without this ioctl
DeviceIoControl(device, FSCTL_ALLOW_EXTENDED_DASD_IO, nullptr, 0, nullptr, 0, &size, nullptr); DeviceIoControl(device, FSCTL_ALLOW_EXTENDED_DASD_IO, nullptr, 0, nullptr, 0, &size, nullptr);
@ -345,97 +341,57 @@ s32 IOCtlSrc::ReadSectors2048(u32 sector, u32 count, char *buffer)
s32 IOCtlSrc::ReadSectors2352(u32 sector, u32 count, char *buffer) s32 IOCtlSrc::ReadSectors2352(u32 sector, u32 count, char *buffer)
{ {
DWORD size = 0;
if (!OpenOK) if (!OpenOK)
return -1; return -1;
if (m_can_use_spti) { struct sptdinfo
struct sptdinfo {
{ SCSI_PASS_THROUGH_DIRECT info;
SCSI_PASS_THROUGH_DIRECT info; char sense_buffer[20];
char sense_buffer[20]; } sptd{};
} sptd = {};
// READ CD command // READ CD command
sptd.info.Cdb[0] = 0xBE; sptd.info.Cdb[0] = 0xBE;
// Don't care about sector type. // Don't care about sector type.
sptd.info.Cdb[1] = 0; sptd.info.Cdb[1] = 0;
// Number of sectors to read // Number of sectors to read
sptd.info.Cdb[6] = 0; sptd.info.Cdb[6] = 0;
sptd.info.Cdb[7] = 0; sptd.info.Cdb[7] = 0;
sptd.info.Cdb[8] = 1; sptd.info.Cdb[8] = 1;
// Sync + all headers + user data + EDC/ECC. Excludes C2 + subchannel // Sync + all headers + user data + EDC/ECC. Excludes C2 + subchannel
sptd.info.Cdb[9] = 0xF8; sptd.info.Cdb[9] = 0xF8;
sptd.info.Cdb[10] = 0; sptd.info.Cdb[10] = 0;
sptd.info.Cdb[11] = 0; sptd.info.Cdb[11] = 0;
sptd.info.CdbLength = 12; sptd.info.CdbLength = 12;
sptd.info.Length = sizeof(SCSI_PASS_THROUGH_DIRECT); sptd.info.Length = sizeof(SCSI_PASS_THROUGH_DIRECT);
sptd.info.DataIn = SCSI_IOCTL_DATA_IN; sptd.info.DataIn = SCSI_IOCTL_DATA_IN;
sptd.info.SenseInfoOffset = offsetof(sptdinfo, sense_buffer); sptd.info.SenseInfoOffset = offsetof(sptdinfo, sense_buffer);
sptd.info.TimeOutValue = 5; sptd.info.TimeOutValue = 5;
// Read sectors one by one to avoid reading data from 2 tracks of // Read sectors one by one to avoid reading data from 2 tracks of different
// different types in the same read (which will fail). // types in the same read (which will fail).
bool failed = false; for (u32 n = 0; n < count; ++n) {
for (u32 n = 0; n < count; ++n) { u32 current_sector = sector + n;
u32 current_sector = sector + n; sptd.info.Cdb[2] = (current_sector >> 24) & 0xFF;
sptd.info.Cdb[2] = (current_sector >> 24) & 0xFF; sptd.info.Cdb[3] = (current_sector >> 16) & 0xFF;
sptd.info.Cdb[3] = (current_sector >> 16) & 0xFF; sptd.info.Cdb[4] = (current_sector >> 8) & 0xFF;
sptd.info.Cdb[4] = (current_sector >> 8) & 0xFF; sptd.info.Cdb[5] = current_sector & 0xFF;
sptd.info.Cdb[5] = current_sector & 0xFF; sptd.info.DataTransferLength = 2352;
sptd.info.DataTransferLength = 2352; sptd.info.DataBuffer = buffer + 2352 * n;
sptd.info.DataBuffer = buffer + 2352 * n; sptd.info.SenseInfoLength = sizeof(sptd.sense_buffer);
sptd.info.SenseInfoLength = sizeof(sptd.sense_buffer);
if (DeviceIoControl(device, IOCTL_SCSI_PASS_THROUGH_DIRECT, &sptd, DWORD unused;
sizeof(sptd), &sptd, sizeof(sptd), &size, nullptr)) { if (DeviceIoControl(device, IOCTL_SCSI_PASS_THROUGH_DIRECT, &sptd,
if (sptd.info.DataTransferLength != 2352) sizeof(sptd), &sptd, sizeof(sptd), &unused, nullptr)) {
printf(" * CDVD: SPTI short transfer of %u bytes", sptd.info.DataTransferLength); if (sptd.info.DataTransferLength != 2352)
continue; printf(" * CDVD: SPTI short transfer of %u bytes", sptd.info.DataTransferLength);
} continue;
failed = true;
printf(" * CDVD: SPTI failed reading sector %u; SENSE %u -", current_sector, sptd.info.SenseInfoLength);
for (const auto &c : sptd.sense_buffer)
printf(" %02X", c);
putchar('\n');
break;
} }
printf(" * CDVD: SPTI failed reading sector %u; SENSE %u -", current_sector, sptd.info.SenseInfoLength);
if (!failed) for (const auto &c : sptd.sense_buffer)
return 0; printf(" %02X", c);
putchar('\n');
printf(" * CDVD: SPTI failed reading sectors %u-%u\n", sector, sector + count - 1);
}
// TODO: Code doesn't work as well as SPTI (likely due to some optional
// drive command requirements being unimplemented). Remove?
RAW_READ_INFO rri;
rri.DiskOffset.QuadPart = sector * (u64)2048;
rri.SectorCount = count;
rri.TrackMode = (TRACK_MODE_TYPE)last_read_mode;
if (DeviceIoControl(device, IOCTL_CDROM_RAW_READ, &rri, sizeof(rri), buffer, 2352 * count, &size, NULL) == 0) {
rri.TrackMode = XAForm2;
printf(" * CDVD: CD-ROM read mode change\n");
printf(" * CDVD: Trying XAForm2\n");
if (DeviceIoControl(device, IOCTL_CDROM_RAW_READ, &rri, sizeof(rri), buffer, 2352 * count, &size, NULL) == 0) {
rri.TrackMode = YellowMode2;
printf(" * CDVD: Trying YellowMode2\n");
if (DeviceIoControl(device, IOCTL_CDROM_RAW_READ, &rri, sizeof(rri), buffer, 2352 * count, &size, NULL) == 0) {
rri.TrackMode = CDDA;
printf(" * CDVD: Trying CDDA\n");
if (DeviceIoControl(device, IOCTL_CDROM_RAW_READ, &rri, sizeof(rri), buffer, 2352 * count, &size, NULL) == 0) {
printf(" * CDVD: Failed to read this CD-ROM with error code: %u\n", GetLastError());
return -1;
}
}
}
}
last_read_mode = rri.TrackMode;
if (size != (2352 * count)) {
return -1; return -1;
} }