Macintosh-HW/MacIIROMDiskDriver
1
0
Fork 0
mirror of https://github.com/garrettsworkshop/MacIIROMDiskDriver.git synced 2024-11-21 12:30:49 +00:00
Code Issues Projects Releases Wiki Activity

Refactor settings load again

Browse Source
This commit is contained in:
Zane Kaminski 2021-04-02 06:29:33 -04:00
parent bbf5601b3e
commit acf71fcd80
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/driver7M5.bin
View File

Binary file not shown.

BIN
bin/rom8M.bin
View File

Binary file not shown.

28
rdisk.c
View File

@ -149,11 +149,6 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
c->initialized = 1; c->initialized = 1;
// Decode settings // Decode settings
RDDecodeSettings(&unmountEN, &mountEN, &ramEN, &dbgEN, &cdrEN); RDDecodeSettings(&unmountEN, &mountEN, &ramEN, &dbgEN, &cdrEN);
// Set debug and CD-ROM disable stuff in storage struct
peek24L((long*)0x40851D98, c->dbgDisPos);
peek24L((long*)0x40851D9C, c->cdrDisPos);
peek24(dbgEN ? RDiskBuf + c->dbgDisPos : (char*)0x40851DA8, c->dbgDisByte);
peek24(cdrEN ? RDiskBuf + c->cdrDisPos : (char*)0x40851DA9, c->cdrDisByte);
// If RAM disk enabled, try to allocate RAM disk buffer if not already // If RAM disk enabled, try to allocate RAM disk buffer if not already
if (ramEN & !c->ramdisk) { if (ramEN & !c->ramdisk) {
@ -186,12 +181,23 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
} }
} }
// Apply patches to RAM disk // Get debug and CD-ROM disable settings from ROM table
if (c->ramdisk) { peek24L((long*)0x40851D98, c->dbgDisPos);
// Patch debugger enable byte peek24L((long*)0x40851D9C, c->cdrDisPos);
poke24(c->ramdisk + c->dbgDisPos, c->dbgDisByte); // Patch
// Patch CD-R enable byte if (c->dbgDisPos < RDiskSize) {
poke24(c->ramdisk + c->cdrDisPos, c->cdrDisByte); if (c->ramdisk) { poke24(c->ramdisk + c->dbgDisPos, c->dbgDisByte); }
else { peek24(dbgEN ?
RDiskBuf + c->dbgDisPos :
(char*)0x40851DA8, c->dbgDisByte);
}
}
if (c->dbgDisPos < RDiskSize) {
if (c->ramdisk) { poke24(c->ramdisk + c->cdrDisPos, c->cdrDisByte); }
else { peek24(cdrEN ?
RDiskBuf + c->cdrDisPos :
(char*)0x40851DA9, c->cdrDisByte);
}
} }
// Unmount if not booting from ROM disk // Unmount if not booting from ROM disk