Changes in uspace/srv/fs/cdfs/cdfs_ops.c [4f30222:0cebbac] in mainline

File:

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

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -52 +52 @@
 #include <byteorder.h>
 #include <macros.h>
+#include <unaligned.h>
+
 #include "cdfs.h"
 #include "cdfs_endian.h"
@@ -115 +117 @@
 } cdfs_dir_flag_t;
 
+/** Directory record */
 typedef struct {
         uint8_t length;
@@ -132 +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 */
@@ -153 +174 @@
         uint32_t opt_path_table_msb;
         
-        cdfs_dir_t root_dir;
+        cdfs_root_dir_t root_dir;
         uint8_t pad0;
         
@@ -458 +479 @@
                 size_t i;
                 for (i = 0; i < dsize / sizeof(uint16_t); i++) {
-                        buf[i] = uint16_t_be2host(((uint16_t *)data)[i]);
+                        buf[i] = uint16_t_be2host(
+                            ((unaligned_uint16_t *)data)[i]);
                 }