Changeset 585:b8ac88d76805

Timestamp:

06/07/08 19:14:14 (7 months ago)

Author:

David Anderson <dave@…>

Parents:

580:2e24b11dbe5a (diff), 584:8df35f33dbdd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

default

Message:

Merge changes from crew/sam

Location:

nxos/base

Files:

• _tlsf.c.inc (deleted)
• _tlsf.h (deleted)
• dump.c (deleted)
• dump.h (deleted)
• fs.c (modified) (5 diffs)
• fs.c (modified) (3 diffs)
• fs.h (modified) (2 diffs)
• fs.h (modified) (1 diff)
• lib/rcmd/rcmd.h (modified) (2 diffs)
• memalloc.c (deleted)
• memalloc.h (deleted)

nxos/base/fs.c

@@ -23 +23 @@
 #define FS_FILE_METADATA_SIZE 10
 
-/* File metadata size, in bytes. */
+/** Filename offset (in U32s) in the metadata. */
+#define FS_FILENAME_OFFSET 2
+
+/** File metadata size, in bytes. */
 #define FS_FILE_METADATA_BYTES (FS_FILE_METADATA_SIZE * sizeof(U32))
 
+/** Mask to use on the first metadata U32 to get the file origin marker value. */
 #define FS_FILE_ORIGIN_MASK 0xFF000000
+
+/** Mask to use on the first metadata U32 to get the file permissions. */
 #define FS_FILE_PERMS_MASK 0x00F00000
+
+/** Mask to use on the first metadata U32 to get the file size. */
 #define FS_FILE_SIZE_MASK 0x000FFFFF
 
@@ -33 +41 @@
 #define FS_FILE_PERM_MASK_EXECUTABLE (1 << 1)
 
-#define FS_FILENAME_OFFSET 2
-
-/* U32 <-> char conversion union for filenames. */
+/** U32 <-> char conversion union for filenames. */
 union U32tochar {
   char chars[FS_FILENAME_LENGTH];
@@ -303 +309 @@
 static fs_err_t nx_fs_init_fd(U32 origin, fs_fd_t fd) {
   volatile U32 *metadata = &(FLASH_BASE_PTR[origin*EFC_PAGE_WORDS]);
+  union U32tochar nameconv;
   fs_file_t *file;
 
@@ -308 +315 @@
   NX_ASSERT(file != NULL);
 
+  memcpy(nameconv.integers,
+         (void *)(metadata + FS_FILENAME_OFFSET),
+         FS_FILENAME_LENGTH);
+
   file->origin = origin;
+  memcpy(file->name, nameconv.chars, MIN(strlen(nameconv.chars), 31));
   file->size = nx_fs_get_file_size_from_metadata(metadata);
   file->perms = nx_fs_get_file_perms_from_metadata(metadata);
@@ -678 +690 @@
 }
 
-void nx_fs_get_occupation(U16 *files, U32 *used, U32 *free_pages,
+void nx_fs_get_occupation(U32 *files, U32 *used, U32 *free_pages,
                           U32 *wasted) {
+  U32 _files = 0, _used = 0, _free_pages = 0, _wasted = 0;
+  U32 i;
+
+  for (i=FS_PAGE_START; i<FS_PAGE_END; i++) {
+    if (nx_fs_page_has_magic(i)) {
+      volatile U32 *metadata = &(FLASH_BASE_PTR[i*EFC_PAGE_WORDS]);
+      size_t size;
+      U32 pages;
+
+      size = nx_fs_get_file_size_from_metadata(metadata);
+      pages = nx_fs_get_file_page_count(size);
+
+      _files++;
+      _used += size;
+      _wasted += pages * EFC_PAGE_BYTES - size - FS_FILE_METADATA_BYTES;
+
+      i += pages - 1;
+    } else {
+      _free_pages++;
+    }
+  }
+
   if (files) {
+    *files = _files;
   }
 
   if (used) {
+    *used = _used;
   }
 
   if (free_pages) {
+    *free_pages = _free_pages;
   }
 
   if (wasted) {
+    *wasted = _wasted;
   }
 }

nxos/base/fs.c

@@ -17 +17 @@
 #include "base/drivers/_efc.h"
 
-/** Magic marker. */
+/* Magic marker. */
 #define FS_FILE_ORIGIN_MARKER 0x42
 
-/** File metadata size, in U32s. */
+/* File metadata size, in U32s. */
 #define FS_FILE_METADATA_SIZE 10
 
@@ -47 +47 @@
 };
 
-/** FD-set. */
+/* FD-set. */
 static fs_file_t fdset[FS_MAX_OPENED_FILES];
 
@@ -731 +731 @@
 }
 
-/** Defrag functions. */
+/* Defrag functions. */
 
 fs_err_t nx_fs_defrag_simple(void) {

nxos/base/fs.h

@@ -22 +22 @@
 /*@{*/
 
-/** @defgroup fs Flash file system */
+/** @defgroup fs Flash file system
+ *
+ * A flash-friendly file system for the NXT on-board flash memory. This is a very simple
+ * file system implementation, allowing most of the basic features expected from a file
+ * system: open(), read(), write(), seek(), flush() and close(). Note that reading and
+ * writing use two different pointers. A seek() will move both of them.
+ *
+ * The file system also tries to minimize stress on the flash by progressively moving files
+ * needing more space towards the end of the flash medium. This relocation process happens
+ * automatically and may make one write operation rather costly (in terms of time).
+ *
+ * For more information, refer to the file system design document.
+ */
 /*@{*/
 
@@ -187 +199 @@
  * @param wasted The bytes lost by files page aligment.
  */
-void nx_fs_get_occupation(U16 *files, U32 *used, U32 *free_pages,
+void nx_fs_get_occupation(U32 *files, U32 *used, U32 *free_pages,
                           U32 *wasted);
 

nxos/base/fs.h

@@ -1 +1 @@
 /** @file fs.h
- *  @brief Flash file system
+ *  @brief Flash file system.
  *
  * A flash-friendly file system for the NXT on-board flash memory.

nxos/base/lib/rcmd/rcmd.h

@@ -3 +3 @@
  */
 
-/* Copyright (c) 2007-2008 the NxOS developers
+/* Copyright (c) 2007,2008 the NxOS developers
  *
  * See AUTHORS for a full list of the developers.
@@ -19 +19 @@
 /*@{*/
 
-/** @defgroup rcmd Remote robot command library
+/** @defgroup rcmd Robot remote control
  *
  * The remote robot command library provides a small command parsing and