[#57] Support for KryoFlux and associated images (Part 189: Improved …

…retrieval of internal track representations)
tomas-nestorovic · Dec 19, 2023 · 6928429 · 6928429
1 parent 078b7ee
commit 6928429
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Main/src/CapsBase.cpp b/Main/src/CapsBase.cpp
@@ -636,9 +636,7 @@
 	bool CCapsBase::IsTrackScanned(TCylinder cyl,THead head) const{
 		// True <=> Track exists and has already been scanned, otherwise False
 		EXCLUSIVELY_LOCK_THIS_IMAGE();
-		return	cyl<FDD_CYLINDERS_MAX && head<2
-				&&
-				internalTracks[cyl][head]!=nullptr;
+		return GetInternalTrackSafe(cyl,head)!=nullptr;
 	}
 
 	TStdWinError CCapsBase::UnscanTrack(TCylinder cyl,THead head){
@@ -755,7 +753,7 @@
 
 	Revolution::TType CCapsBase::GetDirtyRevolution(RCPhysicalAddress chs,BYTE nSectorsToSkip) const{
 		// returns the Revolution that has been marked as "dirty"
-		if (const PCInternalTrack pit=internalTracks[chs.cylinder][chs.head]){
+		if (const PCInternalTrack pit=GetInternalTrackSafe(chs.cylinder,chs.head)){
 			while (nSectorsToSkip<pit->nSectors){
 				const auto &ris=pit->sectors[nSectorsToSkip++];
 				if (ris.id==chs.sectorId)

diff --git a/Main/src/CapsBase.h b/Main/src/CapsBase.h
@@ -186,6 +186,7 @@
 		virtual TStdWinError UploadFirmware();
 		virtual TStdWinError UploadTrack(TCylinder cyl,THead head,CTrackReader tr) const;
 		void WarnOnAndCorrectExceedingCylinders();
+		PInternalTrack GetInternalTrackSafe(TCylinder cyl,THead head) const;
 		void DestroyAllTracks();
 		TStdWinError VerifyTrack(TCylinder cyl,THead head,const CTrackReaderWriter &trwWritten,bool showDiff,std::unique_ptr<CTrackReaderWriter> *ppOutReadTrack,const volatile bool &cancelled) const;
 		TStdWinError DetermineMagneticReliabilityByWriting(Medium::TType floppyType,TCylinder cyl,THead head,const volatile bool &cancelled) const;

diff --git a/Main/src/SCP.cpp b/Main/src/SCP.cpp
@@ -89,8 +89,8 @@ formatError: ::SetLastError(ERROR_BAD_FORMAT);
 		return TRUE;
 	}
 
-	CCapsBase::PInternalTrack CSCP::GetInternalTrackSafe(TCylinder cyl,THead head) const{
-		return	cyl<FDD_CYLINDERS_MAX
+	CCapsBase::PInternalTrack CCapsBase::GetInternalTrackSafe(TCylinder cyl,THead head) const{
+		return	cyl<FDD_CYLINDERS_MAX && head<2
 				? internalTracks[cyl][head]
 				: nullptr; // Cylinders beyond FDD_CYLINDERS_MAX are inaccessible
 	}

diff --git a/Main/src/SCP.h b/Main/src/SCP.h
@@ -6,7 +6,6 @@
 
 		DWORD tdhOffsets[84][2]; // Track Data Header offsets
 
-		PInternalTrack GetInternalTrackSafe(TCylinder cyl,THead head) const;
 		TStdWinError SaveAllModifiedTracks(LPCTSTR lpszPathName,CActionProgress &ap) override;
 	public:
 		static const TProperties Properties;