Add formatting of DOS4-7, but not tested. Update hst amiga with forma…

…tting fixes. Fix rdb init disk size calculation.
henrikstengaard · Sep 30, 2022 · 4cfd5f1 · 4cfd5f1
1 parent 5d6d945
commit 4cfd5f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/Hst.Imager.ConsoleApp/Hst.Imager.ConsoleApp.csproj b/src/Hst.Imager.ConsoleApp/Hst.Imager.ConsoleApp.csproj
@@ -27,6 +27,9 @@
       <None Update="export_dh0_1gb_import_4gb.txt">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
+      <None Update="license.txt">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Hst.Imager.Core/Commands/RdbInitCommand.cs b/src/Hst.Imager.Core/Commands/RdbInitCommand.cs
@@ -56,7 +56,7 @@ public override async Task<Result> Execute(CancellationToken token)
 
                 diskGeometry = new DiskGeometry
                 {
-                    DiskSize = cylinders * heads * sectors * 512,
+                    DiskSize = (long)cylinders * heads * sectors * 512,
                     Cylinders = cylinders,
                     Heads = heads,
                     Sectors = sectors

diff --git a/src/Hst.Imager.Core/Commands/RdbPartFormatCommand.cs b/src/Hst.Imager.Core/Commands/RdbPartFormatCommand.cs
@@ -71,6 +71,10 @@ public override async Task<Result> Execute(CancellationToken token)
             switch (partitionBlock.DosTypeFormatted)
             {
                 case "DOS\\3":
+                case "DOS\\4":
+                case "DOS\\5":
+                case "DOS\\6":
+                case "DOS\\7":
                     await FastFileSystemFormatter.FormatPartition(stream, partitionBlock, name);
                     break;
                 case "PDS\\3":

diff --git a/src/Hst.Imager.Core/Hst.Imager.Core.csproj b/src/Hst.Imager.Core/Hst.Imager.Core.csproj
@@ -5,7 +5,7 @@
       <PackageReference Include="DiscUtils.Containers" Version="0.16.15" />
       <PackageReference Include="DiscUtils.FileSystems" Version="0.16.15" />
       <PackageReference Include="DiscUtils.Vhd" Version="0.16.15" />
-      <PackageReference Include="Hst.Amiga" Version="0.2.31" />
+      <PackageReference Include="Hst.Amiga" Version="0.2.33" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
       <PackageReference Include="plist-cil" Version="2.2.0" />
     </ItemGroup>