From 16e179075f6c4d72383aa515ccc7bf329bc0653d Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Wed, 24 Jun 2020 13:10:44 -0400
Subject: [PATCH] Factored out traps

---
 rdisk.c   | 20 ++++++--------------
 rdtraps.h | 13 +++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 rdtraps.h

diff --git a/rdisk.c b/rdisk.c
index 1c547a5..26334a3 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -7,20 +7,12 @@
 #include <OSUtils.h>
 
 #define RDiskSize (0x00780000L)
+#include "rdtraps.h"
 #define RDiskBuf ((char*)0x40880000)
 #define BufPtr ((Ptr*)0x10C)
 #define MemTop ((Ptr*)0x108)
 #define MMU32bit ((char*)0x0CB2)
 
-#pragma parameter __D0 ReadXPRam(__D0, __D1, __A0)
-OSErr ReadXPRam(short numBytes, short whichByte, void *dest) = {0x4840, 0x3001, 0xA051}; 
-
-#pragma parameter __D0 RDiskAddDrive(__D1, __D0, __A0)
-OSErr RDiskAddDrive(short drvrRefNum, short drvNum, DrvQElPtr dq) = {0x4840, 0x3001, 0xA04E}; 
-
-inline char IsRPressed() { return *((char*)0x175) & 0x80; }
-inline char ISAPressed() { return *((char*)0x174) & 0x01; }
-
 #define Copy24Size (64)
 typedef void (*ROMDiskCopy_t)(char *, char *, unsigned long);
 void Copy24(char *source, char *dest, unsigned long count) {
@@ -87,7 +79,7 @@ OSErr RDiskOpen(IOParamPtr p, DCtlPtr d) {
 					dNeedLockMask; */
 
 	// Add drive to drive queue and return
-	RDiskAddDrive(c->drvsts.dQRefNum, drvnum, (DrvQElPtr)&c->drvsts.qLink);
+	RDAddDrive(status->dQRefNum, drvNum, (DrvQElPtr)&status->qLink);
 	return noErr;
 }
 
@@ -99,11 +91,11 @@ static OSErr RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	else { c->init_done = 1; }
 
 	// Read PRAM
-	ReadXPRam(1, 4, &startup);
-	ReadXPRam(1, 5, &ram);
+	RDReadXPRAM(1, 4, &startup);
+	RDReadXPRAM(1, 5, &ram);
 
 	// Either enable ROM disk or remove ourselves from the drive queue
-	if (startup || IsRPressed()) { // 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
 		c->drvsts.writeProt = -1; // Set write protected
 		// Clear RAM disk structure fields (even though we used NewHandleSysClear)
@@ -111,7 +103,7 @@ static OSErr RDiskInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 		c->ramdisk_alloc = NULL;
 		c-> ramdisk_valid = 0;
 		// If RAM disk set in PRAM or A pressed, enable RAM disk
-		if (ram || ISAPressed()) { 
+		if (ram || RDISAPressed()) { 
 			unsigned long minBufPtr, newBufPtr;
 			// Clearing write protect marks RAM disk enabled
 			c->drvsts.writeProt = 0;
diff --git a/rdtraps.h b/rdtraps.h
new file mode 100644
index 0000000..929e2a4
--- /dev/null
+++ b/rdtraps.h
@@ -0,0 +1,13 @@
+#ifndef RDTRAPS_H
+#define RDTRAPS_H
+
+#pragma parameter __D0 RDReadXPRAM(__D0, __D1, __A0)
+OSErr RDReadXPRAM(short numBytes, short whichByte, void *dest) = {0x4840, 0x3001, 0xA051};
+
+#pragma parameter __D0 RDAddDrive(__D1, __D0, __A0)
+OSErr RDAddDrive(short drvrRefNum, short drvNum, DrvQElPtr dq) = {0x4840, 0x3001, 0xA04E};
+
+inline char RDIsRPressed() { return *((char*)0x175) & 0x80; }
+inline char RDISAPressed() { return *((char*)0x174) & 0x01; }
+
+#endif
\ No newline at end of file