Changeset 2 for trunk

Timestamp:

Mar 25, 2016, 10:24:04 PM (9 years ago)

Author:

chronos

Message:

• Added: Ability to write data with defined byte pattern.

Location:

trunk

Files:

• . (modified) (1 prop)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (9 diffs)
• UProject.pas (modified) (1 diff)

trunk/UFormMain.lfm

@@ -201 +201 @@
     TabOrder = 5
   end
+  object ComboBoxRunMode: TComboBox
+    Left = 17
+    Height = 38
+    Top = 88
+    Width = 247
+    ItemHeight = 0
+    ItemIndex = 0
+    Items.Strings = (
+      'Read test'
+      'Write test'
+    )
+    Style = csDropDownList
+    TabOrder = 6
+    Text = 'Read test'
+  end
+  object Label9: TLabel
+    Left = 286
+    Height = 24
+    Top = 95
+    Width = 121
+    Caption = 'Data pattern:'
+    ParentColor = False
+  end
+  object EditPattern: TEdit
+    Left = 440
+    Height = 34
+    Top = 88
+    Width = 80
+    TabOrder = 7
+    Text = '0xff'
+  end
   object MainMenu1: TMainMenu
     left = 323

trunk/UFormMain.pas

@@ -48 +48 @@
   end;
 
+  TRunMode = (rmRead, rmWrite);
+
   { TDriveScan }
 
@@ -66 +68 @@
     DamagedBlockCount: Integer;
     Drive: string;
+    Mode: TRunMode;
+    WritePattern: Byte;
     function GetElapsedTime: TDateTime;
-    procedure Scan;
+    procedure Run;
     constructor Create;
     destructor Destroy; override;
@@ -93 +97 @@
     ButtonScan1: TButton;
     ButtonScan2: TButton;
+    ComboBoxRunMode: TComboBox;
+    EditPattern: TEdit;
     EditDrive: TEdit;
     Image1: TImage;
@@ -103 +109 @@
     Label7: TLabel;
     Label8: TLabel;
+    Label9: TLabel;
     LabelElapsedTime: TLabel;
     LabelBlockSize: TLabel;
@@ -155 +162 @@
 procedure TScanThread.Execute;
 begin
-  TFormMain(Form).DriveScan.Scan;
+  TFormMain(Form).DriveScan.Run;
 end;
 
@@ -313 +320 @@
 end;
 
-procedure TDriveScan.Scan;
+procedure TDriveScan.Run;
 var
   F: TFileStream;
-  ReadSize: Integer;
+  RealSize: Integer;
   Buffer: array of Byte;
   I: Integer;
@@ -325 +332 @@
   Terminated := False;
   DamagedBlockCount := 0;
-  F := TFileStream.Create(Drive, fmOpenRead);
+  if Mode = rmRead then F := TFileStream.Create(Drive, fmOpenRead)
+    else if Mode = rmWrite then F := TFileStream.Create(Drive, fmOpenReadWrite);
   BlockMap.SectorCount := F.Size div SectorSize;
   BlockMap.Clear;
   SetLength(Buffer, SectorSize);
+  if Mode = rmWrite then
+    FillChar(Buffer[0], Length(Buffer), WritePattern);
   for I := 0 to BlockMap.SectorCount - 1 do begin
     SectorCurrent := I;
@@ -336 +346 @@
 
       if ConfigTest then begin
-        if Random < 0.000001 then ReadSize := 0
-          else ReadSize := SectorSize;
+        if Random < 0.000001 then RealSize := 0
+          else RealSize := SectorSize;
         //Sleep(1);
       end else begin
         F.Position := I * SectorSize;
-        ReadSize := F.Read(Buffer[0], SectorSize);
+        if Mode = rmRead then RealSize := F.Read(Buffer[0], SectorSize)
+          else if Mode = rmWrite then RealSize := F.Write(Buffer[0], SectorSize)
+          else raise Exception.Create('Unknwon run mode');
       end;
     finally
       Lock.Acquire;
     end;
-    if ReadSize <> SectorSize then begin
+    if RealSize <> SectorSize then begin
       BlockMap.Sectors[I] := bsDamaged;
       Inc(DamagedBlockCount);
@@ -416 +428 @@
   DriveScan.SectorSize := Project.SectorSize;
   DriveScan.Terminated := False;
+  DriveScan.Mode := TRunMode(ComboBoxRunMode.ItemIndex);
+  DriveScan.WritePattern := StrToInt(EditPattern.Text);
   ScanThread.Start;
   UpdateInterface;

trunk/UProject.pas

@@ -29 +29 @@
 constructor TProject.Create;
 begin
-  SectorSize := 512;
+  SectorSize := 4096;
 end;