Changeset e65e406 in mainline

Timestamp:

2011-06-12T14:45:38Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

c6aca755

Parents:

17fa0280

Message:

Fixes for mips32 big endian.

Location:

uspace/srv/fs/fat

Files:

• fat_dentry.c (modified) (3 diffs)
• fat_dentry.h (modified) (1 diff)
• fat_directory.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_dentry.c

@@ -40 +40 @@
 #include <str.h>
 #include <errno.h>
+#include <byteorder.h>
 
 static bool is_d_char(const char ch)
@@ -307 +308 @@
 }
 
-void fat_lfn_copy_part(const uint8_t *src, size_t src_size, uint8_t *dst, size_t *offset)
+size_t fat_lfn_copy_part(const uint8_t *src, size_t src_size, uint8_t *dst, size_t offset)
 {
         int i;
-        for (i=src_size-1; i>0 && (*offset)>1; i-=2) {
+        for (i=src_size-1; i>0 && offset>1; i-=2) {
                 if ((src[i] == 0x00 && src[i-1] == 0x00) ||
                         (src[i] == 0xff && src[i-1] == 0xff))
                         continue;
-                dst[(*offset)-1] = src[i];
-                dst[(*offset)-2] = src[i-1];
-                (*offset)-=2;
-        }
-}
-
-void fat_lfn_copy_entry(const fat_dentry_t *d, uint8_t *dst, size_t *offset)
-{
-        fat_lfn_copy_part(FAT_LFN_PART3(d), FAT_LFN_PART3_SIZE, dst, offset);
-        fat_lfn_copy_part(FAT_LFN_PART2(d), FAT_LFN_PART2_SIZE, dst, offset);
-        fat_lfn_copy_part(FAT_LFN_PART1(d), FAT_LFN_PART1_SIZE, dst, offset);
+                dst[offset-1] = src[i];
+                dst[offset-2] = src[i-1];
+                offset-=2;
+        }
+        return offset;
+}
+
+size_t fat_lfn_copy_entry(const fat_dentry_t *d, uint8_t *dst, size_t offset)
+{
+        offset = fat_lfn_copy_part(FAT_LFN_PART3(d), 
+            FAT_LFN_PART3_SIZE, dst, offset);
+        offset = fat_lfn_copy_part(FAT_LFN_PART2(d), 
+            FAT_LFN_PART2_SIZE, dst, offset);
+        offset = fat_lfn_copy_part(FAT_LFN_PART1(d), 
+            FAT_LFN_PART1_SIZE, dst, offset);
+
+        return offset;
 }
 
@@ -339 +346 @@
                                 return EOVERFLOW;
                 } else {
-                        c = (src[i] << 8) | src[i+1];
+                        c = uint16_t_le2host((src[i] << 8) | src[i+1]);
                         rc = chr_encode(c, (char*)dst, &offset, dst_size);
                         if (rc!=EOK) {

uspace/srv/fs/fat/fat_dentry.h

@@ -138 +138 @@
 extern size_t fat_lfn_str_nlength(const uint8_t *, size_t);
 extern size_t fat_lfn_size(const fat_dentry_t *);
-extern void fat_lfn_copy_part(const uint8_t *, size_t, uint8_t *, size_t *);
-extern void fat_lfn_copy_entry(const fat_dentry_t *, uint8_t *, size_t *);
+extern size_t fat_lfn_copy_part(const uint8_t *, size_t, uint8_t *, size_t);
+extern size_t fat_lfn_copy_entry(const fat_dentry_t *, uint8_t *, size_t);
 extern int fat_lfn_convert_name(const uint8_t *, size_t, uint8_t *, size_t);
 

uspace/srv/fs/fat/fat_directory.c

@@ -118 +118 @@
                                         (di->checksum == FAT_LFN_CHKSUM(d))) {
                                         /* Right order! */
-                                        fat_lfn_copy_entry(d, di->lfn_utf16, &di->lfn_offset);
+                                        di->lfn_offset = fat_lfn_copy_entry(d, di->lfn_utf16, 
+                                            di->lfn_offset);
                                 } else {
                                         /* Something wrong with order. Skip this long entries set */
@@ -133 +134 @@
                                                         (FAT_LFN_COUNT(d) - 1)) + fat_lfn_size(d);
                                                 di->lfn_offset = di->lfn_size;
-                                                fat_lfn_copy_entry(d, di->lfn_utf16, &di->lfn_offset);
+                                                di->lfn_offset = fat_lfn_copy_entry(d, di->lfn_utf16, 
+                                                    di->lfn_offset);
                                                 di->checksum = FAT_LFN_CHKSUM(d);
                                         }