Changeset 0cebbac in mainline

Timestamp:

2017-10-04T22:14:10Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fe8961d

Parents:

7e20bee

Message:

Restore CDFS definition of primary volume descriptor, with properly sized root directory entry.

File:

• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (3 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -117 +117 @@
 } cdfs_dir_flag_t;
 
+/** Directory record */
 typedef struct {
         uint8_t length;
@@ -134 +135 @@
 } __attribute__((packed)) cdfs_dir_t;
 
+/** Directory record for the root directory */
+typedef struct {
+        uint8_t length;
+        uint8_t ea_length;
+        
+        uint32_t_lb lba;
+        uint32_t_lb size;
+        
+        cdfs_timestamp_t timestamp;
+        uint8_t flags;
+        uint8_t unit_size;
+        uint8_t gap_size;
+        uint16_t_lb sequence_nr;
+        
+        uint8_t name_length;
+        uint8_t name[1];
+} __attribute__((packed)) cdfs_root_dir_t;
+
 typedef struct {
         uint8_t flags; /* reserved in primary */
@@ -155 +174 @@
         uint32_t opt_path_table_msb;
         
-        cdfs_dir_t root_dir;
+        cdfs_root_dir_t root_dir;
+        uint8_t pad0;
+        
+        uint8_t set_ident[128];
+        uint8_t publisher_ident[128];
+        uint8_t preparer_ident[128];
+        uint8_t app_ident[128];
+        
+        uint8_t copyright_file_ident[37];
+        uint8_t abstract_file_ident[37];
+        uint8_t biblio_file_ident[37];
+        
+        cdfs_datetime_t creation;
+        cdfs_datetime_t modification;
+        cdfs_datetime_t expiration;
+        cdfs_datetime_t effective;
+        
+        uint8_t fs_version;
 } __attribute__((packed)) cdfs_vol_desc_prisec_t;