Changeset 617:e0e85b07ec24

Timestamp:

06/14/08 18:45:14 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Branch:

default

Message:

Trying other alignments

Files:

• nxos/systems/tests/fs.c (modified) (3 diffs)

nxos/systems/tests/fs.c

@@ -9 +9 @@
 #include "base/types.h"
 #include "base/at91sam7s256.h"
+#include "base/assert.h"
 #include "base/display.h"
 #include "base/util.h"
@@ -150 +151 @@
 }
 
+static void spawn_file_at(char *name, U32 origin, size_t size) {
+  U32 data[1000], metadata[EFC_PAGE_WORDS];
+  union U32tochar nameconv;
+
+  memset(metadata, 0, EFC_PAGE_BYTES);
+  memset(data, 0, EFC_PAGE_BYTES);
+
+  metadata[0] = (0x42 << 24) + (size & 0x000FFFFF);
+  memset(nameconv.chars, 0, 32);
+  memcpy(nameconv.chars, name, MIN(strlen(name), 31));
+  memcpy(metadata+2, nameconv.integers, 32);
+
+  nx__efc_write_page(metadata, origin);
+}
+
 void fs_test_defrag_for_file(void) {
-  U32 metadata[4*EFC_PAGE_WORDS] = {0};
-  union U32tochar nameconv;
-
-  setup();
-
-  metadata[0] = (0x42 << 24);
-  memcpy(nameconv.chars, (void *)"test42", 6);
-  memcpy(metadata+2, nameconv.integers, 32);
-
+  setup();
+
+  nx_display_clear();
   nx_display_string("Starting...\n");
 
@@ -166 +176 @@
   //spawn_file("test3", 3000);
   //remove_file("test2");
-  nx__efc_write_page(metadata, 1020);
+  spawn_file_at("test42", 1020, 42);
 
   nx_fs_dump();