mirror of
https://github.com/garrettsworkshop/MacIIROMDiskDriver.git
synced 2025-02-16 05:33:00 +00:00
New format routine, removed postBoot
This commit is contained in:
Zane Kaminski
parent
11b25602f3
commit
5461cac927
BIN
bin/driver.bin
BIN
bin/driver.bin
Binary file not shown.
BIN
bin/rom.bin
BIN
bin/rom.bin
Binary file not shown.
65
rdisk.c
65
rdisk.c
@ -8,13 +8,10 @@
|
||||
|
||||
#include "rdisk.h"
|
||||
|
||||
// Decode keyboard/PRAM settings
|
||||
static void RDiskDecodeSettings(RDiskStorage_t *c, Ptr unmount, Ptr mount, Ptr ram) {
|
||||
// Decode settings
|
||||
if (c->postBoot) {
|
||||
*unmount = 0; // Don't unmount
|
||||
*mount = 0; // No need to post event since it's already been done
|
||||
*ram = 0;
|
||||
} else 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
|
||||
*mount = 0; // No need to mount later since we are boot disk
|
||||
*ram = RDiskIsAPressed(); // A enables RAM disk
|
||||
@ -23,12 +20,12 @@ static void RDiskDecodeSettings(RDiskStorage_t *c, Ptr unmount, Ptr mount, Ptr r
|
||||
char legacy_startup, legacy_ram;
|
||||
RDiskReadXPRAM(1, 4, &legacy_startup);
|
||||
RDiskReadXPRAM(1, 5, &legacy_ram);
|
||||
if (legacy_startup & 1) {
|
||||
if (legacy_startup & 1) { // Boot from ROM disk
|
||||
*unmount = 0; // Don't unmount so we boot from this drive
|
||||
*mount = 0; // No need to mount later since we are boot disk
|
||||
*ram = legacy_ram & 1;
|
||||
} else if (legacy_startup & 2) {
|
||||
*unmount = 1; // Unmount to not boot from ouur disks
|
||||
} 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 {
|
||||
@ -40,6 +37,7 @@ static void RDiskDecodeSettings(RDiskStorage_t *c, Ptr unmount, Ptr mount, Ptr r
|
||||
}
|
||||
|
||||
// Switch to 32-bit mode and copy
|
||||
#pragma parameter RDiskCopy24(__A0, __A1, __D0)
|
||||
void RDiskCopy24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
|
||||
char mode = true32b;
|
||||
SwapMMUMode(&mode);
|
||||
@ -83,23 +81,23 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
|
||||
drvNum = RDiskFindDrvNum();
|
||||
|
||||
// Set drive status
|
||||
c->status.track = 0;
|
||||
//c->status.track = 0;
|
||||
c->status.writeProt = -1; // nonzero is write protected
|
||||
c->status.diskInPlace = 8; // 8 is nonejectable disk
|
||||
c->status.installed = 1; // drive installed
|
||||
c->status.sides = 0; // drive installed
|
||||
c->status.qType = 1;
|
||||
//c->status.sides = 0;
|
||||
//c->status.qType = 1;
|
||||
c->status.dQDrive = drvNum;
|
||||
c->status.dQFSID = 0;
|
||||
//c->status.dQFSID = 0;
|
||||
c->status.dQRefNum = d->dCtlRefNum;
|
||||
c->status.driveSize = RDiskSize / 512;
|
||||
c->status.driveS1 = (RDiskSize / 512) >> 16;
|
||||
//c->status.driveS1 = (RDiskSize / 512) >> 16;
|
||||
|
||||
#ifdef RDISK_COMPRESS_ICON_ENABLE
|
||||
// Decompress icon
|
||||
#ifdef RDISK_COMPRESS_ICON_ENABLE
|
||||
char *src = &RDiskIconCompressed[0];
|
||||
char *dst = &c->icon[0];
|
||||
UnpackBits(&src, &dst, 285);
|
||||
UnpackBits(&src, &dst, RDISK_ICON_SIZE);
|
||||
#endif
|
||||
|
||||
// Add drive to drive queue and return
|
||||
@ -107,12 +105,11 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
|
||||
return noErr;
|
||||
}
|
||||
|
||||
// Init is called at beginning of first prime (read/write) call
|
||||
static void RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
|
||||
char unmountEN, mountEN, ramEN;
|
||||
|
||||
// Mark init done
|
||||
c->initialized = 1;
|
||||
|
||||
// Decode settings
|
||||
RDiskDecodeSettings(c, &unmountEN, &mountEN, &ramEN);
|
||||
|
||||
@ -148,14 +145,12 @@ static void RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
|
||||
}
|
||||
|
||||
// Unmount if not booting from ROM disk
|
||||
if (unmountEN) {
|
||||
c->status.diskInPlace = 0; // 0 == no disk in drive
|
||||
}
|
||||
if (unmountEN) { c->status.diskInPlace = 0; }
|
||||
|
||||
// If mount enabled, enable accRun to post disk inserted event later
|
||||
if (mountEN) {
|
||||
d->dCtlFlags |= dNeedTimeMask; // Enable accRun
|
||||
d->dCtlDelay = 150; // Set accRun delay (150 ticks is 2.5 sec.)
|
||||
d->dCtlFlags |= dNeedTimeMask; // Enable accRun
|
||||
}
|
||||
}
|
||||
|
||||
@ -211,25 +206,25 @@ OSErr RDiskControl(CntrlParamPtr p, DCtlPtr d) {
|
||||
c = *(RDiskStorage_t**)d->dCtlStorage;
|
||||
// Handle control request based on csCode
|
||||
switch (p->csCode) {
|
||||
case killCode:
|
||||
return noErr;
|
||||
case kFormat:
|
||||
if (!c->status.diskInPlace || c->status.writeProt || !c->ramdisk) {
|
||||
return controlErr;
|
||||
}
|
||||
long zero[16];
|
||||
zero[0] = 0;
|
||||
for (int i = 0; i < 256; i++) {
|
||||
if (*MMU32bit) { BlockMove(zero, c->ramdisk, sizeof(zero)); }
|
||||
else { copy24((Ptr)zero, c->ramdisk, sizeof(zero)); }
|
||||
if (!c->status.diskInPlace || c->status.writeProt ||
|
||||
!c->ramdisk) { return controlErr; }
|
||||
long zero[32];
|
||||
for (int i = 0; i < 32; i++) { zero[i] = 0; }
|
||||
for (int i = 0; i < 32; i++) {
|
||||
copy24((Ptr)zero, c->ramdisk + i * sizeof(zero), sizeof(zero));
|
||||
}
|
||||
return noErr;
|
||||
case kVerify:
|
||||
if (!c->status.diskInPlace) { return controlErr; }
|
||||
return noErr;
|
||||
case killCode:
|
||||
return noErr;
|
||||
case kEject:
|
||||
// "Reinsert" disk if ejected illegally
|
||||
if (c->installed) { PostEvent(diskEvt, c->status.dQDrive); }
|
||||
if (c->status.diskInPlace) {
|
||||
PostEvent(diskEvt, c->status.dQDrive);
|
||||
}
|
||||
return controlErr; // Eject not allowed so return error
|
||||
case accRun:
|
||||
d->dCtlFlags &= ~dNeedTimeMask; // Disable accRun
|
||||
@ -254,9 +249,9 @@ OSErr RDiskControl(CntrlParamPtr p, DCtlPtr d) {
|
||||
*(long*)p->csParam = RDiskSize / 512;
|
||||
return noErr;
|
||||
case 2351: // Post-boot
|
||||
c->postBoot = 1; // Enable post-boot mode
|
||||
c->initialized = 1; // Skip initialization
|
||||
d->dCtlDelay = 30; // Set accRun delay (30 ticks is 0.5 sec.)
|
||||
d->dCtlFlags |= dNeedTimeMask; // Enable accRun
|
||||
d->dCtlDelay = 150; // Set accRun delay (150 ticks is 2.5 sec.)
|
||||
return noErr;
|
||||
default: return controlErr;
|
||||
}
|
||||
@ -280,7 +275,7 @@ OSErr RDiskStatus(CntrlParamPtr p, DCtlPtr d) {
|
||||
|
||||
#pragma parameter __D0 RDiskClose(__A0, __A1)
|
||||
OSErr RDiskClose(IOParamPtr p, DCtlPtr d) {
|
||||
// If dCtlStorage not null, dispose of it and its contents
|
||||
// If dCtlStorage not null, dispose of it
|
||||
if (!d->dCtlStorage) { return noErr; }
|
||||
RDiskStorage_t *c = *(RDiskStorage_t**)d->dCtlStorage;
|
||||
HUnlock(d->dCtlStorage);
|
||||
|
||||
60
rdisk.h
60
rdisk.h
@ -1,60 +1,42 @@
|
||||
#ifndef RDTRAPS_H
|
||||
#define RDTRAPS_H
|
||||
#ifndef RDISK_H
|
||||
#define RDISK_H
|
||||
|
||||
#define RDiskSize (0x00180000L)
|
||||
#define RDiskBuf ((char*)0x40880000)
|
||||
#define BufPtr ((Ptr*)0x10C)
|
||||
#define MemTop ((Ptr*)0x108)
|
||||
#define MMU32bit ((char*)0xCB2)
|
||||
#define JIODone ((char*)0x8FC)
|
||||
|
||||
#pragma parameter __D0 RDiskReadXPRAM(__D0, __D1, __A0)
|
||||
OSErr RDiskReadXPRAM(short numBytes, short whichByte, void *dest) = {0x4840, 0x3001, 0xA051};
|
||||
OSErr RDiskReadXPRAM(short numBytes, short whichByte, Ptr dest) = {0x4840, 0x3001, 0xA051};
|
||||
|
||||
// Other definition of RDiskAddDrive with register calling convention
|
||||
//#pragma parameter __D0 RDiskAddDrive(__D1, __D0, __A0)
|
||||
//OSErr RDiskAddDrive(short numBytes, short whichByte, void *dest) = {0x4840, 0x3001, 0xA04E};
|
||||
#pragma parameter __D0 RDiskAddDrive(__D1, __D0, __A0)
|
||||
OSErr RDiskAddDrive(short drvrRefNum, short drvNum, DrvQElPtr dq) = {0x4840, 0x3001, 0xA04E};
|
||||
|
||||
OSErr RDiskAddDrive(short drvrRefNum, short drvNum, DrvQElPtr dq) {
|
||||
__asm__ __volatile__ (
|
||||
"clr.l %%D0 \n\t"
|
||||
"move.w %1,%%D0 \n\t"
|
||||
"swap %%D0 \n\t"
|
||||
"move.w %0,%%D0 \n\t"
|
||||
"movea.l %2,%%A0 \n\t"
|
||||
".word 0xA04E \n\t"
|
||||
: /* outputs */
|
||||
: "g"(drvrRefNum), "g"(drvNum), "g"(dq) /* inputs */
|
||||
: /* clobbered */);
|
||||
}
|
||||
|
||||
inline char RDiskIsRPressed() { return *((char*)0x175) & 0x80; }
|
||||
inline char RDiskIsAPressed() { return *((char*)0x174) & 0x01; }
|
||||
|
||||
void RDiskBreak() = { 0xA9FF };
|
||||
static inline char RDiskIsRPressed() { return *((char*)0x175) & 0x80; }
|
||||
static inline char RDiskIsAPressed() { return *((char*)0x174) & 0x01; }
|
||||
|
||||
typedef void (*RDiskCopy_t)(Ptr, Ptr, unsigned long);
|
||||
#define copy24(s, d, b) { RDiskCopy_t copy24 = (RDiskCopy_t)RDiskCopy24; copy24(s, d, b); }
|
||||
|
||||
//#define RDISK_COMPRESS_ICON_ENABLE
|
||||
#define RDISK_ICON_SIZE (285)
|
||||
typedef struct RDiskStorage_s {
|
||||
DrvSts2 status;
|
||||
char initialized;
|
||||
char installed;
|
||||
char postBoot;
|
||||
Ptr ramdisk;
|
||||
#ifdef RDISK_COMPRESS_ICON_ENABLE
|
||||
char icon[285];
|
||||
char icon[RDISK_ICON_SIZE];
|
||||
#endif
|
||||
} RDiskStorage_t;
|
||||
|
||||
#define copy24(s, d, b) { RDiskCopy_t copy24 = (RDiskCopy_t)RDiskCopy24; copy24(s, d, b); }
|
||||
|
||||
#define PackBits_Repeat(count) ((-1) * (count - 1))
|
||||
#define PackBits_Repeat(count) (-1 * (count - 1))
|
||||
#define PackBits_Literal(count) (count - 1)
|
||||
|
||||
#define RDISK_COMPRESSED_ICON_SIZE (87)
|
||||
#ifdef RDISK_COMPRESS_ICON_ENABLE
|
||||
#include <Quickdraw.h>
|
||||
const char const RDiskIconCompressed[92] = {
|
||||
const char const RDiskIconCompressed[RDISK_COMPRESSED_ICON_SIZE] = {
|
||||
PackBits_Repeat(76), 0b00000000, /*
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
@ -77,8 +59,7 @@ const char const RDiskIconCompressed[92] = {
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, */
|
||||
PackBits_Repeat(4), 0b11111111, /*
|
||||
0b11111111, 0b11111111, 0b11111111, 0b11111111, */
|
||||
PackBits_Literal(40),
|
||||
0b11111111, 0b11111111, 0b11111111, 0b11111111,
|
||||
PackBits_Literal(36),
|
||||
0b10000000, 0b00000000, 0b00000000, 0b00000001,
|
||||
0b10001111, 0b00011110, 0b00111100, 0b01111001,
|
||||
0b10001001, 0b00010010, 0b00100100, 0b01001001,
|
||||
@ -122,20 +103,23 @@ const char const RDiskIconCompressed[92] = {
|
||||
0b11111111, 0b11111111, 0b11111111, 0b11111111,
|
||||
0b11111111, 0b11111111, 0b11111111, 0b11111111,
|
||||
0b11111111, 0b11111111, 0b11111111, 0b11111111, */
|
||||
PackBits_Literal(8),
|
||||
0b01111111, 0b11111111, 0b11111111, 0b11111111,
|
||||
0b01111111, 0b11111111, 0b11111111, 0b11111111,
|
||||
PackBits_Literal(1), 0b01111111,
|
||||
PackBits_Repeat(3), 0b11111111, /*
|
||||
0b01111111, 0b11111111, 0b11111111, 0b11111111, */
|
||||
PackBits_Literal(1), 0b01111111,
|
||||
PackBits_Repeat(3), 0b11111111, /*
|
||||
0b01111111, 0b11111111, 0b11111111, 0b11111111, */
|
||||
PackBits_Repeat(12), 0b00000000, /*
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000, */
|
||||
(29 - 1),
|
||||
PackBits_Literal(29),
|
||||
27, 'G', 'a', 'r', 'r', 'e', 't', 't', '\'', 's', ' ',
|
||||
'W', 'o', 'r', 'k', 's', 'h', 'o', 'p', ' ',
|
||||
'R', 'O', 'M', ' ', 'D', 'i', 's', 'k', 0
|
||||
};
|
||||
#else
|
||||
const char const RDiskIcon[285] = {
|
||||
const char const RDiskIcon[RDISK_ICON_SIZE] = {
|
||||
// Icon
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
0b00000000, 0b00000000, 0b00000000, 0b00000000,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user