Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace optional pointer with reference in GetCurrentState()

This commit is contained in:
michaelangel007 2023-04-26 19:04:27 -07:00
parent e402746423
commit 3ac17fc8a5
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Debugger/Debug.cpp
View File

@ -3685,7 +3685,7 @@ Update_t CmdDisk (int nArgs)
return HelpLastCommand();
Disk_Status_e eDiskState;
LPCTSTR sDiskState = diskCard.GetCurrentState(&eDiskState);
LPCTSTR sDiskState = diskCard.GetCurrentState(eDiskState);
BYTE nShiftReg = diskCard.GetCurrentShiftReg();
ConsolePrintFormat(

20
source/Disk.cpp
View File

@ -132,12 +132,11 @@ std::string Disk2InterfaceCard::GetCurrentPhaseString(void)
return FormatIntFracString(m_floppyDrive[m_currDrive].m_phasePrecise, true);
}
LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e& eDiskState_)
{
if (m_floppyDrive[m_currDrive].m_disk.m_imagehandle == NULL)
{
if (pDiskState)
*pDiskState = DISK_STATUS_EMPTY;
eDiskState_ = DISK_STATUS_EMPTY;
return "Empty";
}
@ -145,14 +144,12 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
{
if (m_floppyDrive[m_currDrive].m_spinning > 0)
{
if (pDiskState)
*pDiskState = DISK_STATUS_SPIN;
eDiskState_ = DISK_STATUS_SPIN;
return "Off (spinning)";
}
else
{
if (pDiskState)
*pDiskState = DISK_STATUS_OFF;
eDiskState_ = DISK_STATUS_OFF;
return "Off";
}
}
@ -160,14 +157,12 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
{
if (m_floppyDrive[m_currDrive].m_disk.m_bWriteProtected)
{
if (pDiskState)
*pDiskState = DISK_STATUS_PROT;
eDiskState_ = DISK_STATUS_PROT;
return "Writing (write protected)";
}
else
{
if (pDiskState)
*pDiskState = DISK_STATUS_WRITE;
eDiskState_ = DISK_STATUS_WRITE;
return "Writing";
}
}
@ -182,8 +177,7 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
}
else*/
{
if (pDiskState)
*pDiskState = DISK_STATUS_READ;
eDiskState_ = DISK_STATUS_READ;
return "Reading";
}
}

2
source/Disk.h
View File

@ -173,7 +173,7 @@ public:
static std::string FormatIntFracString(float phase, bool hex);
std::string GetCurrentTrackString(void);
std::string GetCurrentPhaseString(void);
LPCTSTR GetCurrentState(Disk_Status_e *pDiskState = NULL);
LPCTSTR GetCurrentState(Disk_Status_e& eDiskState_);
bool UserSelectNewDiskImage(const int drive, LPCSTR pszFilename="");
bool DriveSwap(void);
bool IsDriveConnected(int drive) { return m_floppyDrive[drive].m_isConnected; }