[#14] Floppy drive access speed-up (Part 26: Fixing uninitialized pre…

…sumption on healthy track structure)
tomas-nestorovic · Dec 31, 2018 · b88de34 · b88de34
1 parent e12d452
commit b88de34
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Main/src/FDD.cpp b/Main/src/FDD.cpp
@@ -1830,7 +1830,7 @@ error:				return LOG_ERROR(::GetLastError());
 							}
 					}
 				}else
-					PresumeHealthyTrackStructure(cyl,head,nSectors,bufferId,gap3);
+					PresumeHealthyTrackStructure(cyl,head,nSectors,bufferId,gap3,fillerByte);
 				// . Track formatted successfully
 				break;
 			}
@@ -2020,7 +2020,7 @@ Utils::Information(buf);}
 		return params.verifyFormattedTracks;
 	}
 
-	TStdWinError CFDD::PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3){
+	TStdWinError CFDD::PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3,BYTE fillerByte){
 		// without formatting it, presumes that given Track contains specified Sectors that are well readable and writeable; returns Windows standard i/o error
 		EXCLUSIVELY_LOCK_THIS_IMAGE();
 		LOG_TRACK_ACTION(cyl,head,_T("TStdWinError CFDD::PresumeHealthyTrackStructure"));
@@ -2029,7 +2029,7 @@ Utils::Information(buf);}
 		// - explicitly setting Track structure
 		TInternalTrack::TSectorInfo *psi=( REFER_TO_TRACK(cyl,head) = new TInternalTrack( this, cyl, head, nSectors, bufferId, (PCINT)gap3 ) )->sectors; // Gap3 = calculate Sector start times from information of this Gap3 and individual Sector lengths
 		for( TSector n=nSectors; n--; psi++ )
-			psi->data=ALLOCATE_SECTOR_DATA(psi->length);
+			psi->data=(PSectorData)::memset( ALLOCATE_SECTOR_DATA(psi->length), fillerByte, psi->length );
 		// - presumption done
 		return ERROR_SUCCESS;
 	}

diff --git a/Main/src/FDD.h b/Main/src/FDD.h
@@ -137,7 +137,7 @@
 		TStdWinError SaveTrack(TCylinder cyl,THead head) override;
 		TStdWinError FormatTrack(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,PCWORD bufferLength,PCFdcStatus bufferFdcStatus,BYTE gap3,BYTE fillerByte);
 		bool RequiresFormattedTracksVerification() const override;
-		TStdWinError PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3) override;
+		TStdWinError PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3,BYTE fillerByte) override;
 		TStdWinError UnformatTrack(TCylinder cyl,THead head);
 		void SetTitle(LPCTSTR) override;
 		void SetPathName(LPCTSTR, BOOL = TRUE) override;

diff --git a/Main/src/Image.cpp b/Main/src/Image.cpp
@@ -579,7 +579,7 @@
 		return false; // verification NOT required by default (but Images abstracting physical drives can override this setting)
 	}
 
-	TStdWinError CImage::PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3){
+	TStdWinError CImage::PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3,BYTE fillerByte){
 		// without formatting it, presumes that given Track contains Sectors with specified parameters; returns Windows standard i/o error
 		return ERROR_NOT_SUPPORTED; // each Track by default must be explicitly formatted to be sure about its structure (but Images abstracting physical drives can override this setting)
 	}

diff --git a/Main/src/Image.h b/Main/src/Image.h
@@ -239,7 +239,7 @@
 		virtual TStdWinError SaveTrack(TCylinder cyl,THead head);
 		virtual TStdWinError FormatTrack(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,PCWORD bufferLength,PCFdcStatus bufferFdcStatus,BYTE gap3,BYTE fillerByte)=0;
 		virtual bool RequiresFormattedTracksVerification() const;
-		virtual TStdWinError PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3);
+		virtual TStdWinError PresumeHealthyTrackStructure(TCylinder cyl,THead head,TSector nSectors,PCSectorId bufferId,BYTE gap3,BYTE fillerByte);
 		virtual TStdWinError UnformatTrack(TCylinder cyl,THead head)=0;
 		bool __reportWriteProtection__() const;
 		void __toggleWriteProtection__();

diff --git a/Main/src/Image_Dump.cpp b/Main/src/Image_Dump.cpp
@@ -401,7 +401,7 @@
 								dp.gap3.valueValid=true; // ... then the Gap3 Value found valid and can be used as a reference value for working with the Target Image
 							}
 					}
-					if (dp.target->PresumeHealthyTrackStructure(p.chs.cylinder,p.chs.head,nSectors,bufferId,dp.gap3.value)!=ERROR_SUCCESS)
+					if (dp.target->PresumeHealthyTrackStructure(p.chs.cylinder,p.chs.head,nSectors,bufferId,dp.gap3.value,dp.fillerByte)!=ERROR_SUCCESS)
 						goto reformatTrack;
 				}else
 reformatTrack:		if ( err=dp.target->FormatTrack(p.chs.cylinder,p.chs.head,nSectors,bufferId,bufferLength,bufferFdcStatus,dp.gap3.value,dp.fillerByte) )