claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add udf_fileid_desc_t: were getting closer to being able to deal with

Browse Source 
files now.

Add remaining udf_ prefixes extent_ad_{s,t} and lb_addr_{s,t}
This commit is contained in:
rocky
2005-10-19 05:45:41 +00:00
parent 0bf9eeef03
commit 6775aa1086
1 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/cdio/ecma_167.h
View File

@@ -222,13 +222,13 @@ struct boot_desc_s
#define BOOT_FLAGS_ERASE 0x01 #define BOOT_FLAGS_ERASE 0x01
/** Extent Descriptor (ECMA 167r3 3/7.1) */ /** Extent Descriptor (ECMA 167r3 3/7.1) */
struct extent_ad_s struct udf_extent_ad_s
{ {
udf_Uint32_t len; udf_Uint32_t len;
udf_Uint32_t loc; udf_Uint32_t loc;
} GNUC_PACKED; } GNUC_PACKED;
typedef struct extent_ad_s extent_ad_t; typedef struct udf_extent_ad_s udf_extent_ad_t;
/** Descriptor Tag (ECMA 167r3 3/7.2) */ /** Descriptor Tag (ECMA 167r3 3/7.2) */
struct udf_tag_s struct udf_tag_s
@@ -271,8 +271,8 @@ struct udf_pvd_s
udf_dstring volSet_id[128]; udf_dstring volSet_id[128];
udf_charspec_t desc_charset; udf_charspec_t desc_charset;
udf_charspec_t explanatory_charset; udf_charspec_t explanatory_charset;
extent_ad_t vol_abstract; udf_extent_ad_t vol_abstract;
extent_ad_t vol_copyright; udf_extent_ad_t vol_copyright;
udf_regid_t app_ident; udf_regid_t app_ident;
udf_timestamp_t recording_time; udf_timestamp_t recording_time;
udf_regid_t imp_ident; udf_regid_t imp_ident;
@@ -291,8 +291,8 @@ typedef struct udf_pvd_s udf_pvd_t;
struct anchor_vol_desc_ptr_s struct anchor_vol_desc_ptr_s
{ {
udf_tag_t tag; udf_tag_t tag;
extent_ad_t main_vol_desc_seq_ext; udf_extent_ad_t main_vol_desc_seq_ext;
extent_ad_t reserve_vol_desc_seq_ext; udf_extent_ad_t reserve_vol_desc_seq_ext;
udf_Uint8_t reserved[480]; udf_Uint8_t reserved[480];
} GNUC_PACKED; } GNUC_PACKED;
@@ -303,7 +303,7 @@ struct vol_desc_ptr_s
{ {
udf_tag_t tag; udf_tag_t tag;
udf_Uint32_t vol_desc_seq_num; udf_Uint32_t vol_desc_seq_num;
extent_ad_t next_vol_desc_set_ext; udf_extent_ad_t next_vol_desc_set_ext;
udf_Uint8_t reserved[484]; udf_Uint8_t reserved[484];
} GNUC_PACKED; } GNUC_PACKED;
@@ -355,13 +355,13 @@ typedef struct partition_desc_s partition_desc_t;
#define PD_ACCESS_TYPE_OVERWRITABLE 0x00000004 #define PD_ACCESS_TYPE_OVERWRITABLE 0x00000004
/** Recorded Address (ECMA 167r3 4/7.1) */ /** Recorded Address (ECMA 167r3 4/7.1) */
struct lb_addr_s struct udf_lb_addr_s
{ {
udf_Uint32_t lba; udf_Uint32_t lba;
udf_Uint16_t partitionReferenceNum; udf_Uint16_t partitionReferenceNum;
} GNUC_PACKED; } GNUC_PACKED;
typedef struct lb_addr_s lb_addr_t; typedef struct udf_lb_addr_s udf_lb_addr_t;
/** Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */ /** Short Allocation Descriptor (ECMA 167r3 4/14.14.1) */
struct udf_short_ad_s struct udf_short_ad_s
@@ -376,7 +376,7 @@ typedef struct udf_short_ad_s udf_short_ad_t;
struct udf_long_ad_s struct udf_long_ad_s
{ {
udf_Uint32_t len; udf_Uint32_t len;
lb_addr_t loc; udf_lb_addr_t loc;
udf_Uint8_t imp_use[6]; udf_Uint8_t imp_use[6];
} GNUC_PACKED; } GNUC_PACKED;
@@ -400,7 +400,7 @@ struct logical_vol_desc_s
udf_Uint32_t i_partition_maps; udf_Uint32_t i_partition_maps;
udf_regid_t imp_id; udf_regid_t imp_id;
udf_Uint8_t imp_use[128]; udf_Uint8_t imp_use[128];
extent_ad_t integrity_seq_ext; udf_extent_ad_t integrity_seq_ext;
udf_Uint8_t partition_maps[0]; udf_Uint8_t partition_maps[0];
} GNUC_PACKED; } GNUC_PACKED;
@@ -442,7 +442,7 @@ struct unalloc_space_desc_s
udf_tag_t tag; udf_tag_t tag;
udf_Uint32_t vol_desc_seq_num; udf_Uint32_t vol_desc_seq_num;
udf_Uint32_t i_alloc_descs; udf_Uint32_t i_alloc_descs;
extent_ad_t allocDescs[0]; udf_extent_ad_t allocDescs[0];
} GNUC_PACKED; } GNUC_PACKED;
/** Terminating Descriptor (ECMA 167r3 3/10.9) */ /** Terminating Descriptor (ECMA 167r3 3/10.9) */
@@ -458,7 +458,7 @@ struct logvol_integrity_desc_s
udf_tag_t tag; udf_tag_t tag;
udf_timestamp_t recording_time; udf_timestamp_t recording_time;
udf_Uint32_t integrity_type; udf_Uint32_t integrity_type;
extent_ad_t next_integrity_ext; udf_extent_ad_t next_integrity_ext;
udf_Uint8_t logvol_contents_use[32]; udf_Uint8_t logvol_contents_use[32];
udf_Uint32_t i_partitions; udf_Uint32_t i_partitions;
udf_Uint32_t imp_use_len; udf_Uint32_t imp_use_len;
@@ -477,7 +477,7 @@ struct ext_ad_s
udf_Uint32_t len; udf_Uint32_t len;
udf_Uint32_t recorded_len; udf_Uint32_t recorded_len;
udf_Uint32_t information_len; udf_Uint32_t information_len;
lb_addr_t ext_loc; udf_lb_addr_t ext_loc;
} GNUC_PACKED ext_ad; } GNUC_PACKED ext_ad;
typedef struct ext_ad_s ext_ad_t; typedef struct ext_ad_s ext_ad_t;
@@ -526,12 +526,12 @@ struct partition_header_desc_s
typedef struct partition_header_desc_s partition_header_desc_t; typedef struct partition_header_desc_s partition_header_desc_t;
/** File Identifier Descriptor (ECMA 167r3 4/14.4) */ /** File Identifier Descriptor (ECMA 167r3 4/14.4) */
struct fileIdentDesc struct udf_fileid_desc_s
{ {
udf_tag_t tag; udf_tag_t tag;
udf_Uint16_t file_version_num; udf_Uint16_t file_version_num;
udf_Uint8_t file_characteristics; udf_Uint8_t file_characteristics;
udf_Uint8_t length_file_id; udf_Uint8_t i_file_id;
udf_long_ad_t icb; udf_long_ad_t icb;
udf_Uint16_t i_imp_use; udf_Uint16_t i_imp_use;
udf_Uint8_t imp_use[0]; udf_Uint8_t imp_use[0];
@@ -539,6 +539,8 @@ struct fileIdentDesc
udf_Uint8_t padding[0]; udf_Uint8_t padding[0];
} GNUC_PACKED; } GNUC_PACKED;
typedef struct udf_fileid_desc_s udf_fileid_desc_t;
#define UDF_FID_SIZE 38 #define UDF_FID_SIZE 38
#define UDF_FILE_CHAR_VIS (1 << 0) /* Visible */ #define UDF_FILE_CHAR_VIS (1 << 0) /* Visible */
#define UDF_FILE_CHAR_DIR (1 << 1) /* Directory */ #define UDF_FILE_CHAR_DIR (1 << 1) /* Directory */
@@ -570,7 +572,7 @@ struct udf_icbtag_s
udf_Uint16_t max_num_entries; udf_Uint16_t max_num_entries;
udf_Uint8_t reserved; udf_Uint8_t reserved;
udf_Uint8_t file_type; udf_Uint8_t file_type;
lb_addr_t parent_ICB; udf_lb_addr_t parent_ICB;
udf_Uint16_t flags; udf_Uint16_t flags;
} GNUC_PACKED; } GNUC_PACKED;