Changeset b7068da in mainline for uspace/lib/minix/minix.h

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/minix/minix.h (modified) (7 diffs)

uspace/lib/minix/minix.h

@@ -39 +39 @@
 #define S_ISDIR(m)              (((m) & S_IFMT) == S_IFDIR)
 #define S_ISREG(m)              (((m) & S_IFMT) == S_IFREG)
-#define S_IFDIR                 0040000         /*Directory*/
-#define S_IFREG                 0100000         /*Regular file*/
+#define S_IFDIR                 0040000         /* Directory */
+#define S_IFREG                 0100000         /* Regular file */
 #define S_IFMT                  00170000
 
-/*The following block sizes are valid only on V3 filesystem*/
+/* The following block sizes are valid only on V3 filesystem */
 #define MFS_MIN_BLOCKSIZE       1024
 #define MFS_MAX_BLOCKSIZE       4096
@@ -88 +88 @@
 #define MFS_ERROR_FS            0x0002
 
-/*MFS V1/V2 superblock data on disk*/
+/* MFS V1/V2 superblock data on disk */
 struct mfs_superblock {
-        /*Total number of inodes on the device*/
+        /* Total number of inodes on the device */
         uint16_t        s_ninodes;
-        /*Total number of zones on the device*/
+        /* Total number of zones on the device */
         uint16_t        s_nzones;
-        /*Number of inode bitmap blocks*/
+        /* Number of inode bitmap blocks */
         uint16_t        s_ibmap_blocks;
-        /*Number of zone bitmap blocks*/
+        /* Number of zone bitmap blocks */
         uint16_t        s_zbmap_blocks;
-        /*First data zone on device*/
+        /* First data zone on device */
         uint16_t        s_first_data_zone;
-        /*Base 2 logarithm of the zone to block ratio*/
+        /* Base 2 logarithm of the zone to block ratio */
         uint16_t        s_log2_zone_size;
-        /*Maximum file size expressed in bytes*/
+        /* Maximum file size expressed in bytes */
         uint32_t        s_max_file_size;
         /*
@@ -109 +109 @@
          */
         uint16_t        s_magic;
-        /*Flag used to detect FS errors*/
+        /* Flag used to detect FS errors*/
         uint16_t        s_state;
-        /*Total number of zones on the device (V2 only)*/
+        /* Total number of zones on the device (V2 only) */
         uint32_t        s_nzones2;
 } __attribute__ ((packed));
 
 
-/*MFS V3 superblock data on disk*/
+/* MFS V3 superblock data on disk */
 struct mfs3_superblock {
-        /*Total number of inodes on the device*/
+        /* Total number of inodes on the device */
         uint32_t        s_ninodes;
         uint16_t        s_pad0;
-        /*Number of inode bitmap blocks*/
+        /* Number of inode bitmap blocks */
         int16_t         s_ibmap_blocks;
-        /*Number of zone bitmap blocks*/
+        /* Number of zone bitmap blocks */
         int16_t         s_zbmap_blocks;
-        /*First data zone on device*/
+        /* First data zone on device */
         uint16_t        s_first_data_zone;
-        /*Base 2 logarithm of the zone to block ratio*/
+        /* Base 2 logarithm of the zone to block ratio */
         int16_t         s_log2_zone_size;
         int16_t         s_pad1;
-        /*Maximum file size expressed in bytes*/
+        /* Maximum file size expressed in bytes */
         uint32_t        s_max_file_size;
-        /*Total number of zones on the device*/
+        /* Total number of zones on the device */
         uint32_t        s_nzones;
         /*
@@ -140 +140 @@
         int16_t         s_magic;
         int16_t         s_pad2;
-        /*Filesystem block size expressed in bytes*/
+        /* Filesystem block size expressed in bytes */
         uint16_t        s_block_size;
-        /*Filesystem disk format version*/
+        /* Filesystem disk format version */
         int8_t          s_disk_version;
 } __attribute__ ((packed));
 
-/*MinixFS V1 inode structure as it is on disk*/
+/* MinixFS V1 inode structure as it is on disk */
 struct mfs_inode {
         uint16_t        i_mode;
@@ -154 +154 @@
         uint8_t         i_gid;
         uint8_t         i_nlinks;
-        /*Block numbers for direct zones*/
+        /* Block numbers for direct zones */
         uint16_t        i_dzone[V1_NR_DIRECT_ZONES];
-        /*Block numbers for indirect zones*/
+        /* Block numbers for indirect zones */
         uint16_t        i_izone[V1_NR_INDIRECT_ZONES];
 } __attribute__ ((packed));
 
-/*MinixFS V2 inode structure as it is on disk (also valid for V3).*/
+/* MinixFS V2 inode structure as it is on disk (also valid for V3). */
 struct mfs2_inode {
         uint16_t        i_mode;
@@ -170 +170 @@
         int32_t         i_mtime;
         int32_t         i_ctime;
-        /*Block numbers for direct zones*/
+        /* Block numbers for direct zones */
         uint32_t        i_dzone[V2_NR_DIRECT_ZONES];
-        /*Block numbers for indirect zones*/
+        /* Block numbers for indirect zones */
         uint32_t        i_izone[V2_NR_INDIRECT_ZONES];
 } __attribute__ ((packed));
 
-/*MinixFS V1/V2 directory entry on-disk structure*/
+/* MinixFS V1/V2 directory entry on-disk structure */
 struct mfs_dentry {
         uint16_t d_inum;
@@ -182 +182 @@
 };
 
-/*MinixFS V3 directory entry on-disk structure*/
+/* MinixFS V3 directory entry on-disk structure */
 struct mfs3_dentry {
         uint32_t d_inum;