Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-13 23:32:55 +00:00
Code Issues Projects Releases Wiki Activity

When there is no cdrom configured or autodetected, create a placeholder one to use with drag and drop

Browse Source
This commit is contained in:
rakslice 2024-11-23 22:28:31 -08:00
parent 3f46296a36
commit aa77d0269f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BasiliskII/src/cdrom.cpp
View File

@ -125,8 +125,8 @@ static const uint8 bcd2bin[256] = {
// Struct for each drive // Struct for each drive
struct cdrom_drive_info { struct cdrom_drive_info {
cdrom_drive_info() : num(0), fh(NULL), start_byte(0), status(0), drop(false) {} cdrom_drive_info() : num(0), fh(NULL), start_byte(0), status(0), drop(false), init_null(false) {}
cdrom_drive_info(void *fh_) : num(0), fh(fh_), start_byte(0), status(0), drop(false) {} cdrom_drive_info(void *fh_) : num(0), fh(fh_), start_byte(0), status(0), drop(false), init_null(false) {}
void close_fh(void) { SysAllowRemoval(fh); Sys_close(fh); } void close_fh(void) { SysAllowRemoval(fh); Sys_close(fh); }
@ -148,7 +148,8 @@ struct cdrom_drive_info {
bool repeat; // Repeat flag bool repeat; // Repeat flag
uint8 power_mode; // Power mode uint8 power_mode; // Power mode
uint32 status; // Mac address of drive status record uint32 status; // Mac address of drive status record
bool drop; bool drop; // Disc image mounted by drag-and-drop
bool init_null; // Init even if null
}; };
// List of drives handled by this driver // List of drives handled by this driver
@ -314,7 +315,13 @@ void CDROMInit(void)
if (fh) if (fh)
drives.push_back(cdrom_drive_info(fh)); drives.push_back(cdrom_drive_info(fh));
} }
if (drives.empty()) {
// create a placeholder drive for images
drives.push_back(cdrom_drive_info());
drives.begin()->init_null = true;
}
if (!drives.empty()) { // set to first drive by default if (!drives.empty()) { // set to first drive by default
last_drive_num = drives.begin()->num; last_drive_num = drives.begin()->num;
} }
@ -432,7 +439,7 @@ int16 CDROMOpen(uint32 pb, uint32 dce)
info->num = FindFreeDriveNumber(1); info->num = FindFreeDriveNumber(1);
info->to_be_mounted = false; info->to_be_mounted = false;
if (info->fh) { if (info->fh || info->init_null) {
info->mount_non_hfs = true; info->mount_non_hfs = true;
info->block_size = 512; info->block_size = 512;
info->twok_offset = -1; info->twok_offset = -1;