aaru-dps/Aaru.CommonTypes
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.CommonTypes.git synced 2025-12-16 19:24:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MetaFloppy Mod I.

Browse Source
This commit is contained in:
Natalia Portillo
2021-10-06 14:30:57 +01:00
parent 0bd510d4b1
commit bde64fbe2c
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Geometry.cs
View File

@@ -50,6 +50,7 @@ namespace Aaru.CommonTypes
(32, 1, 8, 319, MediaEncoding.FM, false, MediaType.IBM23FD),
(35, 1, 9, 256, MediaEncoding.FM, false, MediaType.ECMA_66),
(35, 1, 13, 256, MediaEncoding.AppleGCR, false, MediaType.Apple32SS),
(35, 1, 16, 256, MediaEncoding.MFM, false, MediaType.MetaFloppy_Mod_I),
(35, 1, 16, 256, MediaEncoding.AppleGCR, false, MediaType.Apple33SS),
(35, 1, 19, 256, MediaEncoding.CommodoreGCR, false, MediaType.CBM_1540),
(35, 2, 13, 256, MediaEncoding.AppleGCR, false, MediaType.Apple32DS),
@@ -75,7 +76,7 @@ namespace Aaru.CommonTypes
(74, 2, 15, 512, MediaEncoding.MFM, false, MediaType.IBM53FD_512),
(74, 2, 26, 128, MediaEncoding.FM, false, MediaType.IBM43FD_128),
(74, 2, 26, 256, MediaEncoding.MFM, false, MediaType.IBM53FD_256),
(77, 1, 16, 256, MediaEncoding.MFM, false, MediaType.MetaFloppy),
(77, 1, 16, 256, MediaEncoding.MFM, false, MediaType.MetaFloppy_Mod_II),
(77, 1, 26, 128, MediaEncoding.FM, false, MediaType.RX01),
(77, 1, 26, 256, MediaEncoding.MFM, false, MediaType.RX02),
(77, 2, 8, 1024, MediaEncoding.MFM, false, MediaType.NEC_525_HD),

7
MediaType.cs
View File

@@ -807,7 +807,7 @@ namespace Aaru.CommonTypes
Floptical = 662, HiFD = 663, QuickDisk = 664, UHD144 = 665,
VideoFloppy = 666, Wafer = 667, ZXMicrodrive = 668,
/// <summary>5.25", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm</summary>
MetaFloppy = 669,
MetaFloppy_Mod_II = 669,
#endregion Other floppy standards, types 660 to 669
#region Miscellaneous, types 670 to 689
@@ -1036,5 +1036,10 @@ namespace Aaru.CommonTypes
/// <summary>3,5", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart</summary>
ISO_15041_512 = 804,
#endregion Magneto-optical, types 800 to 819
#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>
MetaFloppy_Mod_I = 820,
#endregion
}
}

3
MediaType.csv
View File

@@ -441,7 +441,7 @@ Enum,Value,Summary
"VideoFloppy",666,
"Wafer",667,
"ZXMicrodrive",668,
"MetaFloppy",669,"5.25"", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm"
"MetaFloppy_Mod_II",669,"5.25"", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm"
"BeeCard",670,
"Borsu",671,
"DataStore",672,
@@ -529,3 +529,4 @@ Enum,Value,Summary
"ISO_14517",802,"5,25"", M.O., 1273011 sectors, 1024 bytes/sector, ISO 14517, 2.6Gb/cart"
"ISO_14517_512",803,"5,25"", M.O., 2244958 sectors, 512 bytes/sector, ISO 14517, 2.3Gb/cart"
"ISO_15041_512",804,"3,5"", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart"
"MetaFloppy_Mod_I",820,"5.25"", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm"
1 Enum Value Summary
441 VideoFloppy 666
442 Wafer 667
443 ZXMicrodrive 668
444 MetaFloppy MetaFloppy_Mod_II 669 5.25", SS, DD, 77 tracks, 16 spt, 256 bytes/sector, MFM, 100 tpi, 300rpm
445 BeeCard 670
446 Borsu 671
447 DataStore 672
529 ISO_14517 802 5,25", M.O., 1273011 sectors, 1024 bytes/sector, ISO 14517, 2.6Gb/cart
530 ISO_14517_512 803 5,25", M.O., 2244958 sectors, 512 bytes/sector, ISO 14517, 2.3Gb/cart
531 ISO_15041_512 804 3,5", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart
532 MetaFloppy_Mod_I 820 5.25", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm

2
MediaTypeFromDevice/FromSbc.cs
View File

@@ -308,7 +308,7 @@ namespace Aaru.CommonTypes
"SCSI medium type is {0:X2}h, media has {1} blocks of {2} bytes, setting media type to MetaFloppy formatted 5¼\" double density single sided floppy.",
mediumType, blocks, blockSize);
return MediaType.MetaFloppy;
return MediaType.MetaFloppy_Mod_II;
case 1280 when mediumType == 0x01:
AaruConsole.DebugWriteLine("Media detection",
"SCSI medium type is {0:X2}h, media has {1} blocks of {2} bytes, setting media type to Acorn formatted 5¼\" double density floppy with 80 tracks.",

3
Metadata/Dimensions.cs
View File

@@ -87,7 +87,8 @@ namespace Aaru.CommonTypes.Metadata
case CommonTypes.MediaType.ECMA_99_26:
case CommonTypes.MediaType.FDFORMAT_525_DD:
case CommonTypes.MediaType.FDFORMAT_525_HD:
case CommonTypes.MediaType.MetaFloppy:
case CommonTypes.MediaType.MetaFloppy_Mod_I:
case CommonTypes.MediaType.MetaFloppy_Mod_II:
// According to ECMA-99 et al
dmns.Height = 133.3;
dmns.HeightSpecified = true;

9
Metadata/MediaType.cs
View File

@@ -2536,9 +2536,14 @@ namespace Aaru.CommonTypes.Metadata
discSubType = "ODC5500R";
break;
case CommonTypes.MediaType.MetaFloppy:
case CommonTypes.MediaType.MetaFloppy_Mod_I:
discType = "5.25\" floppy";
discSubType = "Micropolis MetaFloppy";
discSubType = "Micropolis MetaFloppy Mod I";
break;
case CommonTypes.MediaType.MetaFloppy_Mod_II:
discType = "5.25\" floppy";
discSubType = "Micropolis MetaFloppy Mod II";
break;
default: