diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index b533635e6..238c2c7ec 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit b533635e67c9aadecaa503850afcebd2bb4ca20d
+Subproject commit 238c2c7ec370e158e6e391dcd33dc705f48e1ae2
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index 0e74aace0..e7872825a 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -918,6 +918,7 @@ namespace Aaru.Core
case CommonTypes.MediaType.FDFORMAT_35_HD:
case CommonTypes.MediaType.Apricot_35:
case CommonTypes.MediaType.CompactFloppy:
+ case CommonTypes.MediaType.MetaFloppy:
trkFormat = "IBM MFM";
break;
diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs
index 318d7c4df..3a16fe020 100644
--- a/Aaru.Filesystems/CPM/Info.cs
+++ b/Aaru.Filesystems/CPM/Info.cs
@@ -153,7 +153,8 @@ namespace Aaru.Filesystems
case MediaType.RP06:
case MediaType.RP06_18:
case MediaType.GENERIC_HDD:
- case MediaType.FlashDrive: break;
+ case MediaType.FlashDrive:
+ case MediaType.MetaFloppy: break;
default: return false;
}
diff --git a/Aaru.Images/Anex86/Properties.cs b/Aaru.Images/Anex86/Properties.cs
index d719a9278..b1d25f211 100644
--- a/Aaru.Images/Anex86/Properties.cs
+++ b/Aaru.Images/Anex86/Properties.cs
@@ -80,7 +80,7 @@ namespace Aaru.DiscImages
MediaType.XDF_35, MediaType.DOS_35_ED, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_525_HD,
MediaType.FDFORMAT_35_HD, MediaType.NEC_35_TD, MediaType.Unknown, MediaType.GENERIC_HDD,
MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2, MediaType.PCCardTypeI,
- MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
+ MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV, MediaType.MetaFloppy
};
///
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
diff --git a/Aaru.Images/Apridisk/Properties.cs b/Aaru.Images/Apridisk/Properties.cs
index dc3c1fcdc..f1b7e65ae 100644
--- a/Aaru.Images/Apridisk/Properties.cs
+++ b/Aaru.Images/Apridisk/Properties.cs
@@ -75,7 +75,7 @@ namespace Aaru.DiscImages
MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
- MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+ MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy
};
///
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs
index 1776726bd..a973873f4 100644
--- a/Aaru.Images/D88/Read.cs
+++ b/Aaru.Images/D88/Read.cs
@@ -184,6 +184,10 @@ namespace Aaru.DiscImages
else if(bps == IBMSectorSizeCode.QuarterKilo)
switch(trkCounter)
{
+ case 77 when spt == 16:
+ _imageInfo.MediaType = MediaType.MetaFloppy;
+
+ break;
case 80 when spt == 16:
_imageInfo.MediaType = MediaType.NEC_525_SS;
@@ -358,6 +362,12 @@ namespace Aaru.DiscImages
_imageInfo.Heads = 2;
_imageInfo.SectorsPerTrack = 38;
+ break;
+ case MediaType.MetaFloppy:
+ _imageInfo.Cylinders = 77;
+ _imageInfo.Heads = 1;
+ _imageInfo.SectorsPerTrack = 16;
+
break;
}
diff --git a/Aaru.Images/DriDiskCopy/Properties.cs b/Aaru.Images/DriDiskCopy/Properties.cs
index 4fffde27f..027a11adc 100644
--- a/Aaru.Images/DriDiskCopy/Properties.cs
+++ b/Aaru.Images/DriDiskCopy/Properties.cs
@@ -73,7 +73,7 @@ namespace Aaru.DiscImages
MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
- MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+ MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy
};
///
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
diff --git a/Aaru.Images/MaxiDisk/Properties.cs b/Aaru.Images/MaxiDisk/Properties.cs
index 8234f5dd5..489118ed8 100644
--- a/Aaru.Images/MaxiDisk/Properties.cs
+++ b/Aaru.Images/MaxiDisk/Properties.cs
@@ -71,7 +71,8 @@ namespace Aaru.DiscImages
MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
- MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+ MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525,
+ MediaType.MetaFloppy
};
///
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
diff --git a/Aaru.Images/RayDIM/Properties.cs b/Aaru.Images/RayDIM/Properties.cs
index 48f22227c..eb88b5132 100644
--- a/Aaru.Images/RayDIM/Properties.cs
+++ b/Aaru.Images/RayDIM/Properties.cs
@@ -71,7 +71,8 @@ namespace Aaru.DiscImages
MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
- MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+ MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525,
+ MediaType.MetaFloppy
};
///
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
diff --git a/Aaru.Images/SaveDskF/Properties.cs b/Aaru.Images/SaveDskF/Properties.cs
index 02e0f912f..1f1b194ea 100644
--- a/Aaru.Images/SaveDskF/Properties.cs
+++ b/Aaru.Images/SaveDskF/Properties.cs
@@ -72,7 +72,7 @@ namespace Aaru.DiscImages
MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
- MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525
+ MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy
};
///
public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs
index a45b34798..cca14dabc 100644
--- a/Aaru.Images/TeleDisk/Helpers.cs
+++ b/Aaru.Images/TeleDisk/Helpers.cs
@@ -227,6 +227,7 @@ namespace Aaru.DiscImages
// DOS disks use 512 bytes/sector
}
+ case 315392: return _imageInfo.SectorSize == 256 ? MediaType.MetaFloppy : MediaType.Unknown;
case 327680:
{
// Acorn disk uses 256 bytes/sector
diff --git a/Aaru.Images/ZZZRawImage/Helpers.cs b/Aaru.Images/ZZZRawImage/Helpers.cs
index 026af93de..1f92016ed 100644
--- a/Aaru.Images/ZZZRawImage/Helpers.cs
+++ b/Aaru.Images/ZZZRawImage/Helpers.cs
@@ -89,6 +89,7 @@ namespace Aaru.DiscImages
case 286720: return MediaType.Apple33DS;
case 287488: return MediaType.IBM33FD_256;
case 306432: return MediaType.IBM33FD_512;
+ case 315392: return MediaType.MetaFloppy;
case 322560: return MediaType.Apricot_35;
case 325632: return MediaType.ECMA_70;
case 327680:
diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs
index 4b561c742..570a7013a 100644
--- a/Aaru.Images/ZZZRawImage/Read.cs
+++ b/Aaru.Images/ZZZRawImage/Read.cs
@@ -957,6 +957,12 @@ namespace Aaru.DiscImages
_imageInfo.Heads = 64;
_imageInfo.SectorsPerTrack = 32;
+ break;
+ case MediaType.MetaFloppy:
+ _imageInfo.Cylinders = 77;
+ _imageInfo.Heads = 1;
+ _imageInfo.SectorsPerTrack = 16;
+
break;
default:
_imageInfo.Cylinders = (uint)(_imageInfo.Sectors / 16 / 63);