Improved PCE Sector Image (.psi) support

Digitoxin1 · Digitoxin1 · commit 169e98bd5689 · 2024-11-09T22:01:09.000-05:00
diff --git a/DiskImageTool/Bitstream/Functions.vb b/DiskImageTool/Bitstream/Functions.vb
@@ -15,7 +15,7 @@ Namespace Bitstream
                     If BitstreamTrack IsNot Nothing AndAlso BitstreamTrack.MFMData IsNot Nothing Then
                         For Each MFMSector In BitstreamTrack.MFMData.Sectors
                             If MFMSector.DAMFound Then
-                                If MFMSector.InitialChecksumValid Then
+                                If MFMSector.InitialDataChecksumValid Then
                                     OutputBuffer = New Byte(MFMSector.Data.Length - 1) {}
                                     HashAlgorithm.TransformBlock(MFMSector.Data, 0, MFMSector.Data.Length, OutputBuffer, 0)
                                 End If
diff --git a/DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Sector.vb b/DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Sector.vb
@@ -4,7 +4,8 @@
             Private ReadOnly _Bitstream As BitArray
             Private ReadOnly _IDArea() As Byte
             Private ReadOnly _IDChecksum As UShort
-            Private ReadOnly _InitialChecksumValid As Boolean
+            Private ReadOnly _IDChecksumValid As Boolean
+            Private ReadOnly _InitialDataChecksumValid As Boolean
             Private ReadOnly _Offset As UInteger
             Private _DAMFound As Boolean = False
             Private _Data As Byte()
@@ -27,7 +28,8 @@
 
                 ProcessGap3(Bitstream, DataOffset)
 
-                _InitialChecksumValid = (_DataChecksum = CalculateDataChecksum())
+                _InitialDataChecksumValid = (_DataChecksum = CalculateDataChecksum())
+                _IDChecksumValid = (_IDChecksum = CalculateIDChecksum())
             End Sub
 
             Public ReadOnly Property DAM As MFMAddressMark
@@ -81,9 +83,15 @@
                 End Get
             End Property
 
-            Public ReadOnly Property InitialChecksumValid As Boolean
+            Public ReadOnly Property IDChecksumValid As Boolean
                 Get
-                    Return _InitialChecksumValid
+                    Return _IDChecksumValid
+                End Get
+            End Property
+
+            Public ReadOnly Property InitialDataChecksumValid As Boolean
+                Get
+                    Return _InitialDataChecksumValid
                 End Get
             End Property
 
diff --git a/DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Tools.vb b/DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Tools.vb
@@ -604,7 +604,7 @@
             End Function
 
             Public Function IsStandardSector(Sector As IBM_MFM_Sector, Track As Byte, Side As Byte) As Boolean
-                If Not Sector.InitialChecksumValid Then
+                If Not Sector.InitialDataChecksumValid Or Not Sector.IDChecksumValid Then
                     Return False
                 End If
 
@@ -620,7 +620,7 @@
                     Return False
                 End If
 
-                If Sector.DAM <> MFMAddressMark.Data Then
+                If Not Sector.DAMFound Or Sector.DAM <> MFMAddressMark.Data Then
                     Return False
                 End If
 
diff --git a/DiskImageTool/DiskImageTool.vbproj b/DiskImageTool/DiskImageTool.vbproj
@@ -30,7 +30,7 @@
     <TargetCulture>en-US</TargetCulture>
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>2.6.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/DiskImageTool/ImageFormats/ImageConversion.vb b/DiskImageTool/ImageFormats/ImageConversion.vb
@@ -366,7 +366,7 @@ Namespace ImageFormats
                             If Sector.DAMFound Then
                                 IMDSector.Unavailable = False
                                 IMDSector.Data = Sector.Data
-                                IMDSector.ChecksumError = Not Sector.InitialChecksumValid
+                                IMDSector.ChecksumError = Not Sector.InitialDataChecksumValid
                                 IMDSector.Deleted = (Sector.DAM = MFMAddressMark.DeletedData)
                             Else
                                 IMDSector.Unavailable = True
@@ -461,6 +461,7 @@ Namespace ImageFormats
             PSI.Header.FormatVersion = 0
 
             For Track = 0 To TrackCount - 1 Step Image.TrackStep
+                Dim NewTrack = Track \ Image.TrackStep
                 For Side = 0 To Image.SideCount - 1
                     BitstreamTrack = Image.GetTrack(Track, Side)
 
@@ -472,7 +473,7 @@ Namespace ImageFormats
                         End If
 
                         For Each Sector In BitstreamTrack.MFMData.Sectors
-                            Dim PSISector = PSISectorFromMFMSector(Sector)
+                            Dim PSISector = PSISectorFromMFMSector(NewTrack, Side, Sector, TrackFormat)
 
                             If BitstreamTrack.SurfaceData IsNot Nothing Then
                                 Dim Buffer = MFMGetBytes(BitstreamTrack.SurfaceData, Sector.DataOffset, Sector.Data.Length)
@@ -716,6 +717,22 @@ Namespace ImageFormats
             Return (Track * Params.NumberOfHeads * Params.SectorsPerTrack + Params.SectorsPerTrack * Side + (SectorId - 1)) * Params.BytesPerSector
         End Function
 
+        Private Function GETPSIEncodingSubType(TrackFormat As MFMTrackFormat) As PSI.MFMEncodingSubtype
+            Select Case TrackFormat
+                Case MFMTrackFormat.TrackFormatDD
+                    Return PSI.MFMEncodingSubtype.DoubleDensity
+                Case MFMTrackFormat.TrackFormatHD
+                    Return PSI.MFMEncodingSubtype.HighDensity
+                Case MFMTrackFormat.TrackFormatHD1200
+                    Return PSI.MFMEncodingSubtype.HighDensity
+                Case MFMTrackFormat.TrackFormatED
+                    Return PSI.MFMEncodingSubtype.ExtraDensity
+                Case Else
+                    Return PSI.MFMEncodingSubtype.DoubleDensity
+            End Select
+
+        End Function
+
         Private Function GetPSISectorFormat(TrackFormat As MFMTrackFormat) As PSI.DefaultSectorFormat
             Select Case TrackFormat
                 Case MFMTrackFormat.TrackFormatDD
@@ -817,19 +834,36 @@ Namespace ImageFormats
             Return MFMBitstream
         End Function
 
-        Private Function PSISectorFromMFMSector(Sector As IBM_MFM_Sector) As PSI.PSISector
-            Dim DataChecksumValid = Sector.DataChecksum = Sector.CalculateDataChecksum
+        Private Function PSISectorFromMFMSector(Track As UShort, Side As Byte, Sector As IBM_MFM_Sector, TrackFormat As MFMTrackFormat) As PSI.PSISector
+            Dim DataFieldCRCError = Sector.DataChecksum <> Sector.CalculateDataChecksum
+            Dim IDFieldCRCError = Sector.IDChecksum <> Sector.CalculateIDChecksum
+            Dim DeletedDAM = Sector.DAM = MFMAddressMark.DeletedData
+            Dim MissingDAM = Not Sector.DAMFound
 
             Dim PSISector = New PSI.PSISector With {
-                   .HasDataCRCError = Not DataChecksumValid,
-                   .IsAlternateSector = False,
-                   .Track = Sector.Track,
-                   .Side = Sector.Side,
-                   .Sector = Sector.SectorId,
-                   .Data = Sector.Data,
-                   .Offset = (Sector.Offset + 64) / 2
+                .HasDataCRCError = DataFieldCRCError,
+                .IsAlternateSector = False,
+                .Track = Track,
+                .Side = Side,
+                .Sector = Sector.SectorId,
+                .Data = Sector.Data,
+                .Offset = (Sector.Offset + 64) / 2
+            }
+            If Sector.Track <> Track Or Sector.Side <> Side Or DeletedDAM Or MissingDAM Or IDFieldCRCError Then
+                PSISector.MFMHeader = New PSI.IBMSectorHeader With {
+                    .Cylinder = Sector.Track,
+                    .Head = Sector.Side,
+                    .Sector = Sector.SectorId,
+                    .Size = Sector.Size,
+                    .EncodingSubType = GETPSIEncodingSubType(TrackFormat),
+                    .IDFieldCRCError = IDFieldCRCError,
+                    .DataFieldCRCError = DataFieldCRCError,
+                    .DeletedDAM = DeletedDAM,
+                    .MissingDAM = MissingDAM
                 }
 
+            End If
+
             Return PSISector
         End Function
 
diff --git a/DiskImageTool/ImageFormats/PSI/IBMSectorHeader.vb b/DiskImageTool/ImageFormats/PSI/IBMSectorHeader.vb
@@ -26,6 +26,24 @@
                 End Set
             End Property
 
+            Public Property DataFieldCRCError() As Boolean
+                Get
+                    Return (Flags And MFMSectorFlags.DataFieldCRCError) > 0
+                End Get
+                Set(value As Boolean)
+                    Flags = MyBitConverter.ToggleBit(Flags, MFMSectorFlags.DataFieldCRCError, value)
+                End Set
+            End Property
+
+            Public Property DeletedDAM() As Boolean
+                Get
+                    Return (Flags And MFMSectorFlags.DeletedDAM) > 0
+                End Get
+                Set(value As Boolean)
+                    Flags = MyBitConverter.ToggleBit(Flags, MFMSectorFlags.DeletedDAM, value)
+                End Set
+            End Property
+
             Public Property EncodingSubType As MFMEncodingSubtype
                 Get
                     Return _ChunkData(5)
@@ -53,6 +71,24 @@
                 End Set
             End Property
 
+            Public Property IDFieldCRCError() As Boolean
+                Get
+                    Return (Flags And MFMSectorFlags.IDFieldCRCError) > 0
+                End Get
+                Set(value As Boolean)
+                    Flags = MyBitConverter.ToggleBit(Flags, MFMSectorFlags.IDFieldCRCError, value)
+                End Set
+            End Property
+
+            Public Property MissingDAM() As Boolean
+                Get
+                    Return (Flags And MFMSectorFlags.MissingDAM) > 0
+                End Get
+                Set(value As Boolean)
+                    Flags = MyBitConverter.ToggleBit(Flags, MFMSectorFlags.MissingDAM, value)
+                End Set
+            End Property
+
             Public Property Sector As Byte
                 Get
                     Return _ChunkData(2)
diff --git a/DiskImageTool/ImageFormats/PSI/PSIFloppyImage.vb b/DiskImageTool/ImageFormats/PSI/PSIFloppyImage.vb
@@ -98,7 +98,7 @@ Namespace ImageFormats
                         End If
 
                         If PSISector.Sector >= 1 And PSISector.Sector <= SECTOR_COUNT Then
-                            Dim IsStandard = (PSISector.Size = 512 And Not PSISector.HasDataCRCError And PSISector.Sector <= MaxSectors)
+                            Dim IsStandard = IsStandardSector(PSISector, MaxSectors)
                             If IsStandard Then
                                 Dim BitstreamSector As New BitstreamSector(PSISector.Data, PSISector.Size) With {
                                     .IsStandard = IsStandard
@@ -115,6 +115,36 @@ Namespace ImageFormats
                 Next
             End Sub
 
+            Private Function IsStandardSector(PSISector As PSISector, MaxSectors As UShort) As Boolean
+                If PSISector.Sector > MaxSectors Then
+                    Return False
+                End If
+
+                If PSISector.Size <> 512 Then
+                    Return False
+                End If
+
+                If PSISector.HasDataCRCError Then
+                    Return False
+                End If
+
+                If PSISector.MFMHeader IsNot Nothing Then
+                    If PSISector.MFMHeader.Cylinder <> PSISector.Track Then
+                        Return False
+                    End If
+
+                    If PSISector.MFMHeader.Head <> PSISector.Side Then
+                        Return False
+                    End If
+
+                    If PSISector.MFMHeader.DeletedDAM Or PSISector.MFMHeader.MissingDAM Or PSISector.MFMHeader.IDFieldCRCError Or PSISector.MFMHeader.DataFieldCRCError Then
+                        Return False
+                    End If
+                End If
+
+                Return True
+            End Function
+
             Private Function CalculateHash(HashAlgorithm As HashAlgorithm) As String
                 Dim OutputBuffer() As Byte
 
diff --git a/DiskImageTool/MainForm.vb b/DiskImageTool/MainForm.vb
@@ -3160,18 +3160,23 @@ Public Class MainForm
                     i += 1
                 Next
 
-                Array.Sort(TrackList)
+                If TrackList.Length <= 30 Then
+                    Array.Sort(TrackList)
 
-                MenuRawTrackDataSubMenuItemAdd(-1, "All Tracks")
+                    MenuRawTrackDataSubMenuItemAdd(-1, "All Tracks")
 
-                For i = 0 To TrackList.Length - 1
-                    Dim Track = TrackList(i)
-                    Dim TrackString = "Track " & (Track \ Disk.Image.SideCount) & "." & (Track Mod Disk.Image.SideCount)
-                    MenuRawTrackDataSubMenuItemAdd(Track, TrackString)
-                Next
+                    For i = 0 To TrackList.Length - 1
+                        Dim Track = TrackList(i)
+                        Dim TrackString = "Track " & (Track \ Disk.Image.SideCount) & "." & (Track Mod Disk.Image.SideCount)
+                        MenuRawTrackDataSubMenuItemAdd(Track, TrackString)
+                    Next
 
-                MenuHexRawTrackData.Enabled = True
-                MenuHexRawTrackData.Tag = Nothing
+                    MenuHexRawTrackData.Enabled = True
+                    MenuHexRawTrackData.Tag = Nothing
+                Else
+                    MenuHexRawTrackData.Enabled = True
+                    MenuHexRawTrackData.Tag = -1
+                End If
             Else
                 MenuHexRawTrackData.Enabled = True
                 MenuHexRawTrackData.Tag = -1
diff --git a/DiskImageTool/My Project/AssemblyInfo.vb b/DiskImageTool/My Project/AssemblyInfo.vb
@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("2.6.0.0")>
+<Assembly: AssemblyFileVersion("2.6.0.1")>
