Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 00:17:16 +00:00
Code Issues Projects Releases Wiki Activity

Rename Disk_t to FloppyDisk; and prefix members

Browse Source
This commit is contained in:
tomcw
2019-04-14 16:58:49 +01:00
parent cd62b82af4
commit 1f846fa26f
5 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/DiskFormatTrack.cpp
+10 -10
View File
@@ -82,15 +82,15 @@ void FormatTrack::DriveNotWritingTrack(void)
#endif
}
void FormatTrack::UpdateOnWriteLatch(UINT uSpinNibbleCount, const Disk_t* const pFloppy)
void FormatTrack::UpdateOnWriteLatch(UINT uSpinNibbleCount, const FloppyDisk* const pFloppy)
{
if (pFloppy->bWriteProtected)
if (pFloppy->m_bWriteProtected)
return;
if (m_bmWrittenSectorAddrFields == 0x0000)
{
if (m_WriteTrackStartIndex == (UINT)-1) // waiting for 1st write?
m_WriteTrackStartIndex = pFloppy->byte;
m_WriteTrackStartIndex = pFloppy->m_byte;
return;
}
@@ -106,8 +106,8 @@ void FormatTrack::UpdateOnWriteLatch(UINT uSpinNibbleCount, const Disk_t* const
return;
}
UINT uTrackIndex = pFloppy->byte;
const UINT& kTrackMaxNibbles = pFloppy->nibbles;
UINT uTrackIndex = pFloppy->m_byte;
const UINT& kTrackMaxNibbles = pFloppy->m_nibbles;
// NB. spin in write mode is only max 1-2 bytes
do
@@ -126,7 +126,7 @@ void FormatTrack::UpdateOnWriteLatch(UINT uSpinNibbleCount, const Disk_t* const
while (uSpinNibbleCount--);
}
void FormatTrack::DriveSwitchedToReadMode(Disk_t* const pFloppy)
void FormatTrack::DriveSwitchedToReadMode(FloppyDisk* const pFloppy)
{
if (m_bAddressPrologueIsDOS3_2)
{
@@ -152,10 +152,10 @@ void FormatTrack::DriveSwitchedToReadMode(Disk_t* const pFloppy)
// So need a track size between 0x18B0 (rounding down) and 0x182F
const UINT kShortTrackLen = 0x18B0;
LPBYTE TrackBuffer = pFloppy->trackimage;
const UINT kLongTrackLen = pFloppy->nibbles;
LPBYTE TrackBuffer = pFloppy->m_trackimage;
const UINT kLongTrackLen = pFloppy->m_nibbles;
UINT uWriteTrackEndIndex = pFloppy->byte;
UINT uWriteTrackEndIndex = pFloppy->m_byte;
UINT uWrittenTrackSize = m_WriteTrackHasWrapped ? kLongTrackLen : 0;
if (m_WriteTrackStartIndex <= uWriteTrackEndIndex)
@@ -214,7 +214,7 @@ void FormatTrack::DecodeLatchNibbleRead(BYTE floppylatch)
DecodeLatchNibble(floppylatch, false, false);
}
void FormatTrack::DecodeLatchNibbleWrite(BYTE floppylatch, UINT uSpinNibbleCount, const Disk_t* const pFloppy, bool bIsSyncFF)
void FormatTrack::DecodeLatchNibbleWrite(BYTE floppylatch, UINT uSpinNibbleCount, const FloppyDisk* const pFloppy, bool bIsSyncFF)
{
DecodeLatchNibble(floppylatch, true, bIsSyncFF);
UpdateOnWriteLatch(uSpinNibbleCount, pFloppy);