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

Rename sector tag constants for Aaru compatibility

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-18 16:08:08 +01:00
parent 37aec17309
commit ebd345ce82
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blocks/data.c
View File

@@ -362,7 +362,7 @@ int32_t process_data_block(aaruformat_context *ctx, IndexEntry *entry)
break; break;
case CdSectorSubchannel: case CdSectorSubchannel:
ctx->sector_subchannel = data; ctx->sector_subchannel = data;
ctx->readableSectorTags[CdSectorSubchannel] = true; ctx->readableSectorTags[CdSectorSubchannelAaru] = true;
break; break;
case AppleProfileTag: case AppleProfileTag:
case AppleSonyTag: case AppleSonyTag:

8
src/read.c
View File

@@ -1587,7 +1587,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
FATAL("Track not found"); FATAL("Track not found");
return AARUF_ERROR_TRACK_NOT_FOUND; return AARUF_ERROR_TRACK_NOT_FOUND;
case CdSectorSubchannel: case CdSectorSubchannelAaru:
if(ctx->image_info.MetadataMediaType != OpticalDisc) if(ctx->image_info.MetadataMediaType != OpticalDisc)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");
@@ -1691,7 +1691,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
memcpy(buffer, ctx->sector_id + corrected_sector_address * 4 + 1, 3); memcpy(buffer, ctx->sector_id + corrected_sector_address * 4 + 1, 3);
TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
case DvdSectorIed: case DvdSectorIedAaru:
if(ctx->image_info.MetadataMediaType != OpticalDisc) if(ctx->image_info.MetadataMediaType != OpticalDisc)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");
@@ -1717,7 +1717,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
memcpy(buffer, ctx->sector_ied + corrected_sector_address * 2, 2); memcpy(buffer, ctx->sector_ied + corrected_sector_address * 2, 2);
TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
case DvdSectorEdc: case DvdSectorEdcAaru:
if(ctx->image_info.MetadataMediaType != OpticalDisc) if(ctx->image_info.MetadataMediaType != OpticalDisc)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");
@@ -1769,7 +1769,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_read_sector_tag(const void *context, const u
memcpy(buffer, ctx->sector_decrypted_title_key + corrected_sector_address * 5, 5); memcpy(buffer, ctx->sector_decrypted_title_key + corrected_sector_address * 5, 5);
TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_read_sector_tag() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
case AppleSonyTag: case AppleSectorTag:
if(ctx->image_info.MetadataMediaType != BlockMedia) if(ctx->image_info.MetadataMediaType != BlockMedia)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");

8
src/write.c
View File

@@ -2176,7 +2176,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
FATAL("Track not found"); FATAL("Track not found");
return AARUF_ERROR_TRACK_NOT_FOUND; return AARUF_ERROR_TRACK_NOT_FOUND;
case CdSectorSubchannel: case CdSectorSubchannelAaru:
if(ctx->image_info.MetadataMediaType != OpticalDisc) if(ctx->image_info.MetadataMediaType != OpticalDisc)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");
@@ -2288,7 +2288,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
memcpy(ctx->sector_id + corrected_sector_address * 4 + 1, data, 3); memcpy(ctx->sector_id + corrected_sector_address * 4 + 1, data, 3);
TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
case DvdSectorIed: case DvdSectorIedAaru:
if(ctx->image_info.MetadataMediaType != OpticalDisc) if(ctx->image_info.MetadataMediaType != OpticalDisc)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");
@@ -2316,7 +2316,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
memcpy(ctx->sector_ied + corrected_sector_address * 2, data, 2); memcpy(ctx->sector_ied + corrected_sector_address * 2, data, 2);
TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
case DvdSectorEdc: case DvdSectorEdcAaru:
if(ctx->image_info.MetadataMediaType != OpticalDisc) if(ctx->image_info.MetadataMediaType != OpticalDisc)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");
@@ -2372,7 +2372,7 @@ AARU_EXPORT int32_t AARU_CALL aaruf_write_sector_tag(void *context, const uint64
memcpy(ctx->sector_decrypted_title_key + corrected_sector_address * 5, data, 5); memcpy(ctx->sector_decrypted_title_key + corrected_sector_address * 5, data, 5);
TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK"); TRACE("Exiting aaruf_write_sector_tag() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;
case AppleSonyTag: case AppleSectorTag:
if(ctx->image_info.MetadataMediaType != BlockMedia) if(ctx->image_info.MetadataMediaType != BlockMedia)
{ {
FATAL("Invalid media type for tag"); FATAL("Invalid media type for tag");