Changeset 7194a60 in mainline for uspace/srv/fs/fat/fat_dentry.h

Timestamp:

2011-06-27T16:40:55Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

5dfb1948

Parents:

2e839dda

Message:

Modifications in fat_dentry.h and fat_dentry.c:

1. Using wchar_t for wide string
2. Using standart string functions when it possible.
3. Add function for convesion unicode character to ascii:

wstr_to_ascii

4. Renaming few functions.

File:

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

uspace/srv/fs/fat/fat_dentry.h

@@ -56 +56 @@
 #define FAT_LCASE_LOWER_EXT     0x10
 
-#define FAT_PAD                 ' ' 
+#define FAT_PAD                 ' '
+#define FAT_LFN_PAD     0xffff
+#define FAT_SFN_CHAR '_'
 
 #define FAT_DENTRY_UNUSED       0x00
@@ -76 +78 @@
 #define FAT_LFN_CHKSUM(d) (d->lfn.check_sum)
 
-#define FAT_LFN_NAME_SIZE   255
+#define FAT_LFN_NAME_SIZE   260
 #define FAT_LFN_MAX_COUNT   20
 #define FAT_LFN_PART1_SIZE  5
@@ -130 +132 @@
 
 extern int fat_dentry_namecmp(char *, const char *);
-extern bool fat_dentry_name_verify(const char *);
 extern void fat_dentry_name_get(const fat_dentry_t *, char *);
 extern void fat_dentry_name_set(fat_dentry_t *, const char *);
@@ -138 +139 @@
 extern size_t fat_lfn_str_nlength(const uint16_t *, size_t);
 extern size_t fat_lfn_size(const fat_dentry_t *);
-extern size_t fat_lfn_copy_part(const uint16_t *, size_t, uint16_t *, size_t *);
-extern size_t fat_lfn_copy_entry(const fat_dentry_t *, uint16_t *, size_t *);
+extern size_t fat_lfn_get_part(const uint16_t *, size_t, wchar_t *, size_t *);
+extern size_t fat_lfn_get_entry(const fat_dentry_t *, wchar_t *, size_t *);
+extern size_t fat_lfn_set_part(const wchar_t *, size_t *, size_t, uint16_t *, size_t);
+extern size_t fat_lfn_set_entry(const wchar_t *, size_t *, size_t, fat_dentry_t *);
 
-extern int utf16_to_str(char *, size_t, const uint16_t *);
-extern int str_to_utf16(uint16_t *, size_t, const char *);
-extern bool fat_lfn_valid_char(uint16_t);
-extern bool fat_lfn_valid_str(const uint16_t *);
-extern size_t utf16_length(const uint16_t *);
-extern bool fat_dentry_is_sfn(const uint16_t *);
+extern void wstr_to_ascii(char *dst, const wchar_t *src, size_t count, uint8_t pad);
+
+extern bool fat_sfn_valid_char(wchar_t);
+extern bool fat_sfn_valid(const wchar_t *);
+extern bool fat_lfn_valid(const wchar_t *wstr);
+extern bool fat_dentry_is_sfn(const wchar_t *);