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

Merge pull request #218 from rakslice/placeholder_cdrom

Browse Source 
When there is no cdrom configured or autodetected, create an empty one for drag and drop
This commit is contained in:
kanjitalk755 2024-11-30 17:50:51 +09:00 committed by GitHub
commit 02a6762d2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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 cdrom_drive_info {
cdrom_drive_info() : num(0), fh(NULL), start_byte(0), status(0), drop(false) {}
cdrom_drive_info(void *fh_) : num(0), fh(fh_), 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), init_null(false) {}
void close_fh(void) { SysAllowRemoval(fh); Sys_close(fh); }
@ -148,7 +148,8 @@ struct cdrom_drive_info {
bool repeat; // Repeat flag
uint8 power_mode; // Power mode
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
@ -314,7 +315,13 @@ void CDROMInit(void)
if (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
last_drive_num = drives.begin()->num;
}
@ -432,7 +439,7 @@ int16 CDROMOpen(uint32 pb, uint32 dce)
info->num = FindFreeDriveNumber(1);
info->to_be_mounted = false;
if (info->fh) {
if (info->fh || info->init_null) {
info->mount_non_hfs = true;
info->block_size = 512;
info->twok_offset = -1;