diff --git a/include/aaru.h b/include/aaru.h index e992489..36bd2bf 100644 --- a/include/aaru.h +++ b/include/aaru.h @@ -996,89 +996,90 @@ typedef enum typedef enum { /* CD table of contents */ - CD_TOC = 0, ///< Standard CD Table Of Contents (lead-in, first session) - CD_SessionInfo = 1, ///< Per-session summary (start/end addresses, track count) - CD_FullTOC = 2, ///< Complete multi-session TOC including hidden tracks - CD_PMA = 3, ///< Program Memory Area (temporary track info before finalization) - CD_ATIP = 4, ///< Absolute Time In Pregroove (writable media timing & power metadata) - CD_TEXT = 5, ///< CD-Text blocks (titles, performers, etc.) - CD_MCN = 6, ///< Media Catalogue Number (EAN/UPC style identifier) - DVD_PFI = 7, ///< Physical Format Information (layer geometry & book type) - DVD_CMI = 8, ///< Copyright Management Information (CSS/CPRM flags) - DVD_DiscKey = 9, ///< Encrypted disc key block (CSS) - DVD_BCA = 10, ///< Burst Cutting Area (etched manufacturer / AACS info) - DVD_DMI = 11, ///< Disc Manufacturer Information (lead-in descriptor) - DVD_MediaIdentifier = 12, ///< Writable media dye / manufacturer ID - DVD_MKB = 13, ///< Media Key Block (AACS/DVD) - DVDRAM_DDS = 14, ///< Defect Data Structure (DVD-RAM mapping) - DVDRAM_MediumStatus = 15, ///< Medium Status (allocated spare info) - DVDRAM_SpareArea = 16, ///< Spare area descriptors - DVDR_RMD = 17, ///< Recorded Media Data (RMD) last border-out - DVDR_PreRecordedInfo = 18, ///< Pre-recorded info area (lead-in) - DVDR_MediaIdentifier = 19, ///< DVD-R/-RW writable media identifier - DVDR_PFI = 20, ///< DVD-R physical format (layer data) - DVD_ADIP = 21, ///< Address In Pregroove (DVD+ / wobble timing) - HDDVD_CPI = 22, ///< Content Protection Info (HD DVD) - HDDVD_MediumStatus = 23, ///< HD DVD Medium status (spares/defects) - DVDDL_LayerCapacity = 24, ///< Dual layer capacity & break info - DVDDL_MiddleZoneAddress = 25, ///< Middle zone start LBA - DVDDL_JumpIntervalSize = 26, ///< Jump interval size (opposite track path) - DVDDL_ManualLayerJumpLBA = 27, ///< Manual layer jump LBA (OTP) - BD_DI = 28, ///< Disc Information (BD) - BD_BCA = 29, ///< Blu-ray Burst Cutting Area - BD_DDS = 30, ///< Disc Definition Structure (recordable) - BD_CartridgeStatus = 31, ///< Cartridge presence / write protect (BD-RE/BD-R in caddy) - BD_SpareArea = 32, ///< BD spare area allocation map - AACS_VolumeIdentifier = 33, ///< AACS Volume Identifier - AACS_SerialNumber = 34, ///< Pre-recorded media serial number (AACS) - AACS_MediaIdentifier = 35, ///< AACS Media Identifier (unique per disc) - AACS_MKB = 36, ///< AACS Media Key Block - AACS_DataKeys = 37, ///< Extracted AACS title/volume keys (when decrypted) - AACS_LBAExtents = 38, ///< LBA extents requiring bus encryption - AACS_CPRM_MKB = 39, ///< CPRM Media Key Block - Hybrid_RecognizedLayers = 40, ///< Hybrid disc recognized layer combinations (e.g. CD/DVD/BD) - MMC_WriteProtection = 41, ///< Write protection status (MMC GET CONFIG) - MMC_DiscInformation = 42, ///< Disc Information (recordable status, erasable, last session) - MMC_TrackResourcesInformation = 43, ///< Track Resources (allocated/open track data) - MMC_POWResourcesInformation = 44, ///< Pseudo OverWrite resources (BD-R POW) - SCSI_INQUIRY = 45, ///< SCSI INQUIRY standard data (SPC-*) - SCSI_MODEPAGE_2A = 46, ///< SCSI Mode Page 2Ah (CD/DVD capabilities) - ATA_IDENTIFY = 47, ///< ATA IDENTIFY DEVICE (512 bytes) - ATAPI_IDENTIFY = 48, ///< ATA PACKET IDENTIFY DEVICE - PCMCIA_CIS = 49, ///< PCMCIA/CardBus CIS tuple chain - SD_CID = 50, ///< SecureDigital Card ID register - SD_CSD = 51, ///< SecureDigital Card Specific Data - SD_SCR = 52, ///< SecureDigital Configuration Register - SD_OCR = 53, ///< SecureDigital Operation Conditions (voltage) - MMC_CID = 54, ///< MMC Card ID - MMC_CSD = 55, ///< MMC Card Specific Data - MMC_OCR = 56, ///< MMC Operation Conditions - MMC_ExtendedCSD = 57, ///< MMC Extended CSD (512 bytes) - Xbox_SecuritySector = 58, ///< Xbox/Xbox 360 Security Sector (SS.bin) - Floppy_LeadOut = 59, ///< Manufacturer / duplication cylinder (floppy special data) - DiscControlBlock = 60, ///< DVD Disc Control Blocks - CD_FirstTrackPregap = 61, ///< First track pregap (index 0) - CD_LeadOut = 62, ///< Lead-out area contents - SCSI_MODESENSE_6 = 63, ///< Raw MODE SENSE (6) data - SCSI_MODESENSE_10 = 64, ///< Raw MODE SENSE (10) data - USB_Descriptors = 65, ///< Concatenated USB descriptors (device/config/interface) - Xbox_DMI = 66, ///< Xbox Disc Manufacturing Info (DMI) - Xbox_PFI = 67, ///< Xbox Physical Format Information (PFI) - CD_LeadIn = 68, ///< Raw lead-in (TOC frames) - MiniDiscType = 69, ///< 8 bytes response that seems to define type of MiniDisc - MiniDiscD5 = 70, ///< 4 bytes response to vendor command D5h - MiniDiscUTOC = 71, ///< User TOC, contains fragments, track names, and can be from 1 to 3 sectors of 2336 bytes - MiniDiscDTOC = 72, ///< Not entirely clear kind of TOC that only appears on MD-DATA discs - DVD_DiscKey_Decrypted = 73, ///< Decrypted DVD disc key, - DVD_PFI_2ndLayer = 74, ///< DVD Physical Format Information for the second layer - Floppy_WriteProtect = 75, ///< Write protection status of the floppy disk - WiiUDiscKey = 76, ///< Nintendo Wii U disc key (16 bytes, from non-readable disc area) - PS3_DiscKey = 77, ///< PS3 derived disc key (16 bytes) - PS3_Data1 = 78, ///< PS3 data1 key (16 bytes, from disc) - PS3_Data2 = 79, ///< PS3 data2 key (16 bytes, from disc) - PS3_PIC = 80, ///< PS3 PIC data (115 bytes, from disc lead-in) - PS3_EncryptionMap = 81, ///< PS3 encryption region map (serialized from sector 0) - MaxMediaTag = PS3_EncryptionMap + kMediaTagCdToc = 0, ///< Standard CD Table Of Contents (lead-in, first session) + kMediaTagSessionInfo = 1, ///< Per-session summary (start/end addresses, track count) + kMediaTagFullToc = 2, ///< Complete multi-session TOC including hidden tracks + kMediaTagCdPma = 3, ///< Program Memory Area (temporary track info before finalization) + kMediaTagCdAtip = 4, ///< Absolute Time In Pregroove (writable media timing & power metadata) + kMediaTagCdText = 5, ///< CD-Text blocks (titles, performers, etc.) + kMediaTagCdMcn = 6, ///< Media Catalogue Number (EAN/UPC style identifier) + kMediaTagDvdPfi = 7, ///< Physical Format Information (layer geometry & book type) + kMediaTagDvdCmi = 8, ///< Copyright Management Information (CSS/CPRM flags) + kMediaTagDvdDiscKey = 9, ///< Encrypted disc key block (CSS) + kMediaTagDvdBca = 10, ///< Burst Cutting Area (etched manufacturer / AACS info) + kMediaTagDvdDmi = 11, ///< Disc Manufacturer Information (lead-in descriptor) + kMediaTagDvdMediaIdentifier = 12, ///< Writable media dye / manufacturer ID + kMediaTagDvdMkb = 13, ///< Media Key Block (AACS/DVD) + kMediaTagDvdRamDds = 14, ///< Defect Data Structure (DVD-RAM mapping) + kMediaTagDvdRamMediumStatus = 15, ///< Medium Status (allocated spare info) + kMediaTagDvdRamSpareArea = 16, ///< Spare area descriptors + kMediaTagDvdrRmd = 17, ///< Recorded Media Data (RMD) last border-out + kMediaTagDvdrPreRecordedInfo = 18, ///< Pre-recorded info area (lead-in) + kMediaTagDvdrMediaIdentifier = 19, ///< DVD-R/-RW writable media identifier + kMediaTagDvdrPfi = 20, ///< DVD-R physical format (layer data) + kMediaTagDvdAdip = 21, ///< Address In Pregroove (DVD+ / wobble timing) + kMediaTagHddvdCpi = 22, ///< Content Protection Info (HD DVD) + kMediaTagHddvdMediumStatus = 23, ///< HD DVD Medium status (spares/defects) + kMediaTagDvddlLayerCapacity = 24, ///< Dual layer capacity & break info + kMediaTagDvddlMiddleZoneAddress = 25, ///< Middle zone start LBA + kMediaTagDvddlJumpIntervalSize = 26, ///< Jump interval size (opposite track path) + kMediaTagDvddlManualLayerJumpLba = 27, ///< Manual layer jump LBA (OTP) + kMediaTagBlurayDi = 28, ///< Disc Information (BD) + kMediaTagBlurayBca = 29, ///< Blu-ray Burst Cutting Area + kMediaTagBlurayDds = 30, ///< Disc Definition Structure (recordable) + kMediaTagBlurayCartridgeStatus = 31, ///< Cartridge presence / write protect (BD-RE/BD-R in caddy) + kMediaTagBluraySpareArea = 32, ///< BD spare area allocation map + kMediaTagAacsVolumeIdentifier = 33, ///< AACS Volume Identifier + kMediaTagAacsSerialNumber = 34, ///< Pre-recorded media serial number (AACS) + kMediaTagAacsMediaIdentifier = 35, ///< AACS Media Identifier (unique per disc) + kMediaTagAacsMkb = 36, ///< AACS Media Key Block + kMediaTagAacsDataKeys = 37, ///< Extracted AACS title/volume keys (when decrypted) + kMediaTagAacsLbaExtents = 38, ///< LBA extents requiring bus encryption + kMediaTagCprmMkb = 39, ///< CPRM Media Key Block + kMediaTagHybridRecognizedLayers = 40, ///< Hybrid disc recognized layer combinations (e.g. CD/DVD/BD) + kMediaTagMmcWriteProtection = 41, ///< Write protection status (MMC GET CONFIG) + kMediaTagMmcDiscInformation = 42, ///< Disc Information (recordable status, erasable, last session) + kMediaTagMmcTrackResourcesInformation = 43, ///< Track Resources (allocated/open track data) + kMediaTagMmcPowResourcesInformation = 44, ///< Pseudo OverWrite resources (BD-R POW) + kMediaTagScsiInquiry = 45, ///< SCSI INQUIRY standard data (SPC-*) + kMediaTagScsiModePage2A = 46, ///< SCSI Mode Page 2Ah (CD/DVD capabilities) + kMediaTagAtaIdentify = 47, ///< ATA IDENTIFY DEVICE (512 bytes) + kMediaTagAtapiIdentify = 48, ///< ATA PACKET IDENTIFY DEVICE + kMediaTagPcmciaCis = 49, ///< PCMCIA/CardBus CIS tuple chain + kMediaTagSdCid = 50, ///< SecureDigital Card ID register + kMediaTagSdCsd = 51, ///< SecureDigital Card Specific Data + kMediaTagSdScr = 52, ///< SecureDigital Configuration Register + kMediaTagSdOcr = 53, ///< SecureDigital Operation Conditions (voltage) + kMediaTagMmcCid = 54, ///< MMC Card ID + kMediaTagMmcCsd = 55, ///< MMC Card Specific Data + kMediaTagMmcOcr = 56, ///< MMC Operation Conditions + kMediaTagExtendedCsd = 57, ///< MMC Extended CSD (512 bytes) + kMediaTagXboxSecuritySector = 58, ///< Xbox/Xbox 360 Security Sector (SS.bin) + kMediaTagFloppyLeadOut = 59, ///< Manufacturer / duplication cylinder (floppy special data) + kMediaTagDiscControlBlock = 60, ///< DVD Disc Control Blocks + kMediaTagCdFirstTrackPregap = 61, ///< First track pregap (index 0) + kMediaTagCdLeadOut = 62, ///< Lead-out area contents + kMediaTagScsiModeSense6 = 63, ///< Raw MODE SENSE (6) data + kMediaTagScsiModeSense10 = 64, ///< Raw MODE SENSE (10) data + kMediaTagUsbDescriptors = 65, ///< Concatenated USB descriptors (device/config/interface) + kMediaTagXboxDmi = 66, ///< Xbox Disc Manufacturing Info (DMI) + kMediaTagXboxPfi = 67, ///< Xbox Physical Format Information (PFI) + kMediaTagCdLeadIn = 68, ///< Raw lead-in (TOC frames) + kMediaTagMiniDiscType = 69, ///< 8 bytes response that seems to define type of MiniDisc + kMediaTagMiniDiscD5 = 70, ///< 4 bytes response to vendor command D5h + kMediaTagMiniDiscUtoc = + 71, ///< User TOC, contains fragments, track names, and can be from 1 to 3 sectors of 2336 bytes + kMediaTagMiniDiscDtoc = 72, ///< Not entirely clear kind of TOC that only appears on MD-DATA discs + kMediaTagDvdDiscKeyDecrypted = 73, ///< Decrypted DVD disc key, + kMediaTagDvdPfi2ndLayer = 74, ///< DVD Physical Format Information for the second layer + kMediaTagFloppyWriteProtect = 75, ///< Write protection status of the floppy disk + kMediaTagWiiUDiscKey = 76, ///< Nintendo Wii U disc key (16 bytes, from non-readable disc area) + kMediaTagPs3DiscKey = 77, ///< PS3 derived disc key (16 bytes) + kMediaTagPs3Data1 = 78, ///< PS3 data1 key (16 bytes, from disc) + kMediaTagPs3Data2 = 79, ///< PS3 data2 key (16 bytes, from disc) + kMediaTagPs3Pic = 80, ///< PS3 PIC data (115 bytes, from disc lead-in) + kMediaTagPs3EncryptionMap = 81, ///< PS3 encryption region map (serialized from sector 0) + MaxMediaTag = kMediaTagPs3EncryptionMap } MediaTagType; /** @} */ /* end of MediaTags group */ diff --git a/src/helpers.c b/src/helpers.c index 3fb6bcd..ba67988 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -17,8 +17,8 @@ */ #if defined(_WIN32) || defined(_WIN64) -#include #include +#include #endif #include @@ -41,161 +41,161 @@ AARU_LOCAL int32_t AARU_CALL aaruf_get_media_tag_type_for_datatype(const int32_t switch(type) { case CompactDiscPartialToc: - return CD_TOC; + return kMediaTagCdToc; case CompactDiscSessionInfo: - return CD_SessionInfo; + return kMediaTagSessionInfo; case CompactDiscToc: - return CD_FullTOC; + return kMediaTagFullToc; case CompactDiscPma: - return CD_PMA; + return kMediaTagCdPma; case CompactDiscAtip: - return CD_ATIP; + return kMediaTagCdAtip; case CompactDiscLeadInCdText: - return CD_TEXT; + return kMediaTagCdText; case DvdPfi: - return DVD_PFI; + return kMediaTagDvdPfi; case DvdPfi2ndLayer: - return DVD_PFI_2ndLayer; + return kMediaTagDvdPfi2ndLayer; case DvdLeadInCmi: - return DVD_CMI; + return kMediaTagDvdCmi; case DvdDiscKey: - return DVD_DiscKey; + return kMediaTagDvdDiscKey; case DvdBca: - return DVD_BCA; + return kMediaTagDvdBca; case DvdDmi: - return DVD_DMI; + return kMediaTagDvdDmi; case DvdMediaIdentifier: - return DVD_MediaIdentifier; + return kMediaTagDvdMediaIdentifier; case DvdMediaKeyBlock: - return DVD_MKB; + return kMediaTagDvdMkb; case DvdRamDds: - return DVDRAM_DDS; + return kMediaTagDvdRamDds; case DvdRamMediumStatus: - return DVDRAM_MediumStatus; + return kMediaTagDvdRamMediumStatus; case DvdRamSpareArea: - return DVDRAM_SpareArea; + return kMediaTagDvdRamSpareArea; case DvdRRmd: - return DVDR_RMD; + return kMediaTagDvdrRmd; case DvdRPrerecordedInfo: - return DVDR_PreRecordedInfo; + return kMediaTagDvdrPreRecordedInfo; case DvdRMediaIdentifier: - return DVDR_MediaIdentifier; + return kMediaTagDvdrMediaIdentifier; case DvdRPfi: - return DVDR_PFI; + return kMediaTagDvdrPfi; case DvdAdip: - return DVD_ADIP; + return kMediaTagDvdAdip; case HdDvdCpi: - return HDDVD_CPI; + return kMediaTagHddvdCpi; case HdDvdMediumStatus: - return HDDVD_MediumStatus; + return kMediaTagHddvdMediumStatus; case DvdDlLayerCapacity: - return DVDDL_LayerCapacity; + return kMediaTagDvddlLayerCapacity; case DvdDlMiddleZoneAddress: - return DVDDL_MiddleZoneAddress; + return kMediaTagDvddlMiddleZoneAddress; case DvdDlJumpIntervalSize: - return DVDDL_JumpIntervalSize; + return kMediaTagDvddlJumpIntervalSize; case DvdDlManualLayerJumpLba: - return DVDDL_ManualLayerJumpLBA; + return kMediaTagDvddlManualLayerJumpLba; case BlurayDi: - return BD_DI; + return kMediaTagBlurayDi; case BlurayBca: - return BD_BCA; + return kMediaTagBlurayBca; case BlurayDds: - return BD_DDS; + return kMediaTagBlurayDds; case BlurayCartridgeStatus: - return BD_CartridgeStatus; + return kMediaTagBlurayCartridgeStatus; case BluraySpareArea: - return BD_SpareArea; + return kMediaTagBluraySpareArea; case AacsVolumeIdentifier: - return AACS_VolumeIdentifier; + return kMediaTagAacsVolumeIdentifier; case AacsSerialNumber: - return AACS_SerialNumber; + return kMediaTagAacsSerialNumber; case AacsMediaIdentifier: - return AACS_MediaIdentifier; + return kMediaTagAacsMediaIdentifier; case AacsMediaKeyBlock: - return AACS_MKB; + return kMediaTagAacsMkb; case AacsDataKeys: - return AACS_DataKeys; + return kMediaTagAacsDataKeys; case AacsLbaExtents: - return AACS_LBAExtents; + return kMediaTagAacsLbaExtents; case CprmMediaKeyBlock: - return AACS_CPRM_MKB; + return kMediaTagCprmMkb; case HybridRecognizedLayers: - return Hybrid_RecognizedLayers; + return kMediaTagHybridRecognizedLayers; case ScsiMmcWriteProtection: - return MMC_WriteProtection; + return kMediaTagMmcWriteProtection; case ScsiMmcDiscInformation: - return MMC_DiscInformation; + return kMediaTagMmcDiscInformation; case ScsiMmcTrackResourcesInformation: - return MMC_TrackResourcesInformation; + return kMediaTagMmcTrackResourcesInformation; case ScsiMmcPowResourcesInformation: - return MMC_POWResourcesInformation; + return kMediaTagMmcPowResourcesInformation; case ScsiInquiry: - return SCSI_INQUIRY; + return kMediaTagScsiInquiry; case ScsiModePage2A: - return SCSI_MODEPAGE_2A; + return kMediaTagScsiModePage2A; case AtaIdentify: - return ATA_IDENTIFY; + return kMediaTagAtaIdentify; case AtapiIdentify: - return ATAPI_IDENTIFY; + return kMediaTagAtapiIdentify; case PcmciaCis: - return PCMCIA_CIS; + return kMediaTagPcmciaCis; case SecureDigitalCid: - return SD_CID; + return kMediaTagSdCid; case SecureDigitalCsd: - return SD_CSD; + return kMediaTagSdCsd; case SecureDigitalScr: - return SD_SCR; + return kMediaTagSdScr; case SecureDigitalOcr: - return SD_OCR; + return kMediaTagSdOcr; case MultiMediaCardCid: - return MMC_CID; + return kMediaTagMmcCid; case MultiMediaCardCsd: - return MMC_CSD; + return kMediaTagMmcCsd; case MultiMediaCardOcr: - return MMC_OCR; + return kMediaTagMmcOcr; case MultiMediaCardExtendedCsd: - return MMC_ExtendedCSD; + return kMediaTagExtendedCsd; case XboxSecuritySector: - return Xbox_SecuritySector; + return kMediaTagXboxSecuritySector; case FloppyLeadOut: - return Floppy_LeadOut; + return kMediaTagFloppyLeadOut; case DvdDiscControlBlock: - return DiscControlBlock; + return kMediaTagDiscControlBlock; case CompactDiscFirstTrackPregap: - return CD_FirstTrackPregap; + return kMediaTagCdFirstTrackPregap; case CompactDiscLeadOut: - return CD_LeadOut; + return kMediaTagCdLeadOut; case ScsiModeSense6: - return SCSI_MODESENSE_6; + return kMediaTagScsiModeSense6; case ScsiModeSense10: - return SCSI_MODESENSE_10; + return kMediaTagScsiModeSense10; case UsbDescriptors: - return USB_Descriptors; + return kMediaTagUsbDescriptors; case XboxDmi: - return Xbox_DMI; + return kMediaTagXboxDmi; case XboxPfi: - return Xbox_PFI; + return kMediaTagXboxPfi; case CompactDiscMediaCatalogueNumber: - return CD_MCN; + return kMediaTagCdMcn; case CompactDiscLeadIn: - return CD_LeadIn; + return kMediaTagCdLeadIn; case DvdDiscKeyDecrypted: - return DVD_DiscKey_Decrypted; + return kMediaTagDvdDiscKeyDecrypted; case FloppyWriteProtectStatus: - return Floppy_WriteProtect; + return kMediaTagFloppyWriteProtect; case NintendoWiiUDiscKey: - return WiiUDiscKey; + return kMediaTagWiiUDiscKey; case PS3DiscKey: - return PS3_DiscKey; + return kMediaTagPs3DiscKey; case PS3Data1: - return PS3_Data1; + return kMediaTagPs3Data1; case PS3Data2: - return PS3_Data2; + return kMediaTagPs3Data2; case PS3PIC: - return PS3_PIC; + return kMediaTagPs3Pic; case PS3EncryptionMap: - return PS3_EncryptionMap; + return kMediaTagPs3EncryptionMap; default: return -1; } @@ -214,161 +214,161 @@ AARU_LOCAL int32_t AARU_CALL aaruf_get_datatype_for_media_tag_type(const int32_t { switch(tag_type) { - case CD_TOC: + case kMediaTagCdToc: return CompactDiscPartialToc; - case CD_SessionInfo: + case kMediaTagSessionInfo: return CompactDiscSessionInfo; - case CD_FullTOC: + case kMediaTagFullToc: return CompactDiscToc; - case CD_PMA: + case kMediaTagCdPma: return CompactDiscPma; - case CD_ATIP: + case kMediaTagCdAtip: return CompactDiscAtip; - case CD_TEXT: + case kMediaTagCdText: return CompactDiscLeadInCdText; - case DVD_PFI: + case kMediaTagDvdPfi: return DvdPfi; - case DVD_PFI_2ndLayer: + case kMediaTagDvdPfi2ndLayer: return DvdPfi2ndLayer; - case DVD_CMI: + case kMediaTagDvdCmi: return DvdLeadInCmi; - case DVD_DiscKey: + case kMediaTagDvdDiscKey: return DvdDiscKey; - case DVD_BCA: + case kMediaTagDvdBca: return DvdBca; - case DVD_DMI: + case kMediaTagDvdDmi: return DvdDmi; - case DVD_MediaIdentifier: + case kMediaTagDvdMediaIdentifier: return DvdMediaIdentifier; - case DVD_MKB: + case kMediaTagDvdMkb: return DvdMediaKeyBlock; - case DVDRAM_DDS: + case kMediaTagDvdRamDds: return DvdRamDds; - case DVDRAM_MediumStatus: + case kMediaTagDvdRamMediumStatus: return DvdRamMediumStatus; - case DVDRAM_SpareArea: + case kMediaTagDvdRamSpareArea: return DvdRamSpareArea; - case DVDR_RMD: + case kMediaTagDvdrRmd: return DvdRRmd; - case DVDR_PreRecordedInfo: + case kMediaTagDvdrPreRecordedInfo: return DvdRPrerecordedInfo; - case DVDR_MediaIdentifier: + case kMediaTagDvdrMediaIdentifier: return DvdRMediaIdentifier; - case DVDR_PFI: + case kMediaTagDvdrPfi: return DvdRPfi; - case DVD_ADIP: + case kMediaTagDvdAdip: return DvdAdip; - case HDDVD_CPI: + case kMediaTagHddvdCpi: return HdDvdCpi; - case HDDVD_MediumStatus: + case kMediaTagHddvdMediumStatus: return HdDvdMediumStatus; - case DVDDL_LayerCapacity: + case kMediaTagDvddlLayerCapacity: return DvdDlLayerCapacity; - case DVDDL_MiddleZoneAddress: + case kMediaTagDvddlMiddleZoneAddress: return DvdDlMiddleZoneAddress; - case DVDDL_JumpIntervalSize: + case kMediaTagDvddlJumpIntervalSize: return DvdDlJumpIntervalSize; - case DVDDL_ManualLayerJumpLBA: + case kMediaTagDvddlManualLayerJumpLba: return DvdDlManualLayerJumpLba; - case BD_DI: + case kMediaTagBlurayDi: return BlurayDi; - case BD_BCA: + case kMediaTagBlurayBca: return BlurayBca; - case BD_DDS: + case kMediaTagBlurayDds: return BlurayDds; - case BD_CartridgeStatus: + case kMediaTagBlurayCartridgeStatus: return BlurayCartridgeStatus; - case BD_SpareArea: + case kMediaTagBluraySpareArea: return BluraySpareArea; - case AACS_VolumeIdentifier: + case kMediaTagAacsVolumeIdentifier: return AacsVolumeIdentifier; - case AACS_SerialNumber: + case kMediaTagAacsSerialNumber: return AacsSerialNumber; - case AACS_MediaIdentifier: + case kMediaTagAacsMediaIdentifier: return AacsMediaIdentifier; - case AACS_MKB: + case kMediaTagAacsMkb: return AacsMediaKeyBlock; - case AACS_DataKeys: + case kMediaTagAacsDataKeys: return AacsDataKeys; - case AACS_LBAExtents: + case kMediaTagAacsLbaExtents: return AacsLbaExtents; - case AACS_CPRM_MKB: + case kMediaTagCprmMkb: return CprmMediaKeyBlock; - case Hybrid_RecognizedLayers: + case kMediaTagHybridRecognizedLayers: return HybridRecognizedLayers; - case MMC_WriteProtection: + case kMediaTagMmcWriteProtection: return ScsiMmcWriteProtection; - case MMC_DiscInformation: + case kMediaTagMmcDiscInformation: return ScsiMmcDiscInformation; - case MMC_TrackResourcesInformation: + case kMediaTagMmcTrackResourcesInformation: return ScsiMmcTrackResourcesInformation; - case MMC_POWResourcesInformation: + case kMediaTagMmcPowResourcesInformation: return ScsiMmcPowResourcesInformation; - case SCSI_INQUIRY: + case kMediaTagScsiInquiry: return ScsiInquiry; - case SCSI_MODEPAGE_2A: + case kMediaTagScsiModePage2A: return ScsiModePage2A; - case ATA_IDENTIFY: + case kMediaTagAtaIdentify: return AtaIdentify; - case ATAPI_IDENTIFY: + case kMediaTagAtapiIdentify: return AtapiIdentify; - case PCMCIA_CIS: + case kMediaTagPcmciaCis: return PcmciaCis; - case SD_CID: + case kMediaTagSdCid: return SecureDigitalCid; - case SD_CSD: + case kMediaTagSdCsd: return SecureDigitalCsd; - case SD_SCR: + case kMediaTagSdScr: return SecureDigitalScr; - case SD_OCR: + case kMediaTagSdOcr: return SecureDigitalOcr; - case MMC_CID: + case kMediaTagMmcCid: return MultiMediaCardCid; - case MMC_CSD: + case kMediaTagMmcCsd: return MultiMediaCardCsd; - case MMC_OCR: + case kMediaTagMmcOcr: return MultiMediaCardOcr; - case MMC_ExtendedCSD: + case kMediaTagExtendedCsd: return MultiMediaCardExtendedCsd; - case Xbox_SecuritySector: + case kMediaTagXboxSecuritySector: return XboxSecuritySector; - case Floppy_LeadOut: + case kMediaTagFloppyLeadOut: return FloppyLeadOut; - case DiscControlBlock: + case kMediaTagDiscControlBlock: return DvdDiscControlBlock; - case CD_FirstTrackPregap: + case kMediaTagCdFirstTrackPregap: return CompactDiscFirstTrackPregap; - case CD_LeadOut: + case kMediaTagCdLeadOut: return CompactDiscLeadOut; - case SCSI_MODESENSE_6: + case kMediaTagScsiModeSense6: return ScsiModeSense6; - case SCSI_MODESENSE_10: + case kMediaTagScsiModeSense10: return ScsiModeSense10; - case USB_Descriptors: + case kMediaTagUsbDescriptors: return UsbDescriptors; - case Xbox_DMI: + case kMediaTagXboxDmi: return XboxDmi; - case Xbox_PFI: + case kMediaTagXboxPfi: return XboxPfi; - case CD_MCN: + case kMediaTagCdMcn: return CompactDiscMediaCatalogueNumber; - case CD_LeadIn: + case kMediaTagCdLeadIn: return CompactDiscLeadIn; - case DVD_DiscKey_Decrypted: + case kMediaTagDvdDiscKeyDecrypted: return DvdDiscKeyDecrypted; - case Floppy_WriteProtect: + case kMediaTagFloppyWriteProtect: return FloppyWriteProtectStatus; - case WiiUDiscKey: + case kMediaTagWiiUDiscKey: return NintendoWiiUDiscKey; - case PS3_DiscKey: + case kMediaTagPs3DiscKey: return PS3DiscKey; - case PS3_Data1: + case kMediaTagPs3Data1: return PS3Data1; - case PS3_Data2: + case kMediaTagPs3Data2: return PS3Data2; - case PS3_PIC: + case kMediaTagPs3Pic: return PS3PIC; - case PS3_EncryptionMap: + case kMediaTagPs3EncryptionMap: return PS3EncryptionMap; default: return -1; diff --git a/tool/helpers.c b/tool/helpers.c index 3811b37..ceb12e2 100644 --- a/tool/helpers.c +++ b/tool/helpers.c @@ -54,157 +54,157 @@ const char *media_tag_type_to_string(int32_t type) { switch(type) { - case CD_TOC: + case kMediaTagCdToc: return "CD Table of Contents"; - case CD_SessionInfo: + case kMediaTagSessionInfo: return "CD Session Information"; - case CD_FullTOC: + case kMediaTagFullToc: return "CD Full TOC (multi-session)"; - case CD_PMA: + case kMediaTagCdPma: return "CD Program Memory Area"; - case CD_ATIP: + case kMediaTagCdAtip: return "CD Absolute Time in Pregroove"; - case CD_TEXT: + case kMediaTagCdText: return "CD-Text"; - case CD_MCN: + case kMediaTagCdMcn: return "CD Media Catalogue Number"; - case DVD_PFI: + case kMediaTagDvdPfi: return "DVD Physical Format Information"; - case DVD_CMI: + case kMediaTagDvdCmi: return "DVD Copyright Management Information"; - case DVD_DiscKey: + case kMediaTagDvdDiscKey: return "DVD Disc Key"; - case DVD_BCA: + case kMediaTagDvdBca: return "DVD Burst Cutting Area"; - case DVD_DMI: + case kMediaTagDvdDmi: return "DVD Disc Manufacturing Information"; - case DVD_MediaIdentifier: + case kMediaTagDvdMediaIdentifier: return "DVD Media Identifier"; - case DVD_MKB: + case kMediaTagDvdMkb: return "DVD Media Key Block"; - case DVDRAM_DDS: + case kMediaTagDvdRamDds: return "DVD-RAM Defect Data Structure"; - case DVDRAM_MediumStatus: + case kMediaTagDvdRamMediumStatus: return "DVD-RAM Medium Status"; - case DVDRAM_SpareArea: + case kMediaTagDvdRamSpareArea: return "DVD-RAM Spare Area"; - case DVDR_RMD: + case kMediaTagDvdrRmd: return "DVD-R Recording Management Data"; - case DVDR_PreRecordedInfo: + case kMediaTagDvdrPreRecordedInfo: return "DVD-R Pre-recorded Information"; - case DVDR_MediaIdentifier: + case kMediaTagDvdrMediaIdentifier: return "DVD-R Media Identifier"; - case DVDR_PFI: + case kMediaTagDvdrPfi: return "DVD-R Physical Format Information"; - case DVD_ADIP: + case kMediaTagDvdAdip: return "DVD Address in Pregroove"; - case HDDVD_CPI: + case kMediaTagHddvdCpi: return "HD DVD Content Protection Information"; - case HDDVD_MediumStatus: + case kMediaTagHddvdMediumStatus: return "HD DVD Medium Status"; - case DVDDL_LayerCapacity: + case kMediaTagDvddlLayerCapacity: return "DVD Dual Layer - Layer Capacity"; - case DVDDL_MiddleZoneAddress: + case kMediaTagDvddlMiddleZoneAddress: return "DVD Dual Layer - Middle Zone Address"; - case DVDDL_JumpIntervalSize: + case kMediaTagDvddlJumpIntervalSize: return "DVD Dual Layer - Jump Interval Size"; - case DVDDL_ManualLayerJumpLBA: + case kMediaTagDvddlManualLayerJumpLba: return "DVD Dual Layer - Manual Layer Jump LBA"; - case BD_DI: + case kMediaTagBlurayDi: return "Blu-ray Disc Information"; - case BD_BCA: + case kMediaTagBlurayBca: return "Blu-ray Burst Cutting Area"; - case BD_DDS: + case kMediaTagBlurayDds: return "Blu-ray Disc Definition Structure"; - case BD_CartridgeStatus: + case kMediaTagBlurayCartridgeStatus: return "Blu-ray Cartridge Status"; - case BD_SpareArea: + case kMediaTagBluraySpareArea: return "Blu-ray Spare Area"; - case AACS_VolumeIdentifier: + case kMediaTagAacsVolumeIdentifier: return "AACS Volume Identifier"; - case AACS_SerialNumber: + case kMediaTagAacsSerialNumber: return "AACS Serial Number"; - case AACS_MediaIdentifier: + case kMediaTagAacsMediaIdentifier: return "AACS Media Identifier"; - case AACS_MKB: + case kMediaTagAacsMkb: return "AACS Media Key Block"; - case AACS_DataKeys: + case kMediaTagAacsDataKeys: return "AACS Data Keys"; - case AACS_LBAExtents: + case kMediaTagAacsLbaExtents: return "AACS LBA Extents"; - case AACS_CPRM_MKB: + case kMediaTagCprmMkb: return "CPRM Media Key Block"; - case Hybrid_RecognizedLayers: + case kMediaTagHybridRecognizedLayers: return "Hybrid Disc - Recognized Layers"; - case MMC_WriteProtection: + case kMediaTagMmcWriteProtection: return "MMC Write Protection Status"; - case MMC_DiscInformation: + case kMediaTagMmcDiscInformation: return "MMC Disc Information"; - case MMC_TrackResourcesInformation: + case kMediaTagMmcTrackResourcesInformation: return "MMC Track Resources Information"; - case MMC_POWResourcesInformation: + case kMediaTagMmcPowResourcesInformation: return "MMC POW Resources Information"; - case SCSI_INQUIRY: + case kMediaTagScsiInquiry: return "SCSI INQUIRY Data"; - case SCSI_MODEPAGE_2A: + case kMediaTagScsiModePage2A: return "SCSI Mode Page 2Ah (CD/DVD Capabilities)"; - case ATA_IDENTIFY: + case kMediaTagAtaIdentify: return "ATA IDENTIFY DEVICE"; - case ATAPI_IDENTIFY: + case kMediaTagAtapiIdentify: return "ATAPI IDENTIFY DEVICE"; - case PCMCIA_CIS: + case kMediaTagPcmciaCis: return "PCMCIA Card Information Structure"; - case SD_CID: + case kMediaTagSdCid: return "Secure Digital Card ID"; - case SD_CSD: + case kMediaTagSdCsd: return "Secure Digital Card Specific Data"; - case SD_SCR: + case kMediaTagSdScr: return "Secure Digital Configuration Register"; - case SD_OCR: + case kMediaTagSdOcr: return "Secure Digital Operation Conditions"; - case MMC_CID: + case kMediaTagMmcCid: return "MultiMediaCard Card ID"; - case MMC_CSD: + case kMediaTagMmcCsd: return "MultiMediaCard Card Specific Data"; - case MMC_OCR: + case kMediaTagMmcOcr: return "MultiMediaCard Operation Conditions"; - case MMC_ExtendedCSD: + case kMediaTagExtendedCsd: return "MultiMediaCard Extended CSD"; - case Xbox_SecuritySector: + case kMediaTagXboxSecuritySector: return "Xbox Security Sector"; - case Floppy_LeadOut: + case kMediaTagFloppyLeadOut: return "Floppy Lead-out"; - case DiscControlBlock: + case kMediaTagDiscControlBlock: return "DVD Disc Control Block"; - case CD_FirstTrackPregap: + case kMediaTagCdFirstTrackPregap: return "CD First Track Pre-gap"; - case CD_LeadOut: + case kMediaTagCdLeadOut: return "CD Lead-out"; - case SCSI_MODESENSE_6: + case kMediaTagScsiModeSense6: return "SCSI MODE SENSE (6)"; - case SCSI_MODESENSE_10: + case kMediaTagScsiModeSense10: return "SCSI MODE SENSE (10)"; - case USB_Descriptors: + case kMediaTagUsbDescriptors: return "USB Descriptors"; - case Xbox_DMI: + case kMediaTagXboxDmi: return "Xbox Disc Manufacturing Information"; - case Xbox_PFI: + case kMediaTagXboxPfi: return "Xbox Physical Format Information"; - case CD_LeadIn: + case kMediaTagCdLeadIn: return "CD Lead-in"; - case MiniDiscType: + case kMediaTagMiniDiscType: return "MiniDisc Type"; - case MiniDiscD5: + case kMediaTagMiniDiscD5: return "MiniDisc D5h Response"; - case MiniDiscUTOC: + case kMediaTagMiniDiscUtoc: return "MiniDisc User TOC"; - case MiniDiscDTOC: + case kMediaTagMiniDiscDtoc: return "MiniDisc Data TOC"; - case DVD_DiscKey_Decrypted: + case kMediaTagDvdDiscKeyDecrypted: return "DVD Disc Key (decrypted)"; - case DVD_PFI_2ndLayer: + case kMediaTagDvdPfi2ndLayer: return "DVD Physical Format Information (2nd layer)"; - case Floppy_WriteProtect: + case kMediaTagFloppyWriteProtect: return "Floppy Write-Protect Status"; default: return "Unknown Media Tag"; diff --git a/tool/inject_media_tag.c b/tool/inject_media_tag.c index d4d7a31..698b5ae 100644 --- a/tool/inject_media_tag.c +++ b/tool/inject_media_tag.c @@ -49,82 +49,82 @@ typedef struct // clang-format off static const MediaTagTypeMapping media_tag_mappings[] = { - {"CD_TOC", CD_TOC}, - {"CD_SessionInfo", CD_SessionInfo}, - {"CD_FullTOC", CD_FullTOC}, - {"CD_PMA", CD_PMA}, - {"CD_ATIP", CD_ATIP}, - {"CD_TEXT", CD_TEXT}, - {"CD_MCN", CD_MCN}, - {"DVD_PFI", DVD_PFI}, - {"DVD_CMI", DVD_CMI}, - {"DVD_DiscKey", DVD_DiscKey}, - {"DVD_BCA", DVD_BCA}, - {"DVD_DMI", DVD_DMI}, - {"DVD_MediaIdentifier", DVD_MediaIdentifier}, - {"DVD_MKB", DVD_MKB}, - {"DVDRAM_DDS", DVDRAM_DDS}, - {"DVDRAM_MediumStatus", DVDRAM_MediumStatus}, - {"DVDRAM_SpareArea", DVDRAM_SpareArea}, - {"DVDR_RMD", DVDR_RMD}, - {"DVDR_PreRecordedInfo", DVDR_PreRecordedInfo}, - {"DVDR_MediaIdentifier", DVDR_MediaIdentifier}, - {"DVDR_PFI", DVDR_PFI}, - {"DVD_ADIP", DVD_ADIP}, - {"HDDVD_CPI", HDDVD_CPI}, - {"HDDVD_MediumStatus", HDDVD_MediumStatus}, - {"DVDDL_LayerCapacity", DVDDL_LayerCapacity}, - {"DVDDL_MiddleZoneAddress", DVDDL_MiddleZoneAddress}, - {"DVDDL_JumpIntervalSize", DVDDL_JumpIntervalSize}, - {"DVDDL_ManualLayerJumpLBA", DVDDL_ManualLayerJumpLBA}, - {"BD_DI", BD_DI}, - {"BD_BCA", BD_BCA}, - {"BD_DDS", BD_DDS}, - {"BD_CartridgeStatus", BD_CartridgeStatus}, - {"BD_SpareArea", BD_SpareArea}, - {"AACS_VolumeIdentifier", AACS_VolumeIdentifier}, - {"AACS_SerialNumber", AACS_SerialNumber}, - {"AACS_MediaIdentifier", AACS_MediaIdentifier}, - {"AACS_MKB", AACS_MKB}, - {"AACS_DataKeys", AACS_DataKeys}, - {"AACS_LBAExtents", AACS_LBAExtents}, - {"AACS_CPRM_MKB", AACS_CPRM_MKB}, - {"Hybrid_RecognizedLayers", Hybrid_RecognizedLayers}, - {"MMC_WriteProtection", MMC_WriteProtection}, - {"MMC_DiscInformation", MMC_DiscInformation}, - {"MMC_TrackResourcesInformation", MMC_TrackResourcesInformation}, - {"MMC_POWResourcesInformation", MMC_POWResourcesInformation}, - {"SCSI_INQUIRY", SCSI_INQUIRY}, - {"SCSI_MODEPAGE_2A", SCSI_MODEPAGE_2A}, - {"ATA_IDENTIFY", ATA_IDENTIFY}, - {"ATAPI_IDENTIFY", ATAPI_IDENTIFY}, - {"PCMCIA_CIS", PCMCIA_CIS}, - {"SD_CID", SD_CID}, - {"SD_CSD", SD_CSD}, - {"SD_SCR", SD_SCR}, - {"SD_OCR", SD_OCR}, - {"MMC_CID", MMC_CID}, - {"MMC_CSD", MMC_CSD}, - {"MMC_OCR", MMC_OCR}, - {"MMC_ExtendedCSD", MMC_ExtendedCSD}, - {"Xbox_SecuritySector", Xbox_SecuritySector}, - {"Floppy_LeadOut", Floppy_LeadOut}, - {"DiscControlBlock", DiscControlBlock}, - {"CD_FirstTrackPregap", CD_FirstTrackPregap}, - {"CD_LeadOut", CD_LeadOut}, - {"SCSI_MODESENSE_6", SCSI_MODESENSE_6}, - {"SCSI_MODESENSE_10", SCSI_MODESENSE_10}, - {"USB_Descriptors", USB_Descriptors}, - {"Xbox_DMI", Xbox_DMI}, - {"Xbox_PFI", Xbox_PFI}, - {"CD_LeadIn", CD_LeadIn}, - {"MiniDiscType", MiniDiscType}, - {"MiniDiscD5", MiniDiscD5}, - {"MiniDiscUTOC", MiniDiscUTOC}, - {"MiniDiscDTOC", MiniDiscDTOC}, - {"DVD_DiscKey_Decrypted", DVD_DiscKey_Decrypted}, - {"DVD_PFI_2ndLayer", DVD_PFI_2ndLayer}, - {"Floppy_WriteProtect", Floppy_WriteProtect}, + {"kMediaTagCdToc", kMediaTagCdToc}, + {"kMediaTagSessionInfo", kMediaTagSessionInfo}, + {"kMediaTagFullToc", kMediaTagFullToc}, + {"kMediaTagCdPma", kMediaTagCdPma}, + {"kMediaTagCdAtip", kMediaTagCdAtip}, + {"kMediaTagCdText", kMediaTagCdText}, + {"kMediaTagCdMcn", kMediaTagCdMcn}, + {"kMediaTagDvdPfi", kMediaTagDvdPfi}, + {"kMediaTagDvdCmi", kMediaTagDvdCmi}, + {"kMediaTagDvdDiscKey", kMediaTagDvdDiscKey}, + {"kMediaTagDvdBca", kMediaTagDvdBca}, + {"kMediaTagDvdDmi", kMediaTagDvdDmi}, + {"kMediaTagDvdMediaIdentifier", kMediaTagDvdMediaIdentifier}, + {"kMediaTagDvdMkb", kMediaTagDvdMkb}, + {"kMediaTagDvdRamDds", kMediaTagDvdRamDds}, + {"kMediaTagDvdRamMediumStatus", kMediaTagDvdRamMediumStatus}, + {"kMediaTagDvdRamSpareArea", kMediaTagDvdRamSpareArea}, + {"kMediaTagDvdrRmd", kMediaTagDvdrRmd}, + {"kMediaTagDvdrPreRecordedInfo", kMediaTagDvdrPreRecordedInfo}, + {"kMediaTagDvdrMediaIdentifier", kMediaTagDvdrMediaIdentifier}, + {"kMediaTagDvdrPfi", kMediaTagDvdrPfi}, + {"kMediaTagDvdAdip", kMediaTagDvdAdip}, + {"kMediaTagHddvdCpi", kMediaTagHddvdCpi}, + {"kMediaTagHddvdMediumStatus", kMediaTagHddvdMediumStatus}, + {"kMediaTagDvddlLayerCapacity", kMediaTagDvddlLayerCapacity}, + {"kMediaTagDvddlMiddleZoneAddress", kMediaTagDvddlMiddleZoneAddress}, + {"kMediaTagDvddlJumpIntervalSize", kMediaTagDvddlJumpIntervalSize}, + {"kMediaTagDvddlManualLayerJumpLba", kMediaTagDvddlManualLayerJumpLba}, + {"kMediaTagBlurayDi", kMediaTagBlurayDi}, + {"kMediaTagBlurayBca", kMediaTagBlurayBca}, + {"kMediaTagBlurayDds", kMediaTagBlurayDds}, + {"kMediaTagBlurayCartridgeStatus", kMediaTagBlurayCartridgeStatus}, + {"kMediaTagBluraySpareArea", kMediaTagBluraySpareArea}, + {"kMediaTagAacsVolumeIdentifier", kMediaTagAacsVolumeIdentifier}, + {"kMediaTagAacsSerialNumber", kMediaTagAacsSerialNumber}, + {"kMediaTagAacsMediaIdentifier", kMediaTagAacsMediaIdentifier}, + {"kMediaTagAacsMkb", kMediaTagAacsMkb}, + {"kMediaTagAacsDataKeys", kMediaTagAacsDataKeys}, + {"kMediaTagAacsLbaExtents", kMediaTagAacsLbaExtents}, + {"kMediaTagCprmMkb", kMediaTagCprmMkb}, + {"kMediaTagHybridRecognizedLayers", kMediaTagHybridRecognizedLayers}, + {"kMediaTagMmcWriteProtection", kMediaTagMmcWriteProtection}, + {"kMediaTagMmcDiscInformation", kMediaTagMmcDiscInformation}, + {"kMediaTagMmcTrackResourcesInformation", kMediaTagMmcTrackResourcesInformation}, + {"kMediaTagMmcPowResourcesInformation", kMediaTagMmcPowResourcesInformation}, + {"kMediaTagScsiInquiry", kMediaTagScsiInquiry}, + {"kMediaTagScsiModePage2A", kMediaTagScsiModePage2A}, + {"kMediaTagAtaIdentify", kMediaTagAtaIdentify}, + {"kMediaTagAtapiIdentify", kMediaTagAtapiIdentify}, + {"kMediaTagPcmciaCis", kMediaTagPcmciaCis}, + {"kMediaTagSdCid", kMediaTagSdCid}, + {"kMediaTagSdCsd", kMediaTagSdCsd}, + {"kMediaTagSdScr", kMediaTagSdScr}, + {"kMediaTagSdOcr", kMediaTagSdOcr}, + {"kMediaTagMmcCid", kMediaTagMmcCid}, + {"kMediaTagMmcCsd", kMediaTagMmcCsd}, + {"kMediaTagMmcOcr", kMediaTagMmcOcr}, + {"kMediaTagExtendedCsd", kMediaTagExtendedCsd}, + {"kMediaTagXboxSecuritySector", kMediaTagXboxSecuritySector}, + {"kMediaTagFloppyLeadOut", kMediaTagFloppyLeadOut}, + {"kMediaTagDiscControlBlock", kMediaTagDiscControlBlock}, + {"kMediaTagCdFirstTrackPregap", kMediaTagCdFirstTrackPregap}, + {"kMediaTagCdLeadOut", kMediaTagCdLeadOut}, + {"kMediaTagScsiModeSense6", kMediaTagScsiModeSense6}, + {"kMediaTagScsiModeSense10", kMediaTagScsiModeSense10}, + {"kMediaTagUsbDescriptors", kMediaTagUsbDescriptors}, + {"kMediaTagXboxDmi", kMediaTagXboxDmi}, + {"kMediaTagXboxPfi", kMediaTagXboxPfi}, + {"kMediaTagCdLeadIn", kMediaTagCdLeadIn}, + {"kMediaTagMiniDiscType", kMediaTagMiniDiscType}, + {"kMediaTagMiniDiscD5", kMediaTagMiniDiscD5}, + {"kMediaTagMiniDiscUtoc", kMediaTagMiniDiscUtoc}, + {"kMediaTagMiniDiscDtoc", kMediaTagMiniDiscDtoc}, + {"kMediaTagDvdDiscKeyDecrypted", kMediaTagDvdDiscKeyDecrypted}, + {"kMediaTagDvdPfi2ndLayer", kMediaTagDvdPfi2ndLayer}, + {"kMediaTagFloppyWriteProtect", kMediaTagFloppyWriteProtect}, }; // clang-format on @@ -137,149 +137,149 @@ static int32_t get_datatype_for_media_tag_type(MediaTagType tag_type) { switch(tag_type) { - case CD_TOC: + case kMediaTagCdToc: return CompactDiscPartialToc; - case CD_SessionInfo: + case kMediaTagSessionInfo: return CompactDiscSessionInfo; - case CD_FullTOC: + case kMediaTagFullToc: return CompactDiscToc; - case CD_PMA: + case kMediaTagCdPma: return CompactDiscPma; - case CD_ATIP: + case kMediaTagCdAtip: return CompactDiscAtip; - case CD_TEXT: + case kMediaTagCdText: return CompactDiscLeadInCdText; - case DVD_PFI: + case kMediaTagDvdPfi: return DvdPfi; - case DVD_PFI_2ndLayer: + case kMediaTagDvdPfi2ndLayer: return DvdPfi2ndLayer; - case DVD_CMI: + case kMediaTagDvdCmi: return DvdLeadInCmi; - case DVD_DiscKey: + case kMediaTagDvdDiscKey: return DvdDiscKey; - case DVD_BCA: + case kMediaTagDvdBca: return DvdBca; - case DVD_DMI: + case kMediaTagDvdDmi: return DvdDmi; - case DVD_MediaIdentifier: + case kMediaTagDvdMediaIdentifier: return DvdMediaIdentifier; - case DVD_MKB: + case kMediaTagDvdMkb: return DvdMediaKeyBlock; - case DVDRAM_DDS: + case kMediaTagDvdRamDds: return DvdRamDds; - case DVDRAM_MediumStatus: + case kMediaTagDvdRamMediumStatus: return DvdRamMediumStatus; - case DVDRAM_SpareArea: + case kMediaTagDvdRamSpareArea: return DvdRamSpareArea; - case DVDR_RMD: + case kMediaTagDvdrRmd: return DvdRRmd; - case DVDR_PreRecordedInfo: + case kMediaTagDvdrPreRecordedInfo: return DvdRPrerecordedInfo; - case DVDR_MediaIdentifier: + case kMediaTagDvdrMediaIdentifier: return DvdRMediaIdentifier; - case DVDR_PFI: + case kMediaTagDvdrPfi: return DvdRPfi; - case DVD_ADIP: + case kMediaTagDvdAdip: return DvdAdip; - case HDDVD_CPI: + case kMediaTagHddvdCpi: return HdDvdCpi; - case HDDVD_MediumStatus: + case kMediaTagHddvdMediumStatus: return HdDvdMediumStatus; - case DVDDL_LayerCapacity: + case kMediaTagDvddlLayerCapacity: return DvdDlLayerCapacity; - case DVDDL_MiddleZoneAddress: + case kMediaTagDvddlMiddleZoneAddress: return DvdDlMiddleZoneAddress; - case DVDDL_JumpIntervalSize: + case kMediaTagDvddlJumpIntervalSize: return DvdDlJumpIntervalSize; - case DVDDL_ManualLayerJumpLBA: + case kMediaTagDvddlManualLayerJumpLba: return DvdDlManualLayerJumpLba; - case BD_DI: + case kMediaTagBlurayDi: return BlurayDi; - case BD_BCA: + case kMediaTagBlurayBca: return BlurayBca; - case BD_DDS: + case kMediaTagBlurayDds: return BlurayDds; - case BD_CartridgeStatus: + case kMediaTagBlurayCartridgeStatus: return BlurayCartridgeStatus; - case BD_SpareArea: + case kMediaTagBluraySpareArea: return BluraySpareArea; - case AACS_VolumeIdentifier: + case kMediaTagAacsVolumeIdentifier: return AacsVolumeIdentifier; - case AACS_SerialNumber: + case kMediaTagAacsSerialNumber: return AacsSerialNumber; - case AACS_MediaIdentifier: + case kMediaTagAacsMediaIdentifier: return AacsMediaIdentifier; - case AACS_MKB: + case kMediaTagAacsMkb: return AacsMediaKeyBlock; - case AACS_DataKeys: + case kMediaTagAacsDataKeys: return AacsDataKeys; - case AACS_LBAExtents: + case kMediaTagAacsLbaExtents: return AacsLbaExtents; - case AACS_CPRM_MKB: + case kMediaTagCprmMkb: return CprmMediaKeyBlock; - case Hybrid_RecognizedLayers: + case kMediaTagHybridRecognizedLayers: return HybridRecognizedLayers; - case MMC_WriteProtection: + case kMediaTagMmcWriteProtection: return ScsiMmcWriteProtection; - case MMC_DiscInformation: + case kMediaTagMmcDiscInformation: return ScsiMmcDiscInformation; - case MMC_TrackResourcesInformation: + case kMediaTagMmcTrackResourcesInformation: return ScsiMmcTrackResourcesInformation; - case MMC_POWResourcesInformation: + case kMediaTagMmcPowResourcesInformation: return ScsiMmcPowResourcesInformation; - case SCSI_INQUIRY: + case kMediaTagScsiInquiry: return ScsiInquiry; - case SCSI_MODEPAGE_2A: + case kMediaTagScsiModePage2A: return ScsiModePage2A; - case ATA_IDENTIFY: + case kMediaTagAtaIdentify: return AtaIdentify; - case ATAPI_IDENTIFY: + case kMediaTagAtapiIdentify: return AtapiIdentify; - case PCMCIA_CIS: + case kMediaTagPcmciaCis: return PcmciaCis; - case SD_CID: + case kMediaTagSdCid: return SecureDigitalCid; - case SD_CSD: + case kMediaTagSdCsd: return SecureDigitalCsd; - case SD_SCR: + case kMediaTagSdScr: return SecureDigitalScr; - case SD_OCR: + case kMediaTagSdOcr: return SecureDigitalOcr; - case MMC_CID: + case kMediaTagMmcCid: return MultiMediaCardCid; - case MMC_CSD: + case kMediaTagMmcCsd: return MultiMediaCardCsd; - case MMC_OCR: + case kMediaTagMmcOcr: return MultiMediaCardOcr; - case MMC_ExtendedCSD: + case kMediaTagExtendedCsd: return MultiMediaCardExtendedCsd; - case Xbox_SecuritySector: + case kMediaTagXboxSecuritySector: return XboxSecuritySector; - case Floppy_LeadOut: + case kMediaTagFloppyLeadOut: return FloppyLeadOut; - case DiscControlBlock: + case kMediaTagDiscControlBlock: return DvdDiscControlBlock; - case CD_FirstTrackPregap: + case kMediaTagCdFirstTrackPregap: return CompactDiscFirstTrackPregap; - case CD_LeadOut: + case kMediaTagCdLeadOut: return CompactDiscLeadOut; - case SCSI_MODESENSE_6: + case kMediaTagScsiModeSense6: return ScsiModeSense6; - case SCSI_MODESENSE_10: + case kMediaTagScsiModeSense10: return ScsiModeSense10; - case USB_Descriptors: + case kMediaTagUsbDescriptors: return UsbDescriptors; - case Xbox_DMI: + case kMediaTagXboxDmi: return XboxDmi; - case Xbox_PFI: + case kMediaTagXboxPfi: return XboxPfi; - case CD_MCN: + case kMediaTagCdMcn: return CompactDiscMediaCatalogueNumber; - case CD_LeadIn: + case kMediaTagCdLeadIn: return CompactDiscLeadIn; - case DVD_DiscKey_Decrypted: + case kMediaTagDvdDiscKeyDecrypted: return DvdDiscKeyDecrypted; - case Floppy_WriteProtect: + case kMediaTagFloppyWriteProtect: return FloppyWriteProtectStatus; default: return -1;