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

New debug/CD disable strategy

Browse Source
This commit is contained in:
Zane Kaminski 2021-03-31 19:10:47 -04:00
parent 8726639d1b
commit 700f95c776
4 changed files with 12 additions and 18 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

@ -125,9 +125,6 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
// Set debug and CD-ROM enable flags in storage struct // Set debug and CD-ROM enable flags in storage struct
c->dbgEN = dbgEN; c->dbgEN = dbgEN;
c->cdromEN = cdromEN; 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) {
@ -158,6 +155,14 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
// That's not the worst, since the system would just crash, // That's not the worst, since the system would just crash,
// but it would be better to switch to read-only status // but it would be better to switch to read-only status
} }
// Patch debug and CD-ROM enable bytes
char dis = 0x44;
//if (!c->dbgEN) {
copy24(&dis/*RDiskDBGDisByte*/, &c->ramdisk[*RDiskDBGDisPos], 1);
//}
//if (!c->cdromEN) {
copy24(&dis/*RDiskCDROMDisByte*/, &c->ramdisk[*RDiskCDROMDisPos], 1);
//}
} }
// Unmount if not booting from ROM disk // Unmount if not booting from ROM disk
@ -200,15 +205,15 @@ OSErr RDPrime(IOParamPtr p, DCtlPtr d) {
if (*MMU32bit) { BlockMove(disk, p->ioBuffer, p->ioReqCount); } if (*MMU32bit) { BlockMove(disk, p->ioBuffer, p->ioReqCount); }
else { copy24(disk, StripAddress(p->ioBuffer), p->ioReqCount); } else { copy24(disk, StripAddress(p->ioBuffer), p->ioReqCount); }
if (!c->dbgEN && !c->dbgOverwrite && if (/*!c->dbgEN && */!c->ramdisk &&
*RDiskDBGDisPos >= d->dCtlPosition && *RDiskDBGDisPos >= d->dCtlPosition &&
*RDiskDBGDisPos < d->dCtlPosition + p->ioReqCount) { *RDiskDBGDisPos < d->dCtlPosition + p->ioReqCount) {
p->ioBuffer[*RDiskDBGDisPos - d->dCtlPosition] = *RDiskDBGDisByte; p->ioBuffer[*RDiskDBGDisPos - d->dCtlPosition] = 0x44;//*RDiskDBGDisByte;
} }
if (!c->cdromEN && !c->cdromOverwrite && if (/*!c->cdromEN && */!c->ramdisk &&
*RDiskCDROMDisPos >= d->dCtlPosition && *RDiskCDROMDisPos >= d->dCtlPosition &&
*RDiskCDROMDisPos < d->dCtlPosition + p->ioReqCount) { *RDiskCDROMDisPos < d->dCtlPosition + p->ioReqCount) {
p->ioBuffer[*RDiskCDROMDisPos - d->dCtlPosition] = *RDiskCDROMDisByte; p->ioBuffer[*RDiskCDROMDisPos - d->dCtlPosition] = 0x44;//*RDiskCDROMDisByte;
} }
} else if (cmd == aWrCmd) { // Write } else if (cmd == aWrCmd) { // Write
// Fail if write protected or RAM disk buffer not set up // Fail if write protected or RAM disk buffer not set up
@ -216,15 +221,6 @@ OSErr RDPrime(IOParamPtr p, DCtlPtr d) {
// Write from buffer into disk. // Write from buffer into disk.
if (*MMU32bit) { BlockMove(p->ioBuffer, disk, p->ioReqCount); } if (*MMU32bit) { BlockMove(p->ioBuffer, disk, p->ioReqCount); }
else { copy24(StripAddress(p->ioBuffer), disk, p->ioReqCount); } else { copy24(StripAddress(p->ioBuffer), disk, p->ioReqCount); }
if (*RDiskDBGDisPos >= d->dCtlPosition &&
*RDiskDBGDisPos < d->dCtlPosition + p->ioReqCount) {
c->dbgOverwrite = 1;
}
if (*RDiskCDROMDisPos >= d->dCtlPosition &&
*RDiskCDROMDisPos < d->dCtlPosition + p->ioReqCount) {
c->cdromOverwrite = 1;
}
} else { return noErr; } //FIXME: Fail if cmd isn't read or write? } else { return noErr; } //FIXME: Fail if cmd isn't read or write?
// Update count and position/offset, then return // Update count and position/offset, then return

2
rdisk.h
View File

@ -29,9 +29,7 @@ typedef struct RDiskStorage_s {
char initialized; char initialized;
Ptr ramdisk; Ptr ramdisk;
char dbgEN; char dbgEN;
char dbgOverwrite;
char cdromEN; 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