From 93c57dc52b72b0c93655c35cdeb73e64bd94de3e Mon Sep 17 00:00:00 2001 From: michaelangel007 Date: Sat, 15 Apr 2023 11:31:07 -0700 Subject: [PATCH] Cleanup: Alphabetize GetCurrent*() disk helper utility functions --- source/Disk.cpp | 12 +++++++----- source/Disk.h | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/source/Disk.cpp b/source/Disk.cpp index 5deb99a3..8496efdf 100644 --- a/source/Disk.cpp +++ b/source/Disk.cpp @@ -100,13 +100,15 @@ Disk2InterfaceCard::~Disk2InterfaceCard(void) bool Disk2InterfaceCard::GetEnhanceDisk(void) { return m_enhanceDisk; } void Disk2InterfaceCard::SetEnhanceDisk(bool bEnhanceDisk) { m_enhanceDisk = bEnhanceDisk; } -int Disk2InterfaceCard::GetCurrentDrive(void) { return m_currDrive; } -int Disk2InterfaceCard::GetCurrentTrack(void) { return ImagePhaseToTrack(m_floppyDrive[m_currDrive].m_disk.m_imagehandle, m_floppyDrive[m_currDrive].m_phasePrecise, false); } -float Disk2InterfaceCard::GetCurrentPhase(void) { return m_floppyDrive[m_currDrive].m_phasePrecise; } -UINT Disk2InterfaceCard::GetCurrentBitOffset(void) { return m_floppyDrive[m_currDrive].m_disk.m_bitOffset; } +UINT Disk2InterfaceCard::GetCurrentBitOffset (void) { return m_floppyDrive[m_currDrive].m_disk.m_bitOffset; } double Disk2InterfaceCard::GetCurrentExtraCycles(void) { return m_floppyDrive[m_currDrive].m_disk.m_extraCycles; } +float Disk2InterfaceCard::GetCurrentPhase (void) { return m_floppyDrive[m_currDrive].m_phasePrecise; } +int Disk2InterfaceCard::GetCurrentDrive (void) { return m_currDrive; } +BYTE Disk2InterfaceCard::GetCurrentShiftReg (void) { return m_shiftReg; } +int Disk2InterfaceCard::GetCurrentTrack (void) { return ImagePhaseToTrack(m_floppyDrive[m_currDrive].m_disk.m_imagehandle, m_floppyDrive[m_currDrive].m_phasePrecise, false); } + float Disk2InterfaceCard::GetPhase(const int drive) { return m_floppyDrive[drive].m_phasePrecise; } -int Disk2InterfaceCard::GetTrack(const int drive) { return ImagePhaseToTrack(m_floppyDrive[drive].m_disk.m_imagehandle, m_floppyDrive[drive].m_phasePrecise, false); } +int Disk2InterfaceCard::GetTrack(const int drive) { return ImagePhaseToTrack(m_floppyDrive[drive].m_disk.m_imagehandle, m_floppyDrive[drive].m_phasePrecise, false); } std::string Disk2InterfaceCard::FormatIntFracString(float phase, bool hex) { diff --git a/source/Disk.h b/source/Disk.h index 5f7cb164..74c554ba 100644 --- a/source/Disk.h +++ b/source/Disk.h @@ -159,12 +159,15 @@ public: bool IsConditionForFullSpeed(void); void NotifyInvalidImage(const int drive, LPCTSTR pszImageFilename, const ImageError_e Error); - UINT GetCurrentFirmware(void) { return m_is13SectorFirmware ? 13 : 16; } - int GetCurrentDrive(void); - int GetCurrentTrack(void); - float GetCurrentPhase(void); + UINT GetCurrentBitOffset(void); + UINT GetCurrentFirmware(void) { return m_is13SectorFirmware ? 13 : 16; } double GetCurrentExtraCycles(void); + float GetCurrentPhase(void); + int GetCurrentDrive(void); + BYTE GetCurrentShiftReg(void); + int GetCurrentTrack(void); + float GetPhase(const int drive); int GetTrack(const int drive); static std::string FormatIntFracString(float phase, bool hex);