Index: testsuites/samples/ChangeLog
===================================================================
--- testsuites/samples/ChangeLog	(revision dfce6724fed632447e1c2a1fd837b7f18897bd23)
+++ testsuites/samples/ChangeLog	(revision 558a5f48fc8295dcb51735ffa1c841ac9ab67d23)
@@ -1,2 +1,8 @@
+2010-06-02 	Chris Johns <chrisj@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@rtems.org>
 
Index: testsuites/samples/fileio/init.c
===================================================================
--- testsuites/samples/fileio/init.c	(revision dfce6724fed632447e1c2a1fd837b7f18897bd23)
+++ testsuites/samples/fileio/init.c	(revision 558a5f48fc8295dcb51735ffa1c841ac9ab67d23)
@@ -45,48 +45,48 @@
 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
@@ -322,11 +322,11 @@
     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;
   }
@@ -744,4 +744,6 @@
 #define CONFIGURE_SHELL_COMMANDS_ALL
 #define CONFIGURE_SHELL_MOUNT_MSDOS
+#define CONFIGURE_SHELL_MOUNT_RFS
+#define CONFIGURE_SHELL_DEBUGRFS
 
 #include <rtems/shellconfig.h>
Index: testsuites/samples/iostream/init.cc
===================================================================
--- testsuites/samples/iostream/init.cc	(revision dfce6724fed632447e1c2a1fd837b7f18897bd23)
+++ testsuites/samples/iostream/init.cc	(revision 558a5f48fc8295dcb51735ffa1c841ac9ab67d23)
@@ -21,6 +21,9 @@
  */
 
+extern "C" {
+
 #define CONFIGURE_INIT
 #include "system.h"
+}
 
 #if BSP_SMALL_MEMORY
@@ -31,4 +34,5 @@
 
 #include <stdlib.h>
+
 
 rtems_task Init(
Index: testsuites/samples/iostream/system.h
===================================================================
--- testsuites/samples/iostream/system.h	(revision dfce6724fed632447e1c2a1fd837b7f18897bd23)
+++ testsuites/samples/iostream/system.h	(revision 558a5f48fc8295dcb51735ffa1c841ac9ab67d23)
@@ -33,4 +33,5 @@
 #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
 
