Improvements to the Boot Sector editor

Author: Digitoxin1

DiskImageTool/DiskImage/Functions.vb

@@ -25,6 +25,20 @@ Namespace DiskImage
 
         Private CodePage437ReverseLookupTable As Dictionary(Of UShort, Byte)
 
+        Public Enum FloppyDiskType
+            FloppyUnknown = 0
+            Floppy160 = 1
+            Floppy180 = 2
+            Floppy320 = 3
+            Floppy360 = 4
+            Floppy720 = 5
+            Floppy1200 = 6
+            Floppy1440 = 7
+            Floppy2880 = 8
+            FloppyDMF1024 = 9
+            FloppyDMF2048 = 10
+        End Enum
+
         Public Function BootSectorDescription(Offset As DiskImage.BootSector.BootSectorOffsets) As String
             Select Case Offset
                 Case DiskImage.BootSector.BootSectorOffsets.JmpBoot
@@ -72,13 +86,13 @@ Namespace DiskImage
             End Select
         End Function
 
-        Public Function BuildBootSectorFromFileSize(Size As Integer) As BootSector
+        Public Function BuildBootSectorFromType(Type As FloppyDiskType) As BootSector
             Dim Data(511) As Byte
             Dim FileBytes As New ImageByteArray(Data)
             Dim BootSector = New BootSector(FileBytes)
 
-            Select Case Size
-                Case 163840
+            Select Case Type
+                Case FloppyDiskType.Floppy160
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HFE
                     BootSector.NumberOfFATs = 2
@@ -89,7 +103,8 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 1
                     BootSector.SectorsPerFAT = 1
                     BootSector.SectorsPerTrack = 8
-                Case 184320
+
+                Case FloppyDiskType.Floppy180
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HFC
                     BootSector.NumberOfFATs = 2
@@ -100,7 +115,8 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 1
                     BootSector.SectorsPerFAT = 1
                     BootSector.SectorsPerTrack = 9
-                Case 327680
+
+                Case FloppyDiskType.Floppy320
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HFF
                     BootSector.NumberOfFATs = 2
@@ -111,7 +127,8 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 2
                     BootSector.SectorsPerFAT = 1
                     BootSector.SectorsPerTrack = 8
-                Case 368640
+
+                Case FloppyDiskType.Floppy360
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HFD
                     BootSector.NumberOfFATs = 2
@@ -122,7 +139,8 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 2
                     BootSector.SectorsPerFAT = 2
                     BootSector.SectorsPerTrack = 9
-                Case 737280
+
+                Case FloppyDiskType.Floppy720
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HF9
                     BootSector.NumberOfFATs = 2
@@ -133,7 +151,8 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 2
                     BootSector.SectorsPerFAT = 3
                     BootSector.SectorsPerTrack = 9
-                Case 1228800
+
+                Case FloppyDiskType.Floppy1200
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HF9
                     BootSector.NumberOfFATs = 2
@@ -144,7 +163,8 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 1
                     BootSector.SectorsPerFAT = 7
                     BootSector.SectorsPerTrack = 15
-                Case 1474560
+
+                Case FloppyDiskType.Floppy1440
                     BootSector.BytesPerSector = 512
                     BootSector.MediaDescriptor = &HF0
                     BootSector.NumberOfFATs = 2
@@ -155,11 +175,72 @@ Namespace DiskImage
                     BootSector.SectorsPerCluster = 1
                     BootSector.SectorsPerFAT = 9
                     BootSector.SectorsPerTrack = 18
+
+                Case FloppyDiskType.FloppyDMF1024
+                    BootSector.BytesPerSector = 512
+                    BootSector.MediaDescriptor = &HF0
+                    BootSector.NumberOfFATs = 2
+                    BootSector.NumberOfHeads = 2
+                    BootSector.ReservedSectorCount = 1
+                    BootSector.RootEntryCount = 16
+                    BootSector.SectorCountSmall = 3360
+                    BootSector.SectorsPerCluster = 2
+                    BootSector.SectorsPerFAT = 5
+                    BootSector.SectorsPerTrack = 21
+
+                Case FloppyDiskType.FloppyDMF2048
+                    BootSector.BytesPerSector = 512
+                    BootSector.MediaDescriptor = &HF0
+                    BootSector.NumberOfFATs = 2
+                    BootSector.NumberOfHeads = 2
+                    BootSector.ReservedSectorCount = 1
+                    BootSector.RootEntryCount = 16
+                    BootSector.SectorCountSmall = 3360
+                    BootSector.SectorsPerCluster = 4
+                    BootSector.SectorsPerFAT = 3
+                    BootSector.SectorsPerTrack = 21
+
+                Case FloppyDiskType.Floppy2880
+                    BootSector.BytesPerSector = 512
+                    BootSector.MediaDescriptor = &HF0
+                    BootSector.NumberOfFATs = 2
+                    BootSector.NumberOfHeads = 2
+                    BootSector.ReservedSectorCount = 1
+                    BootSector.RootEntryCount = 240
+                    BootSector.SectorCountSmall = 5760
+                    BootSector.SectorsPerCluster = 2
+                    BootSector.SectorsPerFAT = 9
+                    BootSector.SectorsPerTrack = 36
             End Select
 
             Return BootSector
         End Function
 
+        Public Function GetFloppyDiskType(Size As Integer) As FloppyDiskType
+            Select Case Size
+                Case 163840
+                    Return FloppyDiskType.Floppy160
+                Case 184320
+                    Return FloppyDiskType.Floppy180
+                Case 327680
+                    Return FloppyDiskType.Floppy320
+                Case 368640
+                    Return FloppyDiskType.Floppy360
+                Case 737280
+                    Return FloppyDiskType.Floppy720
+                Case 1228800
+                    Return FloppyDiskType.Floppy1200
+                Case 1474560
+                    Return FloppyDiskType.Floppy1440
+                Case 1720320
+                    Return FloppyDiskType.FloppyDMF2048
+                Case 2949120
+                    Return FloppyDiskType.Floppy2880
+                Case Else
+                    Return FloppyDiskType.FloppyUnknown
+            End Select
+        End Function
+
         Public Function BytesToSector(Bytes As UInteger) As UInteger
             Return Math.Ceiling(Bytes / BYTES_PER_SECTOR)
         End Function

DiskImageTool/DiskImageTool.vbproj

@@ -30,7 +30,7 @@
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.26.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.27.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

DiskImageTool/Forms/BootSectorForm.Designer.vb

@@ -46,7 +46,9 @@ Public Class BootSectorForm
             & vbCrLf & "360K Floppy" & vbTab & "2" _
             & vbCrLf & "720K Floppy" & vbTab & "2" _
             & vbCrLf & "1.2M Floppy" & vbTab & "1" _
-            & vbCrLf & "1.44M Floppy" & vbTab & "1"
+            & vbCrLf & "1.44M Floppy" & vbTab & "1" _
+            & vbCrLf & "2.88M Floppy" & vbTab & "2" _
+            & vbCrLf & "DMF Floppy" & vbTab & "2 or 4"
         SetHelpString(Msg, LblSectorsPerCluster, CboSectorsPerCluster)
 
         Msg = "Number of reserved sectors in the reserved region of the volume starting at the first sector of the volume" _
@@ -68,7 +70,9 @@ Public Class BootSectorForm
             & vbCrLf & "360K Floppy" & vbTab & "112" _
             & vbCrLf & "720K Floppy" & vbTab & "112" _
             & vbCrLf & "1.2M Floppy" & vbTab & "224" _
-            & vbCrLf & "1.44M Floppy" & vbTab & "224"
+            & vbCrLf & "1.44M Floppy" & vbTab & "224" _
+            & vbCrLf & "2.88M Floppy" & vbTab & "240" _
+            & vbCrLf & "DMF Floppy" & vbTab & "16"
         SetHelpString(Msg, LblRootDirectoryEntries, TxtRootDirectoryEntries)
 
         Msg = "Total number of sectors in the volume" _
@@ -79,12 +83,14 @@ Public Class BootSectorForm
             & vbCrLf & "360K Floppy" & vbTab & "720" _
             & vbCrLf & "720K Floppy" & vbTab & "1440" _
             & vbCrLf & "1.2M Floppy" & vbTab & "2400" _
-            & vbCrLf & "1.44M Floppy" & vbTab & "2880"
+            & vbCrLf & "1.44M Floppy" & vbTab & "2880" _
+            & vbCrLf & "2.88M Floppy" & vbTab & "5760" _
+            & vbCrLf & "DMF Floppy" & vbTab & "3360"
         SetHelpString(Msg, LblSectorCountSmall, TxtSectorCountSmall)
 
         Msg = "Media Descriptor" _
             & vbCrLf & vbCrLf & "Allowed Values:" _
-            & vbCrLf & "F0" & vbTab & "1.44M & 2.88M Floppy" _
+            & vbCrLf & "F0" & vbTab & "1.44M, 2.88M, DMF Floppy" _
             & vbCrLf & "F8" & vbTab & "Fixed Disk" _
             & vbCrLf & "F9" & vbTab & "720K & 1.2M Floppy" _
             & vbCrLf & "FA" & vbTab & "Unused" _
@@ -103,7 +109,9 @@ Public Class BootSectorForm
             & vbCrLf & "360K Floppy" & vbTab & "2" _
             & vbCrLf & "720K Floppy" & vbTab & "3" _
             & vbCrLf & "1.2M Floppy" & vbTab & "7" _
-            & vbCrLf & "1.44M Floppy" & vbTab & "9"
+            & vbCrLf & "1.44M Floppy" & vbTab & "9" _
+            & vbCrLf & "2.88M Floppy" & vbTab & "9" _
+            & vbCrLf & "DMF Floppy" & vbTab & "3 or 5"
         SetHelpString(Msg, LblSectorsPerFAT, TxtSectorsPerFAT)
 
         Msg = "Number of sectors per track on the disk" _
@@ -114,7 +122,9 @@ Public Class BootSectorForm
             & vbCrLf & "360K Floppy" & vbTab & "9" _
             & vbCrLf & "720K Floppy" & vbTab & "9" _
             & vbCrLf & "1.2M Floppy" & vbTab & "15" _
-            & vbCrLf & "1.44M Floppy" & vbTab & "18"
+            & vbCrLf & "1.44M Floppy" & vbTab & "18" _
+            & vbCrLf & "2.88M Floppy" & vbTab & "36" _
+            & vbCrLf & "DMF Floppy" & vbTab & "21"
         SetHelpString(Msg, LblSectorsPerTrack, TxtSectorsPerTrack)
 
         Msg = "Number of physical heads (sides) on the disk" _
@@ -125,7 +135,9 @@ Public Class BootSectorForm
             & vbCrLf & "360K Floppy" & vbTab & "2" _
             & vbCrLf & "720K Floppy" & vbTab & "2" _
             & vbCrLf & "1.2M Floppy" & vbTab & "2" _
-            & vbCrLf & "1.44M Floppy" & vbTab & "2"
+            & vbCrLf & "1.44M Floppy" & vbTab & "2" _
+            & vbCrLf & "2.88M Floppy" & vbTab & "2" _
+            & vbCrLf & "DMF Floppy" & vbTab & "2"
         SetHelpString(Msg, LblNumberOfHeads, TxtNumberOfHeads)
 
         Msg = "Number of sectors preceeding the first sector of a partitioned volume" _
@@ -173,7 +185,6 @@ Public Class BootSectorForm
         Dim Result As Boolean = True
 
         For Each value In b
-            Debug.Print(value)
             If value <> 0 Then
                 Result = False
                 Exit For
@@ -249,7 +260,7 @@ Public Class BootSectorForm
         SetValue(TxtSectorCountSmall, BootSector.SectorCountSmall)
         SetValue(HexMediaDescriptor, BootSector.MediaDescriptor.ToString("X2"), Array.ConvertAll(BootSector.ValidMediaDescriptor, Function(x) x.ToString("X2")))
         SetValue(TxtSectorsPerFAT, BootSector.SectorsPerFAT)
-        SetValue(TxtSectorsPerTrack, BootSector.SectorsPerTrack, {"8", "9", "15", "18"})
+        SetValue(TxtSectorsPerTrack, BootSector.SectorsPerTrack, {"8", "9", "15", "18", "21", "36"})
         SetValue(TxtNumberOfHeads, BootSector.NumberOfHeads, {"1", "2"})
         SetValue(TxtHiddenSectors, BootSector.HiddenSectors)
     End Sub
@@ -294,14 +305,17 @@ Public Class BootSectorForm
 
     Private Sub PopulateDiskTypes()
         CboDiskType.Items.Clear()
-        CboDiskType.Items.Add(New BootSectorDiskType("160K Floppy", 163840))
-        CboDiskType.Items.Add(New BootSectorDiskType("180K Floppy", 184320))
-        CboDiskType.Items.Add(New BootSectorDiskType("320K Floppy", 327680))
-        CboDiskType.Items.Add(New BootSectorDiskType("360K Floppy", 368640))
-        CboDiskType.Items.Add(New BootSectorDiskType("720K Floppy", 737280))
-        CboDiskType.Items.Add(New BootSectorDiskType("1.2M Floppy", 1228800))
-        CboDiskType.Items.Add(New BootSectorDiskType("1.44M Floppy", 1474560))
-        CboDiskType.Items.Add(New BootSectorDiskType("Custom", 0))
+        CboDiskType.Items.Add(New BootSectorDiskType("160K", FloppyDiskType.Floppy160))
+        CboDiskType.Items.Add(New BootSectorDiskType("180K", FloppyDiskType.Floppy180))
+        CboDiskType.Items.Add(New BootSectorDiskType("320K", FloppyDiskType.Floppy320))
+        CboDiskType.Items.Add(New BootSectorDiskType("360K", FloppyDiskType.Floppy360))
+        CboDiskType.Items.Add(New BootSectorDiskType("720K", FloppyDiskType.Floppy720))
+        CboDiskType.Items.Add(New BootSectorDiskType("1.2M", FloppyDiskType.Floppy1200))
+        CboDiskType.Items.Add(New BootSectorDiskType("1.44M", FloppyDiskType.Floppy1440))
+        CboDiskType.Items.Add(New BootSectorDiskType("2.88M", FloppyDiskType.Floppy2880))
+        CboDiskType.Items.Add(New BootSectorDiskType("DMF (1024)", FloppyDiskType.FloppyDMF1024))
+        CboDiskType.Items.Add(New BootSectorDiskType("DMF (2048)", FloppyDiskType.FloppyDMF2048))
+        CboDiskType.Items.Add(New BootSectorDiskType("Custom", FloppyDiskType.FloppyUnknown))
 
         CboDiskType.SelectedIndex = CboDiskType.Items.Count - 1
     End Sub
@@ -381,8 +395,8 @@ Public Class BootSectorForm
         Dim SelectedItem As BootSectorDiskType = Nothing
 
         For Each DiskType As BootSectorDiskType In CboDiskType.Items
-            If DiskType.Size > 0 Then
-                Dim BootSector = BuildBootSectorFromFileSize(DiskType.Size)
+            If DiskType.Type <> FloppyDiskType.FloppyUnknown Then
+                Dim BootSector = BuildBootSectorFromType(DiskType.Type)
                 If BootSector.MediaDescriptor = HexMediaDescriptor.GetHex(0) _
                     And BootSector.NumberOfHeads = TxtNumberOfHeads.Text _
                     And BootSector.RootEntryCount = TxtRootDirectoryEntries.Text _
@@ -691,8 +705,8 @@ Public Class BootSectorForm
 
         _SuppressEvent = True
         Dim DiskType As BootSectorDiskType = CboDiskType.SelectedItem
-        If DiskType.Size > 0 Then
-            Dim BootSector = BuildBootSectorFromFileSize(DiskType.Size)
+        If DiskType.Type <> FloppyDiskType.FloppyUnknown Then
+            Dim BootSector = BuildBootSectorFromType(DiskType.Type)
             PopulateBootRecord(BootSector)
         End If
         _SuppressEvent = False
@@ -714,7 +728,7 @@ Public Class BootSectorForm
     Private Sub CboDiskType_LostFocus(sender As Object, e As EventArgs) Handles CboDiskType.LostFocus
         _SuppressEvent = True
         Dim DiskType As BootSectorDiskType = CboDiskType.SelectedItem
-        If DiskType.Size = 0 Then
+        If DiskType.Type = FloppyDiskType.FloppyUnknown Then
             SetCurrentDiskType()
         End If
         _SuppressEvent = False
@@ -758,13 +772,13 @@ Public Class BootSectorForm
     End Class
 
     Private Class BootSectorDiskType
-        Public Sub New(Name As String, Size As Integer)
+        Public Sub New(Name As String, Type As FloppyDiskType)
             _Name = Name
-            _Size = Size
+            _Type = Type
         End Sub
 
         Public Property Name As String
-        Public Property Size As Integer
+        Public Property Type As FloppyDiskType
 
         Public Overrides Function ToString() As String
             Return _Name

DiskImageTool/Forms/BootSectorForm.vb

@@ -39,7 +39,7 @@ Public Class HexViewForm
         _LastSearch = New HexSearch
 
         If Not _BootSector.IsValidImage Then
-            _BootSector = BuildBootSectorFromFileSize(_HexViewSectorData.Disk.Data.Length)
+            _BootSector = BuildBootSectorFromType(GetFloppyDiskType(_HexViewSectorData.Disk.Data.Length))
         End If
 
         If Not _BootSector.IsValidImage Then