RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-06-02 Chris Johns <chrisj@rtems.org>

Browse Source 
* 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.
This commit is contained in:
Chris Johns
2010-06-02 00:47:15 +00:00
parent dfce6724fe
commit 558a5f48fc
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
testsuites/samples/ChangeLog
View File

@@ -1,3 +1,9 @@
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> 2010-04-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* capture/init.c: Remove unused variable "out". * capture/init.c: Remove unused variable "out".

40
testsuites/samples/fileio/init.c
View File

@@ -44,50 +44,50 @@
*/ */
fstab_t fs_table[] = { fstab_t fs_table[] = {
{ {
"/dev/hda1","/mnt/hda1", "/dev/hda1","/mnt/hda1", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hda2","/mnt/hda2", "/dev/hda2","/mnt/hda2", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hda3","/mnt/hda3", "/dev/hda3","/mnt/hda3", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hda4","/mnt/hda4", "/dev/hda4","/mnt/hda4", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hdc1","/mnt/hdc1", "/dev/hdc1","/mnt/hdc1", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hdc2","/mnt/hdc2", "/dev/hdc2","/mnt/hdc2", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hdc3","/mnt/hdc3", "/dev/hdc3","/mnt/hdc3", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
}, },
{ {
"/dev/hdc4","/mnt/hdc4", "/dev/hdc4","/mnt/hdc4", "dosfs",
&msdos_ops, RTEMS_FILESYSTEM_READ_WRITE, RTEMS_FILESYSTEM_READ_WRITE,
FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED, FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0 0
} }
@@ -321,13 +321,13 @@ static bool fileio_str2size(const char *str,uint32_t *res_ptr)
if (1 > sscanf(str,"%lu%c",&size,&suffix)) { if (1 > sscanf(str,"%lu%c",&size,&suffix)) {
failed = true; failed = true;
} }
else if (toupper(suffix) == 'K') { else if (toupper((int)suffix) == 'K') {
size *= 1024; size *= 1024;
} }
else if (toupper(suffix) == 'M') { else if (toupper((int)suffix) == 'M') {
size *= 1024UL*1024UL; size *= 1024UL*1024UL;
} }
else if (isalpha(suffix)) { else if (isalpha((int)suffix)) {
failed = true; failed = true;
} }
@@ -743,6 +743,8 @@ static rtems_shell_alias_t Shell_USERECHO_Alias = {
#define CONFIGURE_SHELL_COMMANDS_INIT #define CONFIGURE_SHELL_COMMANDS_INIT
#define CONFIGURE_SHELL_COMMANDS_ALL #define CONFIGURE_SHELL_COMMANDS_ALL
#define CONFIGURE_SHELL_MOUNT_MSDOS #define CONFIGURE_SHELL_MOUNT_MSDOS
#define CONFIGURE_SHELL_MOUNT_RFS
#define CONFIGURE_SHELL_DEBUGRFS
#include <rtems/shellconfig.h> #include <rtems/shellconfig.h>
#endif #endif

4
testsuites/samples/iostream/init.cc
View File

@@ -20,8 +20,11 @@
* $Id$ * $Id$
*/ */
extern "C" {
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include "system.h" #include "system.h"
}
#if BSP_SMALL_MEMORY #if BSP_SMALL_MEMORY
#include <stdio.h> #include <stdio.h>
@@ -31,6 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
rtems_task Init( rtems_task Init(
rtems_task_argument ignored rtems_task_argument ignored
) )

1
testsuites/samples/iostream/system.h
View File

@@ -32,6 +32,7 @@
#define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2) #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
#define CONFIGURE_EXTRA_TASK_STACKS RTEMS_MINIMUM_STACK_SIZE #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 #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
#include <rtems/confdefs.h> #include <rtems/confdefs.h>