Changeset 74ea3c6 in mainline

Timestamp:

2008-04-12T22:38:32Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32fb10ed

Parents:

e22632a9

Message:

Add fat_root_get() and fat_plb_get_char().

Location:

uspace

Files:

• lib/libfs/libfs.c (modified) (1 diff)
• lib/libfs/libfs.h (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (3 diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (1 diff)

uspace/lib/libfs/libfs.c

@@ -148 +148 @@
 
         void *par = NULL;
-        void *cur = ops->root_get();
+        void *cur = ops->root_get(dev_handle);
         void *tmp;
 

uspace/lib/libfs/libfs.h

@@ -53 +53 @@
         unsigned (* lnkcnt_get)(void *);
         bool (* has_children)(void *);
-        void *(* root_get)(void);
+        void *(* root_get)(dev_handle_t);
         char (* plb_get_char)(unsigned pos);    
         bool (* is_directory)(void *);

uspace/srv/fs/fat/fat_ops.c

@@ -238 +238 @@
         if (!(d->attr & (FAT_ATTR_SUBDIR | FAT_ATTR_VOLLABEL)))
                 node->type = FAT_FILE;
-        if ((d->attr & FAT_ATTR_SUBDIR) || !pindex)
+        if ((d->attr & FAT_ATTR_SUBDIR) || !index)
                 node->type = FAT_DIRECTORY;
         assert((node->type == FAT_FILE) || (node->type == FAT_DIRECTORY));
@@ -331 +331 @@
 {
         return ((fat_node_t *)node)->lnkcnt;
+}
+
+static void *fat_root_get(dev_handle_t dev_handle)
+{
+        return fat_node_get(dev_handle, 0, 0);  
+}
+
+static char fat_plb_get_char(unsigned pos)
+{
+        return fat_reg.plb_ro[pos % PLB_SIZE];
 }
 
@@ -355 +365 @@
         .lnkcnt_get = fat_lnkcnt_get,
         .has_children = NULL,
-        .root_get = NULL,
-        .plb_get_char = NULL,
+        .root_get = fat_root_get,
+        .plb_get_char = fat_plb_get_char,
         .is_directory = fat_is_directory,
         .is_file = fat_is_file

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -98 +98 @@
 }
 
-static void *tmpfs_root_get(void)
+static void *tmpfs_root_get(dev_handle_t dev_handle)
 {
         return root;