Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-26 16:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup GetCurrentState()

Browse Source
This commit is contained in:
michaelangel007 2023-04-26 22:09:27 -07:00
parent ba1dc880e5
commit 69bb9f9fff
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/Disk.cpp
View File

@ -137,20 +137,17 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e& eDiskState_)
if (m_floppyDrive[m_currDrive].m_disk.m_imagehandle == NULL) if (m_floppyDrive[m_currDrive].m_disk.m_imagehandle == NULL)
{ {
eDiskState_ = DISK_STATUS_EMPTY; eDiskState_ = DISK_STATUS_EMPTY;
return "Empty";
} }
else
if (!m_floppyMotorOn) if (!m_floppyMotorOn)
{ {
if (m_floppyDrive[m_currDrive].m_spinning > 0) if (m_floppyDrive[m_currDrive].m_spinning > 0)
{ {
eDiskState_ = DISK_STATUS_SPIN; eDiskState_ = DISK_STATUS_SPIN;
return "Off (spinning)";
} }
else else
{ {
eDiskState_ = DISK_STATUS_OFF; eDiskState_ = DISK_STATUS_OFF;
return "Off";
} }
} }
else if (m_seqFunc.writeMode) else if (m_seqFunc.writeMode)
@ -158,12 +155,10 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e& eDiskState_)
if (m_floppyDrive[m_currDrive].m_disk.m_bWriteProtected) if (m_floppyDrive[m_currDrive].m_disk.m_bWriteProtected)
{ {
eDiskState_ = DISK_STATUS_PROT; eDiskState_ = DISK_STATUS_PROT;
return "Writing (write protected)";
} }
else else
{ {
eDiskState_ = DISK_STATUS_WRITE; eDiskState_ = DISK_STATUS_WRITE;
return "Writing";
} }
} }
else else
@ -178,9 +173,19 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e& eDiskState_)
else*/ else*/
{ {
eDiskState_ = DISK_STATUS_READ; eDiskState_ = DISK_STATUS_READ;
return "Reading";
} }
} }
static const char *aDiskStateLongDesc[NUM_DISK_STATUS] =
{
"Off" // DISK_STATUS_OFF
,"Reading" // DISK_STATUS_READ
,"Writing" // DISK_STATUS_WRITE
,"Writing (write protected)" // DISK_STATUS_PROT
,"Empty" // DISK_STATUS_EMPTY
,"Off (spinning)" // DISK_STATUS_SPIN
};
return aDiskStateLongDesc[eDiskState_];
} }
//=========================================================================== //===========================================================================