Changeset 5e790e6 in mainline

Timestamp:

2008-03-28T08:44:29Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

81c0171e

Parents:

2f60a529

Message:

Fix FAT boot sector definition and introduce the FAT in-core node type.

File:

• uspace/srv/fs/fat/fat.h (modified) (6 diffs)

uspace/srv/fs/fat/fat.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jakub Jermar
+ * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <sys/types.h>
 #include <bool.h>
+#include "../../vfs/vfs.h"
 
 #define dprintf(...)    printf(__VA_ARGS__)
@@ -48 +49 @@
         uint16_t        bps;            /**< Bytes per sector. */
         uint8_t         spc;            /**< Sectors per cluster. */
-        uint16_t        rsc;            /**< Reserved sector count. */
+        uint16_t        rscnt;          /**< Reserved sector count. */
         uint8_t         fatcnt;         /**< Number of FATs. */
         uint16_t        root_ent_max;   /**< Maximum number of root directory
                                              entries. */
-        uint16_t        totsec;         /**< Total sectors. */
+        uint16_t        totsec16;       /**< Total sectors. 16-bit version. */
         uint8_t         mdesc;          /**< Media descriptor. */
         uint16_t        sec_per_fat;    /**< Sectors per FAT12/FAT16. */
@@ -58 +59 @@
         uint16_t        headcnt;        /**< Number of heads. */
         uint32_t        hidden_sec;     /**< Hidden sectors. */
-        uint32_t        total_sec;      /**< Total sectors. */
+        uint32_t        totseci32;      /**< Total sectors. 32-bit version. */
 
         union {
@@ -102 +103 @@
                         uint32_t        id;
                         /** Volume label. */
-                        uint8_t         label;
+                        uint8_t         label[11];
                         /** FAT type. */
                         uint8_t         type[8];
@@ -135 +136 @@
 } __attribute__ ((packed)) fat_dentry_t;
 
+typedef enum {
+        FAT_DIRECTORY,
+        FAT_FILE
+} fat_node_type_t;
+
+/** FAT in-core node. */
+typedef struct {
+        fat_node_type_t         type;
+        /** VFS index is the node's first allocated cluster. */
+        fs_index_t              index;
+        dev_handle_t            dev_handle;
+        /** FAT in-core node hash table link. */
+        link_t                  fin_link;
+        size_t                  size;
+        unsigned                lnkcnt;
+} fat_node_t;
+
 extern fs_reg_t fat_reg;