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

Add support for PD650 media.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-16 23:29:54 +01:00
parent 3d7d50dc25
commit 8fefbb4d00
13 changed files with 290 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
DiscImageChef.DiscImages/ZZZRawImage/Helpers.cs
View File

@@ -103,41 +103,43 @@ namespace DiscImageChef.DiscImages
if(extension == ".st") return MediaType.ATARI_35_DS_DD_11;
return MediaType.CBM_AMIGA_35_DD;
case 988416: return MediaType.IBM43FD_256;
case 995072: return MediaType.IBM53FD_256;
case 1021696: return MediaType.ECMA_99_26;
case 1146624: return MediaType.IBM53FD_512;
case 1177344: return MediaType.ECMA_99_15;
case 1222400: return MediaType.IBM53FD_1024;
case 1228800: return MediaType.DOS_525_HD;
case 1255168: return MediaType.ECMA_69_8;
case 1261568: return MediaType.NEC_525_HD;
case 1304320: return MediaType.ECMA_99_8;
case 1427456: return MediaType.FDFORMAT_525_HD;
case 1474560: return MediaType.DOS_35_HD;
case 1638400: return MediaType.ACORN_35_DS_HD;
case 1720320: return MediaType.DMF;
case 1763328: return MediaType.FDFORMAT_35_HD;
case 1802240: return MediaType.CBM_AMIGA_35_HD;
case 1880064: return MediaType.XDF_35;
case 1884160: return MediaType.XDF_35;
case 2949120: return MediaType.DOS_35_ED;
case 9338880: return MediaType.NEC_35_TD;
case 20818944: return MediaType.Floptical;
case 33554432: return MediaType.FD32MB;
case 40387584: return MediaType.PocketZip;
case 100663296: return MediaType.ZIP100;
case 126222336: return MediaType.LS120;
case 127923200: return MediaType.ECMA_154;
case 201410560: return MediaType.HiFD;
case 229632000: return MediaType.ECMA_201;
case 240386048: return MediaType.LS240;
case 250640384: return MediaType.ZIP250;
case 481520640: return MediaType.ECMA_183_512;
case 533403648: return MediaType.ECMA_183;
case 596787200: return MediaType.ECMA_184_512;
case 654540800: return MediaType.ECMA_184;
case 1070617600: return MediaType.Jaz;
case 988416: return MediaType.IBM43FD_256;
case 995072: return MediaType.IBM53FD_256;
case 1021696: return MediaType.ECMA_99_26;
case 1146624: return MediaType.IBM53FD_512;
case 1177344: return MediaType.ECMA_99_15;
case 1222400: return MediaType.IBM53FD_1024;
case 1228800: return MediaType.DOS_525_HD;
case 1255168: return MediaType.ECMA_69_8;
case 1261568: return MediaType.NEC_525_HD;
case 1304320: return MediaType.ECMA_99_8;
case 1427456: return MediaType.FDFORMAT_525_HD;
case 1474560: return MediaType.DOS_35_HD;
case 1638400: return MediaType.ACORN_35_DS_HD;
case 1720320: return MediaType.DMF;
case 1763328: return MediaType.FDFORMAT_35_HD;
case 1802240: return MediaType.CBM_AMIGA_35_HD;
case 1880064: return MediaType.XDF_35;
case 1884160: return MediaType.XDF_35;
case 2949120: return MediaType.DOS_35_ED;
case 9338880: return MediaType.NEC_35_TD;
case 20818944: return MediaType.Floptical;
case 33554432: return MediaType.FD32MB;
case 40387584: return MediaType.PocketZip;
case 100663296: return MediaType.ZIP100;
case 126222336: return MediaType.LS120;
case 127923200: return MediaType.ECMA_154;
case 201410560: return MediaType.HiFD;
case 229632000: return MediaType.ECMA_201;
case 240386048: return MediaType.LS240;
case 250640384: return MediaType.ZIP250;
case 481520640: return MediaType.ECMA_183_512;
case 533403648: return MediaType.ECMA_183;
case 596787200: return MediaType.ECMA_184_512;
case 654540800: return MediaType.ECMA_184;
case 656310272 when imageInfo.SectorSize == 512: return MediaType.PD650;
case 664829952 when imageInfo.SectorSize == 512: return MediaType.PD650;
case 1070617600: return MediaType.Jaz;
#region Commodore
case 174848:

4
DiscImageChef.DiscImages/ZZZRawImage/Properties.cs
View File

@@ -122,7 +122,9 @@ namespace DiscImageChef.DiscImages
? mode2
? "MODE2/2352"
: "MODE1/2352"
: "MODE1/2048",
: imageInfo.MediaType == MediaType.PD650 || imageInfo.MediaType == MediaType.PD650_WORM
? "DATA/512"
: "MODE1/2048",
Size = imageInfo.Sectors * imageInfo.SectorSize
};
parts.Add(part);

12
DiscImageChef.DiscImages/ZZZRawImage/Read.cs
View File

@@ -376,8 +376,7 @@ namespace DiscImageChef.DiscImages
// Check for Xbox
if(mediaTags.TryGetValue(MediaTagType.DVD_DMI, out byte[] dmi))
if(DMI.IsXbox(dmi) || DMI.IsXbox360(dmi))
if(DMI.IsXbox(dmi))
imageInfo.MediaType = MediaType.XGD;
if(DMI.IsXbox(dmi)) imageInfo.MediaType = MediaType.XGD;
else if(DMI.IsXbox360(dmi))
{
imageInfo.MediaType = MediaType.XGD2;
@@ -900,6 +899,8 @@ namespace DiscImageChef.DiscImages
case MediaType.XGD:
case MediaType.XGD2:
case MediaType.XGD3:
case MediaType.PD650:
case MediaType.PD650_WORM:
imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
break;
default:
@@ -1151,6 +1152,7 @@ namespace DiscImageChef.DiscImages
sectorSkip = 2340;
break;
}
case SectorTagType.CdSectorHeader:
{
sectorOffset = 12;
@@ -1158,12 +1160,14 @@ namespace DiscImageChef.DiscImages
sectorSkip = 2336;
break;
}
case SectorTagType.CdSectorSubchannel:
{
sectorOffset = 2352;
sectorSize = 96;
break;
}
case SectorTagType.CdSectorSubHeader:
throw new ArgumentException("Unsupported tag requested for this track", nameof(tag));
case SectorTagType.CdSectorEcc:
@@ -1173,6 +1177,7 @@ namespace DiscImageChef.DiscImages
sectorSkip = 0;
break;
}
case SectorTagType.CdSectorEccP:
{
sectorOffset = 2076;
@@ -1180,6 +1185,7 @@ namespace DiscImageChef.DiscImages
sectorSkip = 104;
break;
}
case SectorTagType.CdSectorEccQ:
{
sectorOffset = 2248;
@@ -1187,6 +1193,7 @@ namespace DiscImageChef.DiscImages
sectorSkip = 0;
break;
}
case SectorTagType.CdSectorEdc:
{
sectorOffset = 2064;
@@ -1194,6 +1201,7 @@ namespace DiscImageChef.DiscImages
sectorSkip = 284;
break;
}
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
}