Changeset b4af128 in mainline

Timestamp:

2011-08-15T21:44:16Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

bca3eac

Parents:

e0d98b2

Message:

exFAT: function for calculating hash for file name

Location:

uspace/srv/fs/exfat

Files:

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

uspace/srv/fs/exfat/exfat_dentry.c

@@ -70 +70 @@
 }
 
-uint16_t exfat_name_hash(const uint16_t *name)
+uint16_t exfat_name_hash(const uint16_t *name, const uint16_t *uctable, size_t chars)
 {
-        /* TODO */
-        return 0;
-}
+        uint16_t hash = 0;
+        uint16_t ch;
+        while (*name) {
+                if (*name < chars)
+                        ch = uint16_t_le2host(uctable[*name]);
+                else
+                        ch = *name;
+                name++;
 
-void exfat_set_checksum(const exfat_dentry_t *d, uint16_t *chksum)
-{
-        /* TODO */
+                hash = ((hash << 15) | (hash >> 1)) + (ch & 0xff);
+                hash = ((hash << 15) | (hash >> 1)) + (ch >> 8);
+        }
+
+        return hash;
 }
 
@@ -90 +97 @@
         }
         dst[*offset] = '\0';
-}
-
-void exfat_dentry_set_name(const uint16_t *src, size_t *offset, exfat_name_dentry_t *name)
-{
-        /* TODO */
-        size_t idx=0;
-        while (src[*offset] && idx < EXFAT_NAME_PART_LEN) {
-                name->name[idx] = src[*offset];
-                (*offset)++;
-                idx++;
-        }
 }
 
@@ -115 +111 @@
 }
 
+size_t utf16_length(const uint16_t *wstr)
+{
+        size_t len = 0;
+        
+        while (*wstr++ != 0)
+                len++;
+        
+        return len;
+}
+
 /**
  * @}

uspace/srv/fs/exfat/exfat_dentry.h

@@ -151 +151 @@
 extern exfat_dentry_clsf_t exfat_classify_dentry(const exfat_dentry_t *d);
 
-extern uint16_t exfat_name_hash(const uint16_t *name);
-extern void exfat_set_checksum(const exfat_dentry_t *d, uint16_t *chksum);
+extern uint16_t exfat_name_hash(const uint16_t *name, const uint16_t *uctable, 
+    size_t chars);
 
-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 void exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t size, 
+    uint16_t *dst, size_t *offset);
+
 
 extern bool exfat_valid_char(wchar_t ch);
 extern bool exfat_valid_name(const char *name);
+
+extern size_t utf16_length(const uint16_t *wstr);