diff options
| author | Chris Johns <chrisj@rtems.org> | 2010-06-02 00:47:15 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2010-06-02 00:47:15 +0000 |
| commit | 558a5f48fc8295dcb51735ffa1c841ac9ab67d23 (patch) | |
| tree | 3ad3d8c8ae16a7bd241b4992f0227387bc6e71bd /testsuites/samples/fileio/init.c | |
| parent | 2010-06-01 Chris Johns <chrisj@rtems.org> (diff) | |
| download | rtems-558a5f48fc8295dcb51735ffa1c841ac9ab67d23.tar.bz2 | |
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.
Diffstat (limited to 'testsuites/samples/fileio/init.c')
| -rw-r--r-- | testsuites/samples/fileio/init.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/testsuites/samples/fileio/init.c b/testsuites/samples/fileio/init.c index 5d2945dc34..0559f91016 100644 --- a/testsuites/samples/fileio/init.c +++ b/testsuites/samples/fileio/init.c @@ -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 @@ static bool fileio_str2size(const char *str,uint32_t *res_ptr) 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 @@ static rtems_shell_alias_t Shell_USERECHO_Alias = { #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 |