From 1d6ea390d764c81251d31ba1c4d0d4895cfd56d1 Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Thu, 4 Mar 2021 12:43:08 -0500
Subject: [PATCH] Change "RDisk" prefix of method names to "RD"

Change saves space in driver.o because ASCII method name string is appended to end of each method
---
 entry.s | 10 +++++-----
 rdisk.c | 32 ++++++++++++++++----------------
 rdisk.h |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/entry.s b/entry.s
index a64a11b..52249af 100644
--- a/entry.s
+++ b/entry.s
@@ -12,25 +12,25 @@ dc.l	0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 DOpen:
 	movem.l		%A0-%A1, -(%SP)
-	bsr			RDiskOpen
+	bsr			RDOpen
 	movem.l		(%SP)+, %A0-%A1
 	rts
 
 DClose:
 	movem.l		%A0-%A1, -(%SP)
-	bsr			RDiskClose
+	bsr			RDClose
 	movem.l		(%SP)+, %A0-%A1
 	rts
 
 DPrime:
 	movem.l		%A0-%A1, -(%SP)
-	bsr			RDiskPrime
+	bsr			RDPrime
 	movem.l		(%SP)+, %A0-%A1
 	bra.b		IOReturn
 
 DControl:
 	movem.l		%A0-%A1, -(%SP)
-	bsr			RDiskControl
+	bsr			RDCtl
 	movem.l		(%SP)+, %A0-%A1
 	cmpi.w		#killCode, kcsCode(%A0)
 	bne.b		IOReturn
@@ -38,7 +38,7 @@ DControl:
 
 DStatus:
 	movem.l		%A0-%A1, -(%SP)
-	bsr			RDiskStatus
+	bsr			RDStat
 	movem.l		(%SP)+, %A0-%A1
 
 IOReturn:
diff --git a/rdisk.c b/rdisk.c
index 09b4d8c..18d0efb 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -37,8 +37,8 @@ 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) {
+#pragma parameter RDCopy24(__A0, __A1, __D0)
+void RDCopy24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 	char mode = true32b;
 	SwapMMUMode(&mode);
 	BlockMove(sourcePtr, destPtr, byteCount);
@@ -46,7 +46,7 @@ void RDiskCopy24(Ptr sourcePtr, Ptr destPtr, unsigned long byteCount) {
 }
 
 // Figure out the first available drive number >= 5
-static int RDiskFindDrvNum() {
+static int RDFindDrvNum() {
 	DrvQElPtr dq;
 	int drvNum = 5;
 	for (dq = (DrvQElPtr)(GetDrvQHdr())->qHead; dq; dq = (DrvQElPtr)dq->qLink) {
@@ -55,8 +55,8 @@ static int RDiskFindDrvNum() {
 	return drvNum;
 }
 
-#pragma parameter __D0 RDiskOpen(__A0, __A1)
-OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
+#pragma parameter __D0 RDOpen(__A0, __A1)
+OSErr RDOpen(IOParamPtr p, DCtlPtr d) {
 	int drvNum;
 	RDiskStorage_t *c;
 	char legacy_startup;
@@ -77,7 +77,7 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
 	c = *(RDiskStorage_t**)d->dCtlStorage;
 
 	// Find first available drive number
-	drvNum = RDiskFindDrvNum();
+	drvNum = RDFindDrvNum();
 
 	// Set drive status
 	//c->status.track = 0;
@@ -105,8 +105,8 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
 }
 
 // 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;
+static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	// Mark init done
 	c->initialized = 1;
 	// Decode settings
@@ -153,8 +153,8 @@ static void RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	}
 }
 
-#pragma parameter __D0 RDiskPrime(__A0, __A1)
-OSErr RDiskPrime(IOParamPtr p, DCtlPtr d) {
+#pragma parameter __D0 RDPrime(__A0, __A1)
+OSErr RDPrime(IOParamPtr p, DCtlPtr d) {
 	RDiskStorage_t *c;
 	char cmd;
 	Ptr disk;
@@ -165,7 +165,7 @@ OSErr RDiskPrime(IOParamPtr p, DCtlPtr d) {
 	c = *(RDiskStorage_t**)d->dCtlStorage;
 
 	// Initialize if this is the first prime call
-	if (!c->initialized) { RDiskInit(p, d, c); }
+	if (!c->initialized) { RDInit(p, d, c); }
 
 	// Return disk offline error if virtual disk not inserted
 	if (!c->status.diskInPlace) { return offLinErr; }
@@ -196,8 +196,8 @@ OSErr RDiskPrime(IOParamPtr p, DCtlPtr d) {
 	return noErr;
 }
 
-#pragma parameter __D0 RDiskControl(__A0, __A1)
-OSErr RDiskControl(CntrlParamPtr p, DCtlPtr d) {
+#pragma parameter __D0 RDCtl(__A0, __A1)
+OSErr RDCtl(CntrlParamPtr p, DCtlPtr d) {
 	RDiskStorage_t *c;
 	// Fail if dCtlStorage null
 	if (!d->dCtlStorage) { return notOpenErr; }
@@ -256,8 +256,8 @@ OSErr RDiskControl(CntrlParamPtr p, DCtlPtr d) {
 	}
 }
 
-#pragma parameter __D0 RDiskStatus(__A0, __A1)
-OSErr RDiskStatus(CntrlParamPtr p, DCtlPtr d) {
+#pragma parameter __D0 RDStat(__A0, __A1)
+OSErr RDStat(CntrlParamPtr p, DCtlPtr d) {
 	RDiskStorage_t *c;
 	// Fail if dCtlStorage null
 	if (!d->dCtlStorage) { return notOpenErr; }
@@ -272,8 +272,8 @@ OSErr RDiskStatus(CntrlParamPtr p, DCtlPtr d) {
 	}
 }
 
-#pragma parameter __D0 RDiskClose(__A0, __A1)
-OSErr RDiskClose(IOParamPtr p, DCtlPtr d) {
+#pragma parameter __D0 RDClose(__A0, __A1)
+OSErr RDClose(IOParamPtr p, DCtlPtr d) {
 	// If dCtlStorage not null, dispose of it
 	if (!d->dCtlStorage) { return noErr; }
 	RDiskStorage_t *c = *(RDiskStorage_t**)d->dCtlStorage;
diff --git a/rdisk.h b/rdisk.h
index c94e2de..dbb9016 100644
--- a/rdisk.h
+++ b/rdisk.h
@@ -16,7 +16,7 @@ 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 copy24(s, d, b) { RDiskCopy_t copy24 = (RDiskCopy_t)RDCopy24; copy24(s, d, b); }
 
 //#define RDISK_COMPRESS_ICON_ENABLE
 #define RDISK_ICON_SIZE (285)