Changeset 1f78546 in mainline

Timestamp:

2011-07-16T18:58:24Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

f5f1e1c

Parents:

73b1218

Message:

exFAT: exfat_dentry_get_name - read part of file name from exFAT
name dentry

Location:

uspace/srv/fs/exfat

Files:

• exfat_dentry.c (modified) (1 diff)
• exfat_dentry.h (modified) (3 diffs)

uspace/srv/fs/exfat/exfat_dentry.c

@@ -81 +81 @@
 }
 
-int exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t *count, uint16_t *dst)
+void exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t size, uint16_t *dst, size_t *offset)
+{
+        size_t i=0; 
+        while(i<EXFAT_NAME_PART_LEN && *offset < size) {
+                dst[*offset] = uint16_t_le2host(name->name[i]);
+                i++;
+                (*offset)++;
+        }
+        dst[*offset] = '\0';
+}
+
+void exfat_dentry_set_name(const uint16_t *src, size_t *offset, exfat_name_dentry_t *name)
 {
         /* TODO */
-        return EOK;
-}
-
-int exfat_dentry_set_name(const uint16_t *src, size_t *offset, exfat_name_dentry_t *name)
-{
-        /* TODO */
-        return EOK;
+        size_t idx=0;
+        while (src[*offset] && idx < EXFAT_NAME_PART_LEN) {
+                name->name[idx] = src[*offset];
+                (*offset)++;
+                idx++;
+        }
 }
 

uspace/srv/fs/exfat/exfat_dentry.h

@@ -67 +67 @@
         uint8_t         flags;
         uint8_t         _reserved[18];
-        uint32_t        firtsc;
+        uint32_t        firstc;
         uint64_t        size;
 } __attribute__ ((packed)) exfat_bitmap_dentry_t;
@@ -75 +75 @@
         uint32_t        checksum;
         uint8_t         _reserved2[12];
-        uint32_t        firtsc;
+        uint32_t        firstc;
         uint64_t        size;
 } __attribute__ ((packed)) exfat_uctable_dentry_t;
@@ -154 +154 @@
 extern void exfat_set_checksum(const exfat_dentry_t *d, uint16_t *chksum);
 
-extern int exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t *count, uint16_t *dst);
-extern int exfat_dentry_set_name(const uint16_t *src, size_t *offset, exfat_name_dentry_t *name);
+extern void exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t size, uint16_t *dst, size_t *offset);
+extern void exfat_dentry_set_name(const uint16_t *src, size_t *offset, exfat_name_dentry_t *name);
 
 extern bool exfat_valid_char(wchar_t ch);