Macintosh-HW/MacIIROMDiskDriver
1
0
Fork 0
mirror of https://github.com/garrettsworkshop/MacIIROMDiskDriver.git synced 2024-06-26 11:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Add extra settings

Browse Source
This commit is contained in:
Zane Kaminski 2021-03-04 12:44:11 -05:00
parent 0afd682ea6
commit 99ff56c41c
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
rdisk.c
View File

@ -9,31 +9,42 @@
#include "rdisk.h" #include "rdisk.h"
// Decode keyboard/PRAM settings // Decode keyboard/PRAM settings
static void RDiskDecodeSettings(RDiskStorage_t *c, Ptr unmount, Ptr mount, Ptr ram) { static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, Ptr cdromEN) {
// Decode settings // Read PRAM
char legacy_startup, legacy_ram;
RDiskReadXPRAM(1, 4, &legacy_startup);
RDiskReadXPRAM(1, 5, &legacy_ram);
// Decode settings: unmount (don't boot), mount (after boot), RAM disk
if (RDiskIsRPressed()) { // R boots from ROM disk if (RDiskIsRPressed()) { // R boots from ROM disk
*unmount = 0; // Don't unmount so we boot from this drive *unmountEN = 0; // Don't unmount so we boot from this drive
*mount = 0; // No need to mount later since we are boot disk *mountEN = 0; // No need to mount later since we are boot disk
*ram = RDiskIsAPressed(); // A enables RAM disk *ramEN = RDiskIsAPressed(); // A enables RAM disk
} else { } else {
// Read PRAM if (legacy_startup & 0x01) { // Boot from ROM disk
char legacy_startup, legacy_ram; *unmountEN = 0; // Don't unmount so we boot from this drive
RDiskReadXPRAM(1, 4, &legacy_startup); *mountEN = 0; // No need to mount later since we are boot disk
RDiskReadXPRAM(1, 5, &legacy_ram); *ramEN = legacy_ram & 0x01;
if (legacy_startup & 1) { // Boot from ROM disk } else if (legacy_startup & 0x02) { // Mount ROM disk
*unmount = 0; // Don't unmount so we boot from this drive *unmountEN = 1; // Unmount to not boot from our disk
*mount = 0; // No need to mount later since we are boot disk *mountEN = 1; // Mount in accRun
*ram = legacy_ram & 1; *ramEN = legacy_ram & 0x01;
} else if (legacy_startup & 2) { // Mount ROM disk
*unmount = 1; // Unmount to not boot from our disk
*mount = 1; // Mount in accRun
*ram = legacy_ram & 1;
} else { } else {
*unmount = 1; // Unmount *unmountEN = 1; // Unmount
*mount = 0; // Don't mount again *mountEN = 0; // Don't mount again
*ram = 0; // Don't allocate RAM disk *ramEN = 0; // Don't allocate RAM disk
} }
} }
// MacsBug enabled if bit 3 == 1 or DBGDis addr invalid or not boot
*dbgEN = *unmountEN ||
(legacy_startup & 0x04) ||
(*RDiskDBGDisPos == 0);
// CDROM enabled if bit 3 == 0 or CDROMDis addr invalid or not boot
*cdromEN = *unmountEN ||
!(legacy_startup & 0x08) ||
(*RDiskCDROMDisPos == 0);
} }
// Switch to 32-bit mode and copy // Switch to 32-bit mode and copy
@ -105,12 +116,18 @@ OSErr RDOpen(IOParamPtr p, DCtlPtr d) {
} }
// Init is called at beginning of first prime (read/write) call // Init is called at beginning of first prime (read/write) call
char unmountEN, mountEN, ramEN;
static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) { static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
char unmountEN, mountEN, ramEN, dbgEN, cdromEN;
// Mark init done // Mark init done
c->initialized = 1; c->initialized = 1;
// Decode settings // Decode settings
RDiskDecodeSettings(c, &unmountEN, &mountEN, &ramEN); RDDecodeSettings(&unmountEN, &mountEN, &ramEN, &dbgEN, &cdromEN);
// Set debug and CD-ROM enable flags in storage struct
c->dbgEN = dbgEN;
c->cdromEN = cdromEN;
// Clear debug and CD-ROM overwrite flags
c->dbgOverwrite = 0;
c->cdromOverwrite = 0;
// 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) {

4
rdisk.h
View File

@ -28,6 +28,10 @@ typedef struct RDiskStorage_s {
DrvSts2 status; DrvSts2 status;
char initialized; char initialized;
Ptr ramdisk; Ptr ramdisk;
char dbgEN;
char dbgOverwrite;
char cdromEN;
char cdromOverwrite;
#ifdef RDISK_COMPRESS_ICON_ENABLE #ifdef RDISK_COMPRESS_ICON_ENABLE
char icon[RDISK_ICON_SIZE]; char icon[RDISK_ICON_SIZE];
#endif #endif