Add HyperFlex floppy formats.

This commit is contained in:
2023-06-26 12:20:28 +01:00
parent a5fe3e6d91
commit a10f12ebf9
7 changed files with 1802 additions and 1131 deletions

View File

@@ -1112,6 +1112,15 @@ public class Dimensions
dmns.Thickness = 4; dmns.Thickness = 4;
return dmns;
case MediaType.HF12:
case MediaType.HF24:
dmns.Height = 137.5;
dmns.Width = 135.9;
dmns.Thickness = 5.64;
return dmns; return dmns;
default: return null; default: return null;
} }

File diff suppressed because it is too large Load Diff

View File

@@ -627,4 +627,10 @@
<data name="Exception_0" xml:space="preserve"> <data name="Exception_0" xml:space="preserve">
<value>Exception {0}</value> <value>Exception {0}</value>
</data> </data>
<data name="SCSI_Media_Type_Description_HF12" xml:space="preserve">
<value>Media has 46956 blocks of 256 bytes, setting media type to 12Mb HyperFlex.</value>
</data>
<data name="SCSI_Media_Type_Description_HF24" xml:space="preserve">
<value>Media has 78936 blocks of 256 bytes, setting media type to 24Mb HyperFlex.</value>
</data>
</root> </root>

View File

@@ -1042,6 +1042,10 @@ public enum MediaType : uint
#region More floppy formats, types 820 to deprecated #region More floppy formats, types 820 to deprecated
/// <summary>5.25", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm</summary> /// <summary>5.25", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm</summary>
MetaFloppy_Mod_I = 820, MetaFloppy_Mod_I = 820,
/// <summary>HyperFlex (12Mb), 5.25", DS, 301 tracks, 78 spt, 256 bytes/sector, MFM, 333 tpi, 600rpm</summary>
HF12 = 823,
/// <summary>HyperFlex (24Mb), 5.25", DS, 506 tracks, 78 spt, 256 bytes/sector, MFM, 666 tpi, 720rpm</summary>
HF24 = 824,
#endregion #endregion
AtariLynxCard = 821, AtariJaguarCartridge = 822 AtariLynxCard = 821, AtariJaguarCartridge = 822

View File

@@ -538,3 +538,5 @@ Enum,Value,Summary
"MetaFloppy_Mod_I",820,"5.25"", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm" "MetaFloppy_Mod_I",820,"5.25"", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm"
"AtariLynxCard",821, "AtariLynxCard",821,
"AtariJaguarCartridge",822, "AtariJaguarCartridge",822,
"HF12",823,"HyperFlex (12Mb), 5.25"", DS, 301 tracks, 78 spt, 256 bytes/sector, MFM, 333 tpi, 600rpm",
"HF24",824,"HyperFlex (24Mb), 5.25"", DS, 506 tracks, 78 spt, 256 bytes/sector, MFM, 666 tpi, 720rpm",
Can't render this file because it has a wrong number of fields in line 541.

View File

@@ -319,6 +319,14 @@ public static partial class MediaTypeFromDevice
Localization.SCSI_Media_Type_Description_Bernoulli10, blocks); Localization.SCSI_Media_Type_Description_Bernoulli10, blocks);
return MediaType.Bernoulli10; return MediaType.Bernoulli10;
case 46956:
AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_HF12);
return MediaType.HF12;
case 78936:
AaruConsole.DebugWriteLine("Media detection", Localization.SCSI_Media_Type_Description_HF24);
return MediaType.HF12;
} }
break; break;

View File

@@ -2545,6 +2545,16 @@ public static class MediaType
discType = "5.25\" floppy"; discType = "5.25\" floppy";
discSubType = "Micropolis MetaFloppy Mod II"; discSubType = "Micropolis MetaFloppy Mod II";
break;
case CommonTypes.MediaType.HF12:
discType = "HyperFlex";
discSubType = "HyperFlex (12Mb)";
break;
case CommonTypes.MediaType.HF24:
discType = "HyperFlex";
discSubType = "HyperFlex (24Mb)";
break; break;
default: default:
discType = "Unknown"; discType = "Unknown";