Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-14 14:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix block size handling (512 bytes) for CDs (#316)

Browse Source 
* Replaced code that assumes CDs having 2048 bytes per sector

* Comment update

* Logging update

* Logging update

* Set sector size before calling Open()
This commit is contained in:
Uwe Seimet 2021-10-10 09:03:51 +02:00 committed by GitHub
parent dd5cad616f
commit be090de0cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/raspberrypi/controllers/scsidev_ctrl.cpp
View File

@ -247,7 +247,7 @@ void SCSIDEV::Execute()
lun = (ctrl.cmd[1] >> 5) & 0x07;
if (!ctrl.unit[lun]) {
LOGINFO("Invalid LUN %d for ID %d", lun, GetSCSIID());
LOGDEBUG("Invalid LUN %d for ID %d", lun, GetSCSIID());
Error(ERROR_CODES::sense_key::ILLEGAL_REQUEST, ERROR_CODES::asc::INVALID_LUN);
return;

12
src/raspberrypi/devices/scsicd.cpp
View File

@ -307,6 +307,9 @@ void SCSICD::Open(const Filepath& path)
throw file_not_found_exception("Can't open CD-ROM file");
}
// Default sector size is 2048 bytes
SetSectorSizeInBytes(GetConfiguredSectorSize() ? GetConfiguredSectorSize() : 2048, false);
// Close and transfer for physical CD access
if (path.GetPath()[0] == _T('\\')) {
// Close
@ -341,9 +344,6 @@ void SCSICD::Open(const Filepath& path)
// Successful opening
ASSERT(GetBlockCount() > 0);
// Default sector size is 2048 bytes
SetSectorSizeInBytes(GetConfiguredSectorSize() ? GetConfiguredSectorSize() : 2048, false);
Disk::Open(path);
FileSupport::SetPath(path);
@ -420,7 +420,7 @@ void SCSICD::OpenIso(const Filepath& path)
fio.Close();
if (rawfile) {
// Size must be a multiple of 2536 and less than 700MB
// Size must be a multiple of 2536
if (size % 2536) {
stringstream error;
error << "Raw ISO CD-ROM file size must be a multiple of 2536 bytes but is " << size << " bytes";
@ -431,7 +431,7 @@ void SCSICD::OpenIso(const Filepath& path)
SetBlockCount((DWORD)(size / 0x930));
} else {
// Set the number of blocks
SetBlockCount((DWORD)(size >> 11));
SetBlockCount((DWORD)(size >> GetSectorSize()));
}
// Create only one data track
@ -472,7 +472,7 @@ void SCSICD::OpenPhysical(const Filepath& path)
}
// Set the number of blocks
SetBlockCount((DWORD)(size >> 11));
SetBlockCount((DWORD)(size >> GetSectorSize()));
// Create only one data track
ASSERT(!track[0]);