change log for rtems (2010-06-01)

rtems-vc at rtems.org rtems-vc at rtems.org
Wed Jun 2 01:10:50 UTC 2010


 *ccj*:
2010-06-01      Chris Johns <chrisj at rtems.org>

        * libcsupport/include/rtems/libio.h: Make the struct name the same
        as the typedef.
        * sapi/include/confdefs.h: Fixes for use in C++.

M 1.2345  cpukit/ChangeLog
M   1.65  cpukit/libcsupport/include/rtems/libio.h
M  1.134  cpukit/sapi/include/confdefs.h

diff -u rtems/cpukit/ChangeLog:1.2344 rtems/cpukit/ChangeLog:1.2345
--- rtems/cpukit/ChangeLog:1.2344	Tue Jun  1 05:46:15 2010
+++ rtems/cpukit/ChangeLog	Tue Jun  1 19:43:13 2010
@@ -1,3 +1,9 @@
+2010-06-01 	Chris Johns <chrisj at rtems.org>
+
+	* libcsupport/include/rtems/libio.h: Make the struct name the same
+	as the typedef.
+	* sapi/include/confdefs.h: Fixes for use in C++.
+
 2010-06-01 	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* libmisc/shell/print-ls.c: Remove (long) cast of st_ino.

diff -u rtems/cpukit/libcsupport/include/rtems/libio.h:1.64 rtems/cpukit/libcsupport/include/rtems/libio.h:1.65
--- rtems/cpukit/libcsupport/include/rtems/libio.h:1.64	Tue Jun  1 05:42:51 2010
+++ rtems/cpukit/libcsupport/include/rtems/libio.h	Tue Jun  1 19:43:13 2010
@@ -292,7 +292,7 @@
 /*
  * File system table used by mount to manage file systems.
  */
-typedef struct _rtems_filesystem_table {
+typedef struct rtems_filesystem_table_t {
   const char                    *type;
   rtems_filesystem_fsmount_me_t  mount_h;
 } rtems_filesystem_table_t;
@@ -300,7 +300,7 @@
 /*
  * File system table runtime loaded nodes.
  */
-typedef struct _rtems_filesystem_table_node {
+typedef struct rtems_filesystem_table_node_t {
   rtems_chain_node         node;
   rtems_filesystem_table_t entry;
 } rtems_filesystem_table_node_t;

diff -u rtems/cpukit/sapi/include/confdefs.h:1.133 rtems/cpukit/sapi/include/confdefs.h:1.134
--- rtems/cpukit/sapi/include/confdefs.h:1.133	Mon May 31 08:56:37 2010
+++ rtems/cpukit/sapi/include/confdefs.h	Tue Jun  1 19:43:13 2010
@@ -72,7 +72,6 @@
   #define CONFIGURE_NEWLIB_EXTENSION 0
 #endif
 
-
 #include <rtems/libio.h>
 
 #ifdef CONFIGURE_INIT
@@ -230,12 +229,16 @@
   /*
    * If disabling the file system undef everything. If DEVFS as the base
    * filesystem undefine all other filesystems because you cannot mount other
-   * filesystems.
+   * filesystems. Same for miniIMFS.
    */
   #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) || \
-      defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
+      defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
+      defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
     #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM)
       #undef CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
+      #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
+    #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
+      #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
     #endif
     #undef CONFIGURE_FILESYSTEM_miniIMFS
     #undef CONFIGURE_FILESYSTEM_IMFS
@@ -251,9 +254,10 @@
    * If the base filesystem is DEVFS define it else define IMFS.
    * We will have either DEVFS or IMFS defined after this.
    */
-  #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) && \
-      !defined(CONFIGURE_FILESYSTEM_DEVFS)
+  #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
     #define CONFIGURE_FILESYSTEM_DEVFS
+  #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
+    #define CONFIGURE_FILESYSTEM_miniIMFS
   #elif !defined(CONFIGURE_FILESYSTEM_IMFS)
     #define CONFIGURE_FILESYSTEM_IMFS
   #endif
@@ -276,10 +280,6 @@
                     IMFS_MEMFILE_DEFAULT_BYTES_PER_BLOCK
 #endif
 
-#ifdef CONFIGURE_INIT
-  int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
-#endif /* CONFIGURE_INIT */
-
 /**
  *  This defines the miniIMFS file system table entry.
  */ 
@@ -357,7 +357,8 @@
   /*
    *  DEVFS variables.
    */
-  #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) && !defined(RTEMS_COVERAGE)
+  #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) && \
+      !defined(RTEMS_COVERAGE)
     #define CONFIGURE_MEMORY_FOR_DEVFS  0
   #elif defined(CONFIGURE_FILESYSTEM_DEVFS)
     #ifndef CONFIGURE_MAXIMUM_DEVICES
@@ -375,6 +376,11 @@
     #define CONFIGURE_MEMORY_FOR_DEVFS  0
   #endif
 
+  #if defined(CONFIGURE_FILESYSTEM_IMFS) || \
+      defined(CONFIGURE_FILESYSTEM_miniIMFS)
+    int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
+  #endif
+
   /**
    * Table termination record.
    */
@@ -383,7 +389,10 @@
   /**
    * The default file system table. Must be terminated with the NULL entry if
    * you provide your own.
+   *
+   * The extern is needed to stop the table being removed by the optimizer.
    */
+  extern const rtems_filesystem_table_t configuration_filesystem_table[];
   #ifndef CONFIGURE_HAS_OWN_FILESYSTEM_TABLE
     const rtems_filesystem_table_t configuration_filesystem_table[] = {
       #if defined(CONFIGURE_FILESYSTEM_miniIMFS) && \
@@ -428,7 +437,7 @@
    *  NOTE: When building for coverage, we need this variable all the time.
    */
   #if !defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
-       defined(RTEMS_COVERAGE)
+      defined(RTEMS_COVERAGE)
     #if defined(CONFIGURE_PIPES_ENABLED)
       bool rtems_pipe_configured = true;
     #else


 *ccj*:
2010-06-02      Chris Johns <chrisj at rtems.org>

        * fileio/init.c: Update to new mount API.
        * iostream/init.cc: Hack to work around confdefs.h in C++.
        * iostream/system.h: Add comment about base miniIMFS.

M  1.177  testsuites/samples/ChangeLog
M   1.30  testsuites/samples/fileio/init.c
M    1.4  testsuites/samples/iostream/init.cc
M    1.6  testsuites/samples/iostream/system.h

diff -u rtems/testsuites/samples/ChangeLog:1.176 rtems/testsuites/samples/ChangeLog:1.177
--- rtems/testsuites/samples/ChangeLog:1.176	Sun Apr  4 04:41:22 2010
+++ rtems/testsuites/samples/ChangeLog	Tue Jun  1 19:47:14 2010
@@ -1,3 +1,9 @@
+2010-06-02 	Chris Johns <chrisj at rtems.org>
+
+	* fileio/init.c: Update to new mount API.
+	* iostream/init.cc: Hack to work around confdefs.h in C++.
+	* iostream/system.h: Add comment about base miniIMFS.
+
 2010-04-04	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* capture/init.c: Remove unused variable "out".

diff -u rtems/testsuites/samples/fileio/init.c:1.29 rtems/testsuites/samples/fileio/init.c:1.30
--- rtems/testsuites/samples/fileio/init.c:1.29	Fri Mar 12 10:00:58 2010
+++ rtems/testsuites/samples/fileio/init.c	Tue Jun  1 19:47:15 2010
@@ -44,50 +44,50 @@
  */
 fstab_t fs_table[] = {
   {
-    "/dev/hda1","/mnt/hda1",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hda1","/mnt/hda1", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hda2","/mnt/hda2",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hda2","/mnt/hda2", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hda3","/mnt/hda3",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hda3","/mnt/hda3", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hda4","/mnt/hda4",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hda4","/mnt/hda4", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hdc1","/mnt/hdc1",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hdc1","/mnt/hdc1", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hdc2","/mnt/hdc2",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hdc2","/mnt/hdc2", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hdc3","/mnt/hdc3",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hdc3","/mnt/hdc3", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   },
   {
-    "/dev/hdc4","/mnt/hdc4",
-    &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
+    "/dev/hdc4","/mnt/hdc4", "dosfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
     FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
     0
   }
@@ -321,13 +321,13 @@
   if (1 > sscanf(str,"%lu%c",&size,&suffix)) {
     failed = true;
   }
-  else if (toupper(suffix) == 'K') {
+  else if (toupper((int)suffix) == 'K') {
     size *= 1024;
   }
-  else if (toupper(suffix) == 'M') {
+  else if (toupper((int)suffix) == 'M') {
     size *= 1024UL*1024UL;
   }
-  else if (isalpha(suffix)) {
+  else if (isalpha((int)suffix)) {
     failed = true;
   }
 
@@ -743,6 +743,8 @@
 #define CONFIGURE_SHELL_COMMANDS_INIT
 #define CONFIGURE_SHELL_COMMANDS_ALL
 #define CONFIGURE_SHELL_MOUNT_MSDOS
+#define CONFIGURE_SHELL_MOUNT_RFS
+#define CONFIGURE_SHELL_DEBUGRFS
 
 #include <rtems/shellconfig.h>
 #endif

diff -u rtems/testsuites/samples/iostream/init.cc:1.3 rtems/testsuites/samples/iostream/init.cc:1.4
--- rtems/testsuites/samples/iostream/init.cc:1.3	Tue Apr 28 00:04:11 2009
+++ rtems/testsuites/samples/iostream/init.cc	Tue Jun  1 19:47:15 2010
@@ -20,8 +20,11 @@
  *  $Id$
  */
 
+extern "C" {
+
 #define CONFIGURE_INIT
 #include "system.h"
+}
 
 #if BSP_SMALL_MEMORY
 #include <stdio.h>
@@ -31,6 +34,7 @@
 
 #include <stdlib.h>
 
+
 rtems_task Init(
   rtems_task_argument ignored
 )

diff -u rtems/testsuites/samples/iostream/system.h:1.5 rtems/testsuites/samples/iostream/system.h:1.6
--- rtems/testsuites/samples/iostream/system.h:1.5	Tue Apr 28 01:39:01 2009
+++ rtems/testsuites/samples/iostream/system.h	Tue Jun  1 19:47:15 2010
@@ -32,6 +32,7 @@
 #define CONFIGURE_INIT_TASK_STACK_SIZE    (RTEMS_MINIMUM_STACK_SIZE * 2)
 #define CONFIGURE_EXTRA_TASK_STACKS       RTEMS_MINIMUM_STACK_SIZE
 
+/* Only remove when this macro is removed from confdefs.h. It tests it. */
 #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
 
 #include <rtems/confdefs.h>


 *ccj*:
2010-06-02      Chris Johns <chrisj at rtems.org>

        * psxfile01/test.c, psxmount/test.c, psxreaddir/test.c,
        psxstat/test.c: Update to the new mount API.

M  1.264  testsuites/psxtests/ChangeLog
M   1.23  testsuites/psxtests/psxfile01/test.c
M   1.15  testsuites/psxtests/psxmount/test.c
M   1.19  testsuites/psxtests/psxreaddir/test.c
M   1.26  testsuites/psxtests/psxstat/test.c

diff -u rtems/testsuites/psxtests/ChangeLog:1.263 rtems/testsuites/psxtests/ChangeLog:1.264
--- rtems/testsuites/psxtests/ChangeLog:1.263	Sat May 29 00:31:45 2010
+++ rtems/testsuites/psxtests/ChangeLog	Tue Jun  1 19:50:37 2010
@@ -1,3 +1,8 @@
+2010-06-02 	Chris Johns <chrisj at rtems.org>
+
+	* psxfile01/test.c, psxmount/test.c, psxreaddir/test.c,
+	psxstat/test.c: Update to the new mount API.
+
 2010-05-29	Ralf Corsépius <ralf.corsepius at rtems.org>
 
 	* configure.ac: Add AC_CHECK_SIZEOF(off_t).

diff -u rtems/testsuites/psxtests/psxfile01/test.c:1.22 rtems/testsuites/psxtests/psxfile01/test.c:1.23
--- rtems/testsuites/psxtests/psxfile01/test.c:1.22	Mon May 17 12:56:13 2010
+++ rtems/testsuites/psxtests/psxfile01/test.c	Tue Jun  1 19:50:37 2010
@@ -40,6 +40,7 @@
 char test_write_buffer[ 1024 ];
 rtems_filesystem_operations_table  IMFS_ops_no_evalformake;
 rtems_filesystem_operations_table  IMFS_ops_no_rename;
+
 /*
  *  File test support routines.
  */
@@ -118,11 +119,12 @@
 }
 
 int no_evalformake_IMFS_initialize(
-  rtems_filesystem_mount_table_entry_t *temp_mt_entry
+  rtems_filesystem_mount_table_entry_t *mt_entry,
+  const void                           *data
 )
 {
    return IMFS_initialize_support(
-     temp_mt_entry,
+     mt_entry,
      &IMFS_ops_no_evalformake,
      &IMFS_memfile_handlers,
      &IMFS_directory_handlers
@@ -130,11 +132,12 @@
 }
 
 int no_rename_IMFS_initialize(
-  rtems_filesystem_mount_table_entry_t *temp_mt_entry
+  rtems_filesystem_mount_table_entry_t *mt_entry,
+  const void                           *data
 )
 {
    return IMFS_initialize_support(
-     temp_mt_entry,
+     mt_entry,
      &IMFS_ops_no_rename,
      &IMFS_memfile_handlers,
      &IMFS_directory_handlers
@@ -170,7 +173,6 @@
   time_t            ctime2;
   rtems_status_code rtems_status;
   rtems_time_of_day time;
-  rtems_filesystem_mount_table_entry_t *mt_entry;
 
   IMFS_ops_no_evalformake = IMFS_ops;
   IMFS_ops_no_rename = IMFS_ops;
@@ -181,7 +183,14 @@
   IMFS_ops_no_rename.fsmount_me_h = no_rename_IMFS_initialize;
   IMFS_ops_no_rename.rename_h = NULL;
 
-
+  puts( "register no eval-for-make filesystem" );
+  status = rtems_filesystem_register( "nefm", no_evalformake_IMFS_initialize );
+  rtems_test_assert( status == 0 );
+  
+  puts( "register no rename filesystem" );
+  status = rtems_filesystem_register( "nren", no_rename_IMFS_initialize );
+  rtems_test_assert( status == 0 );
+  
   printf( "\n\n*** FILE TEST 1 ***\n" );
 
   /*
@@ -418,11 +427,8 @@
   rtems_test_assert(status == 0);
 
   puts("mounting filesystem with IMFS_ops at /imfs");
-  status = mount(&mt_entry, &IMFS_ops, 
-		 RTEMS_FILESYSTEM_READ_WRITE, 
-		 NULL, "/imfs");
+  status = mount("null", "/imfs", "imfs", RTEMS_FILESYSTEM_READ_WRITE, NULL);
   rtems_test_assert(status == 0);
-  rtems_test_assert(mt_entry != NULL);
   puts("creating directory /imfs/test (on newly mounted filesystem)");
   status = mkdir("/imfs/test", 0777);
   rtems_test_assert(status == 0);
@@ -448,11 +454,8 @@
 
   puts("Mounting filesystem @ /imfs with no support for evalformake");
   
-  status = mount(&mt_entry, &IMFS_ops_no_evalformake, 
-		 RTEMS_FILESYSTEM_READ_WRITE, 
-		 NULL, "/imfs");
+  status = mount("null", "/imfs", "nefm", RTEMS_FILESYSTEM_READ_WRITE, NULL);
   rtems_test_assert(status == 0);
-  rtems_test_assert(mt_entry != NULL);
 
   puts("change directory to /imfs");
   status = chdir("/imfs");
@@ -473,11 +476,8 @@
 
 
   puts("Mounting filesystem @ /imfs with no support for rename");
-  status = mount(&mt_entry, &IMFS_ops_no_rename, 
-		 RTEMS_FILESYSTEM_READ_WRITE, 
-		 NULL, "/imfs");
+  status = mount("null", "/imfs", "nren", RTEMS_FILESYSTEM_READ_WRITE, NULL);
   rtems_test_assert(status == 0);
-  rtems_test_assert(mt_entry != NULL);
 
   puts("creating directory /imfs/test");
   status = mkdir("/imfs/test", 0777);

diff -u rtems/testsuites/psxtests/psxmount/test.c:1.14 rtems/testsuites/psxtests/psxmount/test.c:1.15
--- rtems/testsuites/psxtests/psxmount/test.c:1.14	Tue Dec  8 11:52:53 2009
+++ rtems/testsuites/psxtests/psxmount/test.c	Tue Jun  1 19:50:37 2010
@@ -35,7 +35,6 @@
 #include <errno.h>
 #include <rtems.h>
 #include <rtems/libio.h>
-#include <rtems/imfs.h>
 #include <pmacros.h>
 
 extern rtems_filesystem_location_info_t rtems_filesystem_current;
@@ -96,7 +95,6 @@
   int fd;
   int status;
   struct stat statbuf;
-  rtems_filesystem_mount_table_entry_t *mt_entry;
   static char mount_point_string[25] = { "/c/z/my_mount_point" };
 
 
@@ -157,18 +155,13 @@
 
   printf("Attempting to mount IMFS file system at /c/z/my_mount_point \n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
-     RTEMS_FILESYSTEM_READ_WRITE,
-     NULL,
-     mount_point_string );
+    "null",
+    mount_point_string,
+    "imfs",
+    RTEMS_FILESYSTEM_READ_WRITE,
+    NULL );
   rtems_test_assert(  status == 0 );
-  if( mt_entry == NULL ){
-     printf(" NULL mount table entry was returned\n");
-  }
-  else {
-     printf("2nd file system successfully mounted at /c/z/my_mount_point \n");
-  }
+  printf("2nd file system successfully mounted at /c/z/my_mount_point \n");
 
   /*
    * Change directory to the mount point and create a group of files under
@@ -218,11 +211,11 @@
 
   printf("Mount a NULL file system and verify EINVAL\n");
   status = mount(
-   &mt_entry,
-   NULL,
-   RTEMS_FILESYSTEM_READ_WRITE,
-   NULL,
-   mount_point_string );
+    "null",
+    mount_point_string,
+    "nofound",
+    RTEMS_FILESYSTEM_READ_WRITE,
+    NULL );
   rtems_test_assert(  status == -1 );
   rtems_test_assert(  errno == EINVAL );
 
@@ -232,11 +225,11 @@
 
   printf("mount with option of -62 should fail with EINVAL\n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
-     -62,
-     NULL,
-     "/c/y/my_mount_point" );
+    "null",
+    "/c/y/my_mount_point",
+    "imfs",
+    -62,
+    NULL );
   rtems_test_assert(  status == -1 );
   rtems_test_assert(  errno == EINVAL );
 
@@ -246,18 +239,13 @@
 
   printf("Mount a Read Only filesystem at /c/y/my_mount_point \n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
-     RTEMS_FILESYSTEM_READ_ONLY,
-     NULL,
-     "/c/y/my_mount_point" );
+    "null",
+    "/c/y/my_mount_point",
+    "imfs",
+    RTEMS_FILESYSTEM_READ_ONLY,
+    NULL );
   rtems_test_assert(  status == 0 );
-  if( mt_entry == NULL ){
-     printf(" NULL mount table entry was returned\n");
-  }
-  else {
-     printf("Read only file system successfully mounted at /c/y/my_mount_point \n");
-  }
+  printf("Read only file system successfully mounted at /c/y/my_mount_point \n");
 
   /*
    * Create a directory that passes through the read only file system.
@@ -277,11 +265,11 @@
 
   printf("Verify a mount point returns EBUSY for another mount\n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
+    "null",
+    "/c/y/my_mount_point",
+    "imfs",
      RTEMS_FILESYSTEM_READ_ONLY,
-     NULL,
-     "/c/y/my_mount_point" );
+     NULL );
   rtems_test_assert(  status == -1 );
   rtems_test_assert(  errno == EBUSY);
 
@@ -291,11 +279,11 @@
 
   printf("Mount on a file should fail with ENOTDIR\n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
-     RTEMS_FILESYSTEM_READ_ONLY,
-     NULL,
-     "/b/my_file" );
+    "null",
+    "/b/my_file",
+    "imfs",
+    RTEMS_FILESYSTEM_READ_ONLY,
+    NULL );
   rtems_test_assert(  status == -1 );
   rtems_test_assert(  errno == ENOTDIR );
 
@@ -343,11 +331,11 @@
 
   printf("Mount /c/y/my_mount_point\n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
-     RTEMS_FILESYSTEM_READ_ONLY,
-     NULL,
-     "/c/y/my_mount_point" );
+    "null",
+    "/c/y/my_mount_point",
+    "imfs",
+    RTEMS_FILESYSTEM_READ_ONLY,
+    NULL );
   rtems_test_assert(  status == 0 );
 
   /*
@@ -392,11 +380,11 @@
 
   printf("Mount a file system at /c/y/my_mount_point/my_dir\n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
+     "null",
+     "/c/y/my_mount_point/my_dir",
+     "imfs",
      RTEMS_FILESYSTEM_READ_WRITE,
-     NULL,
-     "/c/y/my_mount_point/my_dir");
+     NULL );
   rtems_test_assert(  status == 0 );
 
   printf("unmount /c/y/my_mount_point should fail with EBUSY\n");

diff -u rtems/testsuites/psxtests/psxreaddir/test.c:1.18 rtems/testsuites/psxtests/psxreaddir/test.c:1.19
--- rtems/testsuites/psxtests/psxreaddir/test.c:1.18	Sun Apr 25 14:17:52 2010
+++ rtems/testsuites/psxtests/psxreaddir/test.c	Tue Jun  1 19:50:37 2010
@@ -183,8 +183,7 @@
 
 void test_across_mount(void)
 {
-  rtems_filesystem_mount_table_entry_t *mt_entry;
-  int                                  status;
+  int status;
 
   /*
    * Verify Readdir works correctly over mount points.
@@ -196,15 +195,12 @@
   complete_printdir("/imfs" );
   printf("Attempting to mount IMFS file system at /imfs \n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
+    "null",
+    "/imfs",
+    "imfs",
      RTEMS_FILESYSTEM_READ_WRITE,
-     NULL,
-     "/imfs" );
+     NULL );
   rtems_test_assert( status == 0 );
-  if( mt_entry == NULL ){
-     printf(" NULL mount table entry was returned\n");
-  }
   printf( "create /imfs/testdir and /imfs/testdir/testsubdir\n");
 
   status = mkdir( "/imfs/testdir", 0777 );

diff -u rtems/testsuites/psxtests/psxstat/test.c:1.25 rtems/testsuites/psxtests/psxstat/test.c:1.26
--- rtems/testsuites/psxtests/psxstat/test.c:1.25	Tue Dec  8 11:52:53 2009
+++ rtems/testsuites/psxtests/psxstat/test.c	Tue Jun  1 19:50:37 2010
@@ -468,7 +468,6 @@
   int                                   fd;
   int                                   status;
   char                                  longer_name[100];
-  rtems_filesystem_mount_table_entry_t *mt_entry;
 
   /*
    * Verify chmod with an invalid type.
@@ -650,11 +649,11 @@
 
   printf("Attempting to mount IMFS file system at /dir1/my_mount_point \n");
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
+    "null",
+    "/my_mount_point/dir1/my_mount_point",
+    "imfs",
      RTEMS_FILESYSTEM_READ_WRITE,
-     NULL,
-     "/my_mount_point/dir1/my_mount_point" );
+     NULL );
   rtems_test_assert( status == 0 );
 
   printf("rmdir /dir1/my_mount_point should fail with EBUSY\n");
@@ -730,9 +729,8 @@
 )
 #endif
 {
-  rtems_status_code                    status;
-  rtems_time_of_day                    time;
-  rtems_filesystem_mount_table_entry_t *mt_entry;
+  rtems_status_code status;
+  rtems_time_of_day time;
 
   puts( "\n\n*** STAT TEST 01 ***" );
 
@@ -749,11 +747,11 @@
   status = mkdir("/my_mount_point",  S_IRWXU );
   rtems_test_assert( status == 0 );
   status = mount(
-     &mt_entry,
-     &IMFS_ops,
+    "null",
+    "my_mount_point",
+    "imfs",
      RTEMS_FILESYSTEM_READ_WRITE,
-     NULL,
-     "my_mount_point" );
+     NULL );
   rtems_test_assert( status == 0 );
   status = chdir( "/my_mount_point" );
   rtems_test_assert( status == 0 );



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100601/4883580a/attachment.html>


More information about the vc mailing list