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

Code cleanup: #201 use actual floppy drive

Browse Source
This commit is contained in:
michaelangel007 2014-07-28 14:13:40 -07:00
parent 01aab19990
commit 598df5ce9b
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/Frame.cpp
View File

@ -600,6 +600,11 @@ void FrameDrawDiskLEDS( HDC passdc )
//=========================================================================== //===========================================================================
void FrameDrawDiskStatus( HDC passdc ) void FrameDrawDiskStatus( HDC passdc )
{ {
// We use the actual drive since probing from memory doesn't tell us anything we don't already know.
// DOS3.3 ProDOS
// Drive $B7EA $BE3D
// Track $B7EC LC1 $D356
// Sector $B7ED LC1 $D357
int nActiveFloppy = DiskGetCurrentDrive(); int nActiveFloppy = DiskGetCurrentDrive();
int nDisk1Track = DiskGetTrack(0); int nDisk1Track = DiskGetTrack(0);
@ -612,25 +617,23 @@ void FrameDrawDiskStatus( HDC passdc )
// Try DOS3.3 Sector // Try DOS3.3 Sector
if( !isProDOS ) if( !isProDOS )
{ {
int DOS33drive = mem[ 0xB7EA ]; // 1 or 2 int nDOS33track = mem[ 0xB7EC ];
int DOS33sector = mem[ 0xB7ED ]; int nDOS33sector = mem[ 0xB7ED ];
int DOS33track = mem[ 0xB7EC ];
if ((DOS33drive >= 1 && DOS33drive <= 2) if ((nDOS33track >= 0 && nDOS33track < 40)
&& (DOS33track >= 0 && DOS33track < 40) && (nDOS33sector >= 0 && nDOS33sector < 16))
&& (DOS33sector >= 0 && DOS33sector < 16))
{ {
#if _DEBUG && 0 #if _DEBUG && 0
if(DOS33track != nDisk1Track) if (nDOS33track != nDisk1Track)
{ {
char text[128]; char text[128];
sprintf( text, "\n\n\nWARNING: DOS33Track: %d (%02X) != nDisk1Track: %d (%02X)\n\n\n", DOS33track, DOS33track, nDisk1Track, nDisk1Track ); sprintf( text, "\n\n\nWARNING: DOS33Track: %d (%02X) != nDisk1Track: %d (%02X)\n\n\n", nDOS33track, nDOS33track, nDisk1Track, nDisk1Track );
OutputDebugString( text ); OutputDebugString( text );
} }
#endif // _DEBUG #endif // _DEBUG
/**/ if( DOS33drive == 1 ) g_nSectorDrive1 = DOS33sector; /**/ if (nActiveFloppy == 0) g_nSectorDrive1 = nDOS33sector;
else if( DOS33drive == 2 ) g_nSectorDrive2 = DOS33sector; else if (nActiveFloppy == 1) g_nSectorDrive2 = nDOS33sector;
} }
else else
isValid = false; isValid = false;
@ -642,16 +645,14 @@ void FrameDrawDiskStatus( HDC passdc )
// and we need the Language Card RAM // and we need the Language Card RAM
// memrom[ 0xD350 ] = " ERROR\x07\x00" // memrom[ 0xD350 ] = " ERROR\x07\x00"
// T S // T S
int ProDOSdrive = nActiveFloppy + 1; // mem[ 0xBE3D ]; int nProDOStrack = *MemGetMainPtr( 0xC356 ); // LC1 $D356
int ProDOStrack = *MemGetMainPtr( 0xC356 ); // LC1 $D356 int nProDOSsector = *MemGetMainPtr( 0xC357 ); // LC1 $D357
int ProDOSsector = *MemGetMainPtr( 0xC357 ); // LC1 $D357
if ((ProDOSdrive >= 1 && ProDOSdrive <= 2) if ((nProDOStrack >= 0 && nProDOStrack < 40)
&& (ProDOStrack >= 0 && ProDOStrack < 40) && (nProDOSsector >= 0 && nProDOSsector < 16))
&& (ProDOSsector >= 0 && ProDOSsector < 16))
{ {
/**/ if (ProDOSdrive == 1) g_nSectorDrive1 = ProDOSsector; /**/ if (nActiveFloppy == 0) g_nSectorDrive1 = nProDOSsector;
else if (ProDOSdrive == 2) g_nSectorDrive2 = ProDOSsector; else if (nActiveFloppy == 1) g_nSectorDrive2 = nProDOSsector;
} }
else else
isValid = false; isValid = false;