From 24fed429fc4c65414e409ea4a1268a5e94d5950e Mon Sep 17 00:00:00 2001 From: Zane Kaminski Date: Mon, 16 Aug 2021 18:06:03 -0400 Subject: [PATCH] Removed "RDisk" prefix on some methods --- rdisk.c | 4 ++-- rdisk.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rdisk.c b/rdisk.c index c01f69c..eb5a83d 100644 --- a/rdisk.c +++ b/rdisk.c @@ -14,8 +14,8 @@ static void RDDecodeSettings(Ptr unmountEN, Ptr mountEN, Ptr ramEN, Ptr dbgEN, P char r = 0, a = 0; long tmax = TickCount() + 60; for (long i = 0; i < 1000000; i++) { - a |= RDiskIsAPressed(); - r |= RDiskIsRPressed() | a; + a |= IsAPressed(); + r |= IsRPressed() | a; if (r) { break; } if (TickCount() > tmax) { break; } } diff --git a/rdisk.h b/rdisk.h index cb98c2c..01638cf 100644 --- a/rdisk.h +++ b/rdisk.h @@ -20,8 +20,8 @@ OSErr RDiskReadXPRAM(short numBytes, short whichByte, Ptr dest) = {0x4840, 0x300 #pragma parameter __D0 RDiskAddDrive(__D1, __D0, __A0) OSErr RDiskAddDrive(short drvrRefNum, short drvNum, DrvQElPtr dq) = {0x4840, 0x3001, 0xA04E}; -static inline char RDiskIsRPressed() { return *((volatile char*)0x175) & 0x80; } -static inline char RDiskIsAPressed() { return *((volatile char*)0x174) & 0x01; } +static inline char IsAPressed() { return *((volatile char*)0x174) & 0x01; } +static inline char IsRPressed() { return *((volatile char*)0x175) & 0x80; } #define RDISK_ICON_SIZE (285) typedef struct RDiskStorage_s {