aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 11:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Synced media types with Aaru.

Browse Source
This commit is contained in:
Natalia Portillo
2025-12-01 12:55:48 +00:00
parent e28b1209c8
commit bd8c00e758
4 changed files with 147 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/spec/appendixes/media_types_v1.adoc
View File

@@ -544,6 +544,7 @@ For the most accurate and up-to-date list, refer to the `libaaruformat` source.
|ISO_14517|802|5.25", M.O., 1273011 sectors, 1024 bytes/sector, ISO 14517, 2.6Gb/cart |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_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 |ISO_15041_512|804|3.5", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart
|HSM650|805|3,5", M.O., ??????? sectors, proprietary, 650Mb/cart, Sony HyperStorage
|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|

54
include/aaru.h
View File

@@ -771,7 +771,59 @@ typedef enum
VideoNow = 740, ///< Hasbro VideoNow 85 mm proprietary video disc VideoNow = 740, ///< Hasbro VideoNow 85 mm proprietary video disc
VideoNowColor = 741, ///< Hasbro VideoNow Color disc VideoNowColor = 741, ///< Hasbro VideoNow Color disc
VideoNowXp = 742 ///< Hasbro VideoNow XP higher capacity disc VideoNowXp = 742 ///< Hasbro VideoNow XP higher capacity disc
// // VideoNow, types 740 to 749
// Iomega, types 750 to 759
Bernoulli10 = 750, ///< 8"x11" Bernoulli Box disk with 10Mb capacity
///< 8"x11" Bernoulli Box disk with 20Mb capacity
Bernoulli20 = 751,
///< 5⅓" Bernoulli Box II disk with 20Mb capacity
BernoulliBox2_20 = 752,
// Iomega, types 750 to 759
// Kodak, types 760 to 769
KodakVerbatim3 = 760, ///< Kodak/Verbatim (3Mb)
KodakVerbatim6 = 761, ///< Kodak/Verbatim (6Mb)
KodakVerbatim12 = 762, ///< Kodak/Verbatim (12Mb)
// Kodak, types 760 to 769
// Sony and Panasonic Blu-ray derived, types 770 to 799
ProfessionalDisc = 770, ///< Professional Disc for video, single layer, rewritable, 23Gb
ProfessionalDiscDual = 771, ///< Professional Disc for video, dual layer, rewritable, 50Gb
ProfessionalDiscTriple = 772, ///< Professional Disc for video, triple layer, rewritable, 100Gb
ProfessionalDiscQuad = 773, ///< Professional Disc for video, quad layer, write once, 128Gb
PDD = 774, ///< Professional Disc for DATA, single layer, rewritable, 23Gb
PDD_WORM = 775, ///< Professional Disc for DATA, single layer, write once, 23Gb
ArchivalDisc = 776, ///< Archival Disc, 1st gen., 300Gb
ArchivalDisc2 = 777, ///< Archival Disc, 2nd gen., 500Gb
ArchivalDisc3 = 778, ///< Archival Disc, 3rd gen., 1Tb
ODC300R = 779, ///< Optical Disc archive, 1st gen., write once, 300Gb
ODC300RE = 780, ///< Optical Disc archive, 1st gen., rewritable, 300Gb
ODC600R = 781, ///< Optical Disc archive, 2nd gen., write once, 600Gb
ODC600RE = 782, ///< Optical Disc archive, 2nd gen., rewritable, 600Gb
ODC1200RE = 783, ///< Optical Disc archive, 3rd gen., rewritable, 1200Gb
ODC1500R = 784, ///< Optical Disc archive, 3rd gen., write once, 1500Gb
ODC3300R = 785, ///< Optical Disc archive, 4th gen., write once, 3300Gb
ODC5500R = 786, ///< Optical Disc archive, 5th gen., write once, 5500Gb
// Sony and Panasonic Blu-ray derived, types 770 to 799
// Magneto-optical, types 800 to 819
ECMA_322_1k = 800, ///< 5,25", M.O., 4383356 sectors, 1024 bytes/sector, ECMA-322, ISO 22092, 9.1Gb/cart
ECMA_322_512 = 801, ///< 5,25", M.O., ??????? sectors, 512 bytes/sector, ECMA-322, ISO 22092, 9.1Gb/cart
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
HSM650 = 805, ///< 3,5", M.O., ??????? sectors, proprietary, 650Mb/cart, Sony HyperStorage
// Magneto-optical, types 800 to 819
// More floppy formats, types 820 to deprecated
MetaFloppy_Mod_I = 820, ///< 5.25", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm
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
// More floppy formats, types 820 to deprecated
AtariLynxCard = 821, ///< Atari Lynx card
AtariJaguarCartridge = 822 ///< Atari Jaguar cartridge
} MediaType; } MediaType;
/** @} */ /* end of MediaTypes group */ /** @} */ /* end of MediaTypes group */

13
templates/aaruformat.hexpat
View File

@@ -576,7 +576,18 @@ enum MediaType : u32
ODC1200RE = 783, ODC1200RE = 783,
ODC1500R = 784, ODC1500R = 784,
ODC3300R = 785, ODC3300R = 785,
ODC5500R = 786 ODC5500R = 786,
ECMA_322_1k = 800,
ECMA_322_512 = 801,
ISO_14517 = 802,
ISO_14517_512 = 803,
ISO_15041_512 = 804,
HSM650 = 805,
MetaFloppy_Mod_I = 820,
HF12 = 823,
HF24 = 824,
}; };
enum CompressionType : u16 enum CompressionType : u16

78
tool/helpers.c
View File

@@ -1109,6 +1109,84 @@ const char *media_type_to_string(MediaType type)
case VideoNowXp: case VideoNowXp:
return "VideoNow XP"; return "VideoNow XP";
// Iomega, types 750 to 759
case Bernoulli10:
return "Bernoulli Box (10Mb)";
case Bernoulli20:
return "Bernoulli Box (20Mb)";
case BernoulliBox2_20:
return "Bernoulli Box II (20Mb)";
// Kodak, types 760 to 769
case KodakVerbatim3:
return "Kodak/Verbatim (3Mb)";
case KodakVerbatim6:
return "Kodak/Verbatim (6Mb)";
case KodakVerbatim12:
return "Kodak/Verbatim (12Mb)";
// Sony and Panasonic Blu-ray derived, types 770 to 799
case ProfessionalDisc:
return "Professional Disc for video";
case ProfessionalDiscDual:
return "Professional Disc for video";
case ProfessionalDiscTriple:
return "Professional Disc for video";
case ProfessionalDiscQuad:
return "Professional Disc for video";
case PDD:
return "Professional Disc for DATA";
case PDD_WORM:
return "Professional Disc for DATA";
case ArchivalDisc:
return "Archival Disc";
case ArchivalDisc2:
return "Archival Disc";
case ArchivalDisc3:
return "Archival Disc";
case ODC300R:
return "Optical Disc archive";
case ODC300RE:
return "Optical Disc archive";
case ODC600R:
return "Optical Disc archive";
case ODC600RE:
return "Optical Disc archive";
case ODC1200RE:
return "Optical Disc archive";
case ODC1500R:
return "Optical Disc archive";
case ODC3300R:
return "Optical Disc archive";
case ODC5500R:
return "Optical Disc archive";
// Magneto-optical, types 800 to 819
case ECMA_322_1k:
return "5,25\", M.O., 4383356 sectors, 1024 bytes/sector, ECMA-322, ISO 22092, 9.1Gb/cart";
case ECMA_322_512:
return "5,25\", M.O., ??????? sectors, 512 bytes/sector, ECMA-322, ISO 22092, 9.1Gb/cart";
case ISO_14517:
return "5,25\", M.O., 1273011 sectors, 1024 bytes/sector, ISO 14517, 2.6Gb/cart";
case ISO_14517_512:
return "5,25\", M.O., 2244958 sectors, 512 bytes/sector, ISO 14517, 2.3Gb/cart";
case ISO_15041_512:
return "3,5\", M.O., 1041500 sectors, 512 bytes/sector, ISO 15041, 540Mb/cart";
case HSM650:
return "Sony HyperStorage";
// More floppy formats, types 820 to deprecated
case MetaFloppy_Mod_I:
return "5.25\", SS, DD, 35 tracks, 16 spt, 256 bytes/sector, MFM, 48 tpi, ???rpm";
case HF12:
return "HyperFlex (12Mb)";
case HF24:
return "HyperFlex (24Mb)";
case AtariLynxCard:
return "Atari Lynx card";
case AtariJaguarCartridge:
return "Atari Jaguar cartridge";
default: default:
return "Unknown Media Type"; return "Unknown Media Type";
} }