Macintosh-HW/MacIIROMDiskDriver
1
0
Fork 0
mirror of https://github.com/garrettsworkshop/MacIIROMDiskDriver.git synced 2024-12-01 02:50:27 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up

Browse Source
This commit is contained in:
Zane Kaminski 2020-06-24 13:18:47 -04:00
parent f15ccd316c
commit 889973dd03
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
rdisk.c
View File

@ -47,7 +47,8 @@ typedef struct RDiskStorage_s {
#pragma parameter __D0 RDiskOpen(__A0, __A1) #pragma parameter __D0 RDiskOpen(__A0, __A1)
OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) { OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
DrvQElPtr dq; DrvQElPtr dq;
int drvnum = 1; DrvSts2 *status;
int drvNum;
RDiskStorage_t *c; RDiskStorage_t *c;
// Do nothing if already opened // Do nothing if already opened
@ -58,8 +59,9 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
StripAddress(&GWROMDisk); StripAddress(&GWROMDisk);
// Figure out first available drive number // Figure out first available drive number
drvNum = 1;
for (dq = (DrvQElPtr)(GetDrvQHdr())->qHead; dq; dq = (DrvQElPtr)dq->qLink) { for (dq = (DrvQElPtr)(GetDrvQHdr())->qHead; dq; dq = (DrvQElPtr)dq->qLink) {
if (dq->dQDrive >= drvnum) { drvnum = dq->dQDrive + 1; } if (dq->dQDrive >= drvNum) { drvNum = dq->dQDrive + 1; }
} }
// Allocate storage struct // Allocate storage struct
@ -70,30 +72,35 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
HLock(d->dCtlStorage); HLock(d->dCtlStorage);
c = *(RDiskStorage_t**)d->dCtlStorage; c = *(RDiskStorage_t**)d->dCtlStorage;
// Set drive status // Initialize storage struct fields
c->drvsts.writeProt = -1; c->init_done = 0;
c->drvsts.diskInPlace = 0x08; c->ramdisk = NULL;
c->drvsts.dQDrive = drvnum; c->ramdisk_alloc = NULL;
c->drvsts.dQRefNum = d->dCtlRefNum; c->ramdisk_valid = 0;
c->drvsts.driveSize = (RDiskSize >> 9) & 0xFFFF;
c->drvsts.driveS1 = ((RDiskSize >> 9) & 0xFFFF0000) >> 16;
//FIXME: Set driver flags? // Set drive status
status->writeProt = 0xF0;
status->diskInPlace = 0x08;
status->dQDrive = drvNum;
status->dQRefNum = d->dCtlRefNum;
status->driveSize = (RDiskSize / 512) & 0xFFFF;
status->driveS1 = ((RDiskSize / 512) & 0xFFFF0000) >> 16;
// Set driver flags?
/* d->dCtlFlags |= dReadEnableMask | dWritEnableMask | /* d->dCtlFlags |= dReadEnableMask | dWritEnableMask |
dCtlEnableMask | dStatEnableMask | dCtlEnableMask | dStatEnableMask |
dNeedLockMask; */ dNeedLockMask; // 0x4F */
// Add drive to drive queue and return // Add drive to drive queue and return
RDAddDrive(status->dQRefNum, drvNum, (DrvQElPtr)&status->qLink); RDAddDrive(status->dQRefNum, drvNum, (DrvQElPtr)&status->qLink);
return noErr; return noErr;
} }
static OSErr RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) { OSErr RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
char startup, ram; char startup = 0, ram = 0;
// Return if initialized. Otherwise mark init done // Mark init done
if (c->init_done) { return noErr; } c->init_done = 1;
else { c->init_done = 1; }
// Read PRAM // Read PRAM
RDReadXPRAM(1, 4, &startup); RDReadXPRAM(1, 4, &startup);
@ -103,7 +110,7 @@ static OSErr RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
if (startup || RDIsRPressed()) { // If ROM disk boot set in PRAM or R pressed, if (startup || RDIsRPressed()) { // If ROM disk boot set in PRAM or R pressed,
// Set ROM disk attributes // Set ROM disk attributes
c->drvsts.writeProt = -1; // Set write protected c->drvsts.writeProt = -1; // Set write protected
// Clear RAM disk structure fields (even though we used NewHandleSysClear) // Clear disk fields (even though we used NewHandleSysClear)
c->ramdisk = NULL; c->ramdisk = NULL;
c->ramdisk_alloc = NULL; c->ramdisk_alloc = NULL;
c->ramdisk_valid = 0; c->ramdisk_valid = 0;
@ -132,6 +139,7 @@ static OSErr RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
// Remove our driver from the drive queue // Remove our driver from the drive queue
DrvQElPtr dq; DrvQElPtr dq;
QHdrPtr QHead = (QHdrPtr)0x308; QHdrPtr QHead = (QHdrPtr)0x308;
// Loop through entire drive queue, searching for our device or stopping at the end. // Loop through entire drive queue, searching for our device or stopping at the end.
dq = (DrvQElPtr)QHead->qHead; dq = (DrvQElPtr)QHead->qHead;
while((dq != (DrvQElPtr)(QHead->qTail)) && (dq->dQRefNum != d->dCtlRefNum)) { while((dq != (DrvQElPtr)(QHead->qTail)) && (dq->dQRefNum != d->dCtlRefNum)) {
@ -167,7 +175,7 @@ OSErr RDiskPrime(IOParamPtr p, DCtlPtr d) {
// Initialize if this is the first prime call // Initialize if this is the first prime call
if (!c->init_done) { if (!c->init_done) {
OSErr ret = RDiskInit(p, d, c); OSErr ret = RDiskInit(p, d, c);
if (ret != noErr) { return ret; } // Return error if init failed if (ret != noErr) { return ret; }
} }
// Get pointer to RAM or ROM disk buffer // Get pointer to RAM or ROM disk buffer
@ -178,20 +186,24 @@ OSErr RDiskPrime(IOParamPtr p, DCtlPtr d) {
case fsAtMark: offset = d->dCtlPosition; break; case fsAtMark: offset = d->dCtlPosition; break;
case fsFromStart: case fsFromStart:
offset = p->ioPosOffset; offset = p->ioPosOffset;
//FIXME: if (offset < 0) { fail } //if (offset < 0) { return posErr; }
break; break;
case fsFromMark: offset = d->dCtlPosition + p->ioPosOffset; break; case fsFromMark: offset = d->dCtlPosition + p->ioPosOffset; break;
default: offset = 0; break; //FIXME: Error if unsupported ioPosMode? default: offset = 0; break; //FIXME: Error if unsupported ioPosMode?
} }
// FIXME: if (offset >= RDiskSize) { fail } // Bounds checking
disk += offset; /*if (offset >= RDiskSize || p->ioReqCount >= RDiskSize ||
offset + p->ioReqCount >= RDiskSize ||
disk + offset < disk) { return posErr; }*/
// Service read or write request // Service read or write request
cmd = p->ioTrap & 0x00FF; cmd = p->ioTrap & 0x00FF;
if (cmd == aRdCmd) { // Read if (cmd == aRdCmd) { // Read
// Return immediately if verify operation requested // Return immediately if verify operation requested
//FIXME: follow either old (verify) or new (read uncached) convention //FIXME: follow either old (verify) or new (read uncached) convention
if (p->ioPosMode & rdVerifyMask) { return noErr; } if (p->ioPosMode & rdVerifyMask) {
return noErr;
}
// Read from disk into buffer. // Read from disk into buffer.
if (*MMU32bit) { BlockMove(disk, (char*)p->ioBuffer, p->ioReqCount); } if (*MMU32bit) { BlockMove(disk, (char*)p->ioBuffer, p->ioReqCount); }
else { // 24-bit addressing else { // 24-bit addressing
@ -219,7 +231,7 @@ OSErr RDiskPrime(IOParamPtr p, DCtlPtr d) {
//FIXME: Should we fail if cmd isn't read or write? //FIXME: Should we fail if cmd isn't read or write?
} }
static OSErr RDiskAccRun(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) { OSErr RDiskAccRun(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
// Disable accRun // Disable accRun
d->dCtlDelay = 0; d->dCtlDelay = 0;
d->dCtlFlags &= ~dNeedTimeMask; d->dCtlFlags &= ~dNeedTimeMask;
@ -286,7 +298,6 @@ OSErr RDiskStatus(IOParamPtr p, DCtlPtr d) {
return noErr; return noErr;
default: return statusErr; default: return statusErr;
} }
return noErr;
} }
#pragma parameter __D0 RDiskClose(__A0, __A1) #pragma parameter __D0 RDiskClose(__A0, __A1)