2 files changed, 33 insertions, 44 deletions
diff --git a/testsuites/fstests/mimfs_support/fs_config.h b/testsuites/fstests/mimfs_support/fs_config.h
index f68fec47b1..b6260f5902 100644
--- a/testsuites/fstests/mimfs_support/fs_config.h
+++ b/testsuites/fstests/mimfs_support/fs_config.h
@@ -1,5 +1,12 @@
 /*
- *  $Id$
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id Exp $
  */
 
 #ifndef __MIMFS_SUPPORT_h
@@ -8,13 +15,5 @@
 #define MIMFS_TEST
 
 #define FILESYSTEM "MOUNTED IMFS"
-#define BASE_FOR_TEST "/mnt/"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-};
-#endif
 
 #endif
diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c
index dcebd9be49..da59d5e92f 100644
--- a/testsuites/fstests/mimfs_support/fs_support.c
+++ b/testsuites/fstests/mimfs_support/fs_support.c
@@ -1,5 +1,12 @@
 /*
- *  $Id$
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,36 +14,29 @@
 #endif
 #include "pmacros.h"
 
-#include "fs_config.h"
-
 #include <sys/stat.h>
-#include <sys/types.h>
-
 #include <rtems/libio.h>
 
+#include "fstest.h"
 
-
-void test_initialize_filesystem(void)
+void
+test_initialize_filesystem (void)
 {
-  int rc=0;
-  rc=mkdir(BASE_FOR_TEST,0777);
-  rtems_test_assert(rc==0);
+  int rc = 0;
+  rc = mkdir (BASE_FOR_TEST,S_IRWXU|S_IRWXG|S_IRWXO);
+  rtems_test_assert (rc == 0);
 
-
-  rc=mount(NULL,
-      BASE_FOR_TEST,
-      "imfs",
-      RTEMS_FILESYSTEM_READ_WRITE,
-      NULL);
-  rtems_test_assert(rc==0);
+  rc = mount (NULL, BASE_FOR_TEST, "imfs", RTEMS_FILESYSTEM_READ_WRITE, NULL);
+  rtems_test_assert (rc == 0);
 }
 
 
-void test_shutdown_filesystem(void)
+void
+test_shutdown_filesystem (void)
 {
-  int rc=0;
-  rc=unmount(BASE_FOR_TEST) ;
-  rtems_test_assert(rc==0);
+  int rc = 0;
+  rc = unmount (BASE_FOR_TEST);
+  rtems_test_assert (rc == 0);
 }
 
 /* configuration information */
@@ -49,23 +49,13 @@ void test_shutdown_filesystem(void)
  * Configure base RTEMS resources.
  */
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_MEMORY_OVERHEAD                  512
-#define CONFIGURE_MAXIMUM_TASKS                    rtems_resource_unlimited (10)
-#define CONFIGURE_MAXIMUM_SEMAPHORES               rtems_resource_unlimited (10)
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES           rtems_resource_unlimited (6)
-#define CONFIGURE_MAXIMUM_PARTITIONS               rtems_resource_unlimited (4)
-#define CONFIGURE_MAXIMUM_TIMERS                   10
 
 
-/**
- * Configure file system and libblock.
- */
-#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS  100
-#define CONFIGURE_MAXIMUM_DRIVERS                  100
-#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
+#define CONFIGURE_MAXIMUM_TASKS                  10 
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 40
 
 #define CONFIGURE_INIT
 #include <rtems/confdefs.h>
-