Apple-2-HW/aiie
1
0
Fork 0
mirror of https://github.com/JorjBauer/aiie.git synced 2024-11-25 19:31:36 +00:00
Code Issues Projects Releases Wiki Activity

fix disk behavior on bios reboot

Browse Source
This commit is contained in:
Jorj Bauer 2021-01-09 11:30:19 -05:00
parent eb9fe76118
commit 0cf57dd265
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bios.cpp
View File

@ -670,22 +670,27 @@ void BIOS::RebootAsIs()
{ {
// g_vm->Reset() will eject disks. We don't want to do that, so we need to // g_vm->Reset() will eject disks. We don't want to do that, so we need to
// grab the inserted disk names; reset the VM; then restore the disks. // grab the inserted disk names; reset the VM; then restore the disks.
const char *disk6s1 = ((AppleVM *)g_vm)->DiskName(0); char *disk6s1 = strdup(((AppleVM *)g_vm)->DiskName(0) ? ((AppleVM *)g_vm)->DiskName(0) : "");
const char *disk6s2 = ((AppleVM *)g_vm)->DiskName(1); char *disk6s2 = strdup(((AppleVM *)g_vm)->DiskName(1) ? ((AppleVM *)g_vm)->DiskName(1) : "");
const char *hdd1 = ((AppleVM *)g_vm)->HDName(0); char *hdd1 = strdup(((AppleVM *)g_vm)->HDName(0) ? ((AppleVM *)g_vm)->HDName(0) : "");
const char *hdd2 = ((AppleVM *)g_vm)->HDName(1); char *hdd2 = strdup(((AppleVM *)g_vm)->HDName(1) ? ((AppleVM *)g_vm)->HDName(1) : "");
g_vm->Reset(); g_vm->Reset();
g_cpu->Reset(); g_cpu->Reset();
if (disk6s1) if (disk6s1[0])
((AppleVM *)g_vm)->insertDisk(0, disk6s1); ((AppleVM *)g_vm)->insertDisk(0, disk6s1);
if (disk6s2) if (disk6s2[0])
((AppleVM *)g_vm)->insertDisk(1, disk6s2); ((AppleVM *)g_vm)->insertDisk(1, disk6s2);
if (hdd1) if (hdd1[0])
((AppleVM *)g_vm)->insertHD(0, hdd1); ((AppleVM *)g_vm)->insertHD(0, hdd1);
if (hdd2) if (hdd2[0])
((AppleVM *)g_vm)->insertHD(2, hdd2); ((AppleVM *)g_vm)->insertHD(2, hdd2);
free(disk6s1);
free(disk6s2);
free(hdd1);
free(hdd2);
} }
void BIOS::ColdReboot() void BIOS::ColdReboot()