<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-06-01)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-01 Chris Johns <chrisj@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++.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2344&r2=text&tr2=1.2345&diff_format=h">M</a></td><td width='1%'>1.2345</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libcsupport/include/rtems/libio.h.diff?r1=text&tr1=1.64&r2=text&tr2=1.65&diff_format=h">M</a></td><td width='1%'>1.65</td><td width='100%'>cpukit/libcsupport/include/rtems/libio.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/sapi/include/confdefs.h.diff?r1=text&tr1=1.133&r2=text&tr2=1.134&diff_format=h">M</a></td><td width='1%'>1.134</td><td width='100%'>cpukit/sapi/include/confdefs.h</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2010-06-01<span style="background-color: #FF0000"> </span> Chris Johns <chrisj@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++.
+
</font> 2010-06-01<span style="background-color: #FF0000"> </span> Ralf Corsépius <ralf.corsepius@rtems.org>
* libmisc/shell/print-ls.c: Remove (long) cast of st_ino.
<font color='#006600'>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
</font><font color='#997700'>@@ -292,7 +292,7 @@
</font> /*
* File system table used by mount to manage file systems.
*/
<font color='#880000'>-typedef struct _rtems_filesystem_table {
</font><font color='#000088'>+typedef struct rtems_filesystem_table_t {
</font> const char *type;
rtems_filesystem_fsmount_me_t mount_h;
} rtems_filesystem_table_t;
<font color='#997700'>@@ -300,7 +300,7 @@
</font> /*
* File system table runtime loaded nodes.
*/
<font color='#880000'>-typedef struct _rtems_filesystem_table_node {
</font><font color='#000088'>+typedef struct rtems_filesystem_table_node_t {
</font> rtems_chain_node node;
rtems_filesystem_table_t entry;
} rtems_filesystem_table_node_t;
<font color='#006600'>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
</font><font color='#997700'>@@ -72,7 +72,6 @@
</font> #define CONFIGURE_NEWLIB_EXTENSION 0
#endif
<font color='#880000'>-
</font> #include <rtems/libio.h>
#ifdef CONFIGURE_INIT
<font color='#997700'>@@ -230,12 +229,16 @@
</font> /*
* If disabling the file system undef everything. If DEVFS as the base
* filesystem undefine all other filesystems because you cannot mount other
<font color='#880000'>- * filesystems.
</font><font color='#000088'>+ * filesystems. Same for miniIMFS.
</font> */
#if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) || \
<font color='#880000'>- defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
</font><font color='#000088'>+ defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
+ defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
</font> #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM)
#undef CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
<font color='#000088'>+ #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
+ #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
+ #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
</font> #endif
#undef CONFIGURE_FILESYSTEM_miniIMFS
#undef CONFIGURE_FILESYSTEM_IMFS
<font color='#997700'>@@ -251,9 +254,10 @@
</font> * If the base filesystem is DEVFS define it else define IMFS.
* We will have either DEVFS or IMFS defined after this.
*/
<font color='#880000'>- #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) && \
- !defined(CONFIGURE_FILESYSTEM_DEVFS)
</font><font color='#000088'>+ #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
</font> #define CONFIGURE_FILESYSTEM_DEVFS
<font color='#000088'>+ #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
+ #define CONFIGURE_FILESYSTEM_miniIMFS
</font> #elif !defined(CONFIGURE_FILESYSTEM_IMFS)
#define CONFIGURE_FILESYSTEM_IMFS
#endif
<font color='#997700'>@@ -276,10 +280,6 @@
</font> IMFS_MEMFILE_DEFAULT_BYTES_PER_BLOCK
#endif
<font color='#880000'>-#ifdef CONFIGURE_INIT
- int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
-#endif /* CONFIGURE_INIT */
-
</font> /**
* This defines the miniIMFS file system table entry.
*/<span style="background-color: #FF0000"> </span>
<font color='#997700'>@@ -357,7 +357,8 @@
</font> /*
* DEVFS variables.
*/
<font color='#880000'>- #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) && !defined(RTEMS_COVERAGE)
</font><font color='#000088'>+ #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) && \
+ !defined(RTEMS_COVERAGE)
</font> #define CONFIGURE_MEMORY_FOR_DEVFS 0
#elif defined(CONFIGURE_FILESYSTEM_DEVFS)
#ifndef CONFIGURE_MAXIMUM_DEVICES
<font color='#997700'>@@ -375,6 +376,11 @@
</font> #define CONFIGURE_MEMORY_FOR_DEVFS 0
#endif
<font color='#000088'>+ #if defined(CONFIGURE_FILESYSTEM_IMFS) || \
+ defined(CONFIGURE_FILESYSTEM_miniIMFS)
+ int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
+ #endif
+
</font> /**
* Table termination record.
*/
<font color='#997700'>@@ -383,7 +389,10 @@
</font> /**
* The default file system table. Must be terminated with the NULL entry if
* you provide your own.
<font color='#000088'>+ *
+ * The extern is needed to stop the table being removed by the optimizer.
</font> */
<font color='#000088'>+ extern const rtems_filesystem_table_t configuration_filesystem_table[];
</font> #ifndef CONFIGURE_HAS_OWN_FILESYSTEM_TABLE
const rtems_filesystem_table_t configuration_filesystem_table[] = {
#if defined(CONFIGURE_FILESYSTEM_miniIMFS) && \
<font color='#997700'>@@ -428,7 +437,7 @@
</font> * NOTE: When building for coverage, we need this variable all the time.
*/
#if !defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
<font color='#880000'>- defined(RTEMS_COVERAGE)
</font><font color='#000088'>+ defined(RTEMS_COVERAGE)
</font> #if defined(CONFIGURE_PIPES_ENABLED)
bool rtems_pipe_configured = true;
#else
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/ChangeLog.diff?r1=text&tr1=1.176&r2=text&tr2=1.177&diff_format=h">M</a></td><td width='1%'>1.177</td><td width='100%'>testsuites/samples/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/fileio/init.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>testsuites/samples/fileio/init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/iostream/init.cc.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>testsuites/samples/iostream/init.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/iostream/system.h.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>testsuites/samples/iostream/system.h</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2010-06-02<span style="background-color: #FF0000"> </span> 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.
+
</font> 2010-04-04 Ralf Corsépius <ralf.corsepius@rtems.org>
* capture/init.c: Remove unused variable "out".
<font color='#006600'>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
</font><font color='#997700'>@@ -44,50 +44,50 @@
</font> */
fstab_t fs_table[] = {
{
<font color='#880000'>- "/dev/hda1","/mnt/hda1",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hda1","/mnt/hda1", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hda2","/mnt/hda2",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hda2","/mnt/hda2", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hda3","/mnt/hda3",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hda3","/mnt/hda3", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hda4","/mnt/hda4",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hda4","/mnt/hda4", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hdc1","/mnt/hdc1",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hdc1","/mnt/hdc1", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hdc2","/mnt/hdc2",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hdc2","/mnt/hdc2", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hdc3","/mnt/hdc3",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hdc3","/mnt/hdc3", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
},
{
<font color='#880000'>- "/dev/hdc4","/mnt/hdc4",
- &msdos_ops, RTEMS_FILESYSTEM_READ_WRITE,
</font><font color='#000088'>+ "/dev/hdc4","/mnt/hdc4", "dosfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
</font> FSMOUNT_MNT_OK | FSMOUNT_MNTPNT_CRTERR | FSMOUNT_MNT_FAILED,
0
}
<font color='#997700'>@@ -321,13 +321,13 @@
</font> if (1 > sscanf(str,"%lu%c",&size,&suffix)) {
failed = true;
}
<font color='#880000'>- else if (toupper(suffix) == 'K') {
</font><font color='#000088'>+ else if (toupper((int)suffix) == 'K') {
</font> size *= 1024;
}
<font color='#880000'>- else if (toupper(suffix) == 'M') {
</font><font color='#000088'>+ else if (toupper((int)suffix) == 'M') {
</font> size *= 1024UL*1024UL;
}
<font color='#880000'>- else if (isalpha(suffix)) {
</font><font color='#000088'>+ else if (isalpha((int)suffix)) {
</font> failed = true;
}
<font color='#997700'>@@ -743,6 +743,8 @@
</font> #define CONFIGURE_SHELL_COMMANDS_INIT
#define CONFIGURE_SHELL_COMMANDS_ALL
#define CONFIGURE_SHELL_MOUNT_MSDOS
<font color='#000088'>+#define CONFIGURE_SHELL_MOUNT_RFS
+#define CONFIGURE_SHELL_DEBUGRFS
</font>
#include <rtems/shellconfig.h>
#endif
<font color='#006600'>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
</font><font color='#997700'>@@ -20,8 +20,11 @@
</font> * $Id$
*/
<font color='#000088'>+extern "C" {
+
</font> #define CONFIGURE_INIT
#include "system.h"
<font color='#000088'>+}
</font>
#if BSP_SMALL_MEMORY
#include <stdio.h>
<font color='#997700'>@@ -31,6 +34,7 @@
</font>
#include <stdlib.h>
<font color='#000088'>+
</font> rtems_task Init(
rtems_task_argument ignored
)
<font color='#006600'>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
</font><font color='#997700'>@@ -32,6 +32,7 @@
</font> #define CONFIGURE_INIT_TASK_STACK_SIZE (RTEMS_MINIMUM_STACK_SIZE * 2)
#define CONFIGURE_EXTRA_TASK_STACKS RTEMS_MINIMUM_STACK_SIZE
<font color='#000088'>+/* Only remove when this macro is removed from confdefs.h. It tests it. */
</font> #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
#include <rtems/confdefs.h>
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-02 Chris Johns <chrisj@rtems.org>
* psxfile01/test.c, psxmount/test.c, psxreaddir/test.c,
psxstat/test.c: Update to the new mount API.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/ChangeLog.diff?r1=text&tr1=1.263&r2=text&tr2=1.264&diff_format=h">M</a></td><td width='1%'>1.264</td><td width='100%'>testsuites/psxtests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/psxfile01/test.c.diff?r1=text&tr1=1.22&r2=text&tr2=1.23&diff_format=h">M</a></td><td width='1%'>1.23</td><td width='100%'>testsuites/psxtests/psxfile01/test.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/psxmount/test.c.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>testsuites/psxtests/psxmount/test.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/psxreaddir/test.c.diff?r1=text&tr1=1.18&r2=text&tr2=1.19&diff_format=h">M</a></td><td width='1%'>1.19</td><td width='100%'>testsuites/psxtests/psxreaddir/test.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtests/psxstat/test.c.diff?r1=text&tr1=1.25&r2=text&tr2=1.26&diff_format=h">M</a></td><td width='1%'>1.26</td><td width='100%'>testsuites/psxtests/psxstat/test.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-06-02<span style="background-color: #FF0000"> </span> Chris Johns <chrisj@rtems.org>
+
+ * psxfile01/test.c, psxmount/test.c, psxreaddir/test.c,
+ psxstat/test.c: Update to the new mount API.
+
</font> 2010-05-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Add AC_CHECK_SIZEOF(off_t).
<font color='#006600'>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
</font><font color='#997700'>@@ -40,6 +40,7 @@
</font> char test_write_buffer[ 1024 ];
rtems_filesystem_operations_table IMFS_ops_no_evalformake;
rtems_filesystem_operations_table IMFS_ops_no_rename;
<font color='#000088'>+
</font> /*
* File test support routines.
*/
<font color='#997700'>@@ -118,11 +119,12 @@
</font> }
int no_evalformake_IMFS_initialize(
<font color='#880000'>- rtems_filesystem_mount_table_entry_t *temp_mt_entry
</font><font color='#000088'>+ rtems_filesystem_mount_table_entry_t *mt_entry,
+ const void *data
</font> )
{
return IMFS_initialize_support(
<font color='#880000'>- temp_mt_entry,
</font><font color='#000088'>+ mt_entry,
</font> &IMFS_ops_no_evalformake,
&IMFS_memfile_handlers,
&IMFS_directory_handlers
<font color='#997700'>@@ -130,11 +132,12 @@
</font> }
int no_rename_IMFS_initialize(
<font color='#880000'>- rtems_filesystem_mount_table_entry_t *temp_mt_entry
</font><font color='#000088'>+ rtems_filesystem_mount_table_entry_t *mt_entry,
+ const void *data
</font> )
{
return IMFS_initialize_support(
<font color='#880000'>- temp_mt_entry,
</font><font color='#000088'>+ mt_entry,
</font> &IMFS_ops_no_rename,
&IMFS_memfile_handlers,
&IMFS_directory_handlers
<font color='#997700'>@@ -170,7 +173,6 @@
</font> time_t ctime2;
rtems_status_code rtems_status;
rtems_time_of_day time;
<font color='#880000'>- rtems_filesystem_mount_table_entry_t *mt_entry;
</font>
IMFS_ops_no_evalformake = IMFS_ops;
IMFS_ops_no_rename = IMFS_ops;
<font color='#997700'>@@ -181,7 +183,14 @@
</font> IMFS_ops_no_rename.fsmount_me_h = no_rename_IMFS_initialize;
IMFS_ops_no_rename.rename_h = NULL;
<font color='#880000'>-
</font><font color='#000088'>+ puts( "register no eval-for-make filesystem" );
+ status = rtems_filesystem_register( "nefm", no_evalformake_IMFS_initialize );
+ rtems_test_assert( status == 0 );
+<span style="background-color: #FF0000"> </span>
+ puts( "register no rename filesystem" );
+ status = rtems_filesystem_register( "nren", no_rename_IMFS_initialize );
+ rtems_test_assert( status == 0 );
+<span style="background-color: #FF0000"> </span>
</font> printf( "\n\n*** FILE TEST 1 ***\n" );
/*
<font color='#997700'>@@ -418,11 +427,8 @@
</font> rtems_test_assert(status == 0);
puts("mounting filesystem with IMFS_ops at /imfs");
<font color='#880000'>- status = mount(&mt_entry, &IMFS_ops,<span style="background-color: #FF0000"> </span>
- RTEMS_FILESYSTEM_READ_WRITE,<span style="background-color: #FF0000"> </span>
- NULL, "/imfs");
</font><font color='#000088'>+ status = mount("null", "/imfs", "imfs", RTEMS_FILESYSTEM_READ_WRITE, NULL);
</font> rtems_test_assert(status == 0);
<font color='#880000'>- rtems_test_assert(mt_entry != NULL);
</font> puts("creating directory /imfs/test (on newly mounted filesystem)");
status = mkdir("/imfs/test", 0777);
rtems_test_assert(status == 0);
<font color='#997700'>@@ -448,11 +454,8 @@
</font>
puts("Mounting filesystem @ /imfs with no support for evalformake");
<font color='#880000'>- status = mount(&mt_entry, &IMFS_ops_no_evalformake,<span style="background-color: #FF0000"> </span>
- RTEMS_FILESYSTEM_READ_WRITE,<span style="background-color: #FF0000"> </span>
- NULL, "/imfs");
</font><font color='#000088'>+ status = mount("null", "/imfs", "nefm", RTEMS_FILESYSTEM_READ_WRITE, NULL);
</font> rtems_test_assert(status == 0);
<font color='#880000'>- rtems_test_assert(mt_entry != NULL);
</font>
puts("change directory to /imfs");
status = chdir("/imfs");
<font color='#997700'>@@ -473,11 +476,8 @@
</font>
puts("Mounting filesystem @ /imfs with no support for rename");
<font color='#880000'>- status = mount(&mt_entry, &IMFS_ops_no_rename,<span style="background-color: #FF0000"> </span>
- RTEMS_FILESYSTEM_READ_WRITE,<span style="background-color: #FF0000"> </span>
- NULL, "/imfs");
</font><font color='#000088'>+ status = mount("null", "/imfs", "nren", RTEMS_FILESYSTEM_READ_WRITE, NULL);
</font> rtems_test_assert(status == 0);
<font color='#880000'>- rtems_test_assert(mt_entry != NULL);
</font>
puts("creating directory /imfs/test");
status = mkdir("/imfs/test", 0777);
<font color='#006600'>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
</font><font color='#997700'>@@ -35,7 +35,6 @@
</font> #include <errno.h>
#include <rtems.h>
#include <rtems/libio.h>
<font color='#880000'>-#include <rtems/imfs.h>
</font> #include <pmacros.h>
extern rtems_filesystem_location_info_t rtems_filesystem_current;
<font color='#997700'>@@ -96,7 +95,6 @@
</font> int fd;
int status;
struct stat statbuf;
<font color='#880000'>- rtems_filesystem_mount_table_entry_t *mt_entry;
</font> static char mount_point_string[25] = { "/c/z/my_mount_point" };
<font color='#997700'>@@ -157,18 +155,13 @@
</font>
printf("Attempting to mount IMFS file system at /c/z/my_mount_point \n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
- RTEMS_FILESYSTEM_READ_WRITE,
- NULL,
- mount_point_string );
</font><font color='#000088'>+ "null",
+ mount_point_string,
+ "imfs",
+ RTEMS_FILESYSTEM_READ_WRITE,
+ NULL );
</font> rtems_test_assert( status == 0 );
<font color='#880000'>- 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");
- }
</font><font color='#000088'>+ printf("2nd file system successfully mounted at /c/z/my_mount_point \n");
</font>
/*
* Change directory to the mount point and create a group of files under
<font color='#997700'>@@ -218,11 +211,11 @@
</font>
printf("Mount a NULL file system and verify EINVAL\n");
status = mount(
<font color='#880000'>- &mt_entry,
- NULL,
- RTEMS_FILESYSTEM_READ_WRITE,
- NULL,
- mount_point_string );
</font><font color='#000088'>+ "null",
+ mount_point_string,
+ "nofound",
+ RTEMS_FILESYSTEM_READ_WRITE,
+ NULL );
</font> rtems_test_assert( status == -1 );
rtems_test_assert( errno == EINVAL );
<font color='#997700'>@@ -232,11 +225,11 @@
</font>
printf("mount with option of -62 should fail with EINVAL\n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
- -62,
- NULL,
- "/c/y/my_mount_point" );
</font><font color='#000088'>+ "null",
+ "/c/y/my_mount_point",
+ "imfs",
+ -62,
+ NULL );
</font> rtems_test_assert( status == -1 );
rtems_test_assert( errno == EINVAL );
<font color='#997700'>@@ -246,18 +239,13 @@
</font>
printf("Mount a Read Only filesystem at /c/y/my_mount_point \n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
- RTEMS_FILESYSTEM_READ_ONLY,
- NULL,
- "/c/y/my_mount_point" );
</font><font color='#000088'>+ "null",
+ "/c/y/my_mount_point",
+ "imfs",
+ RTEMS_FILESYSTEM_READ_ONLY,
+ NULL );
</font> rtems_test_assert( status == 0 );
<font color='#880000'>- 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");
- }
</font><font color='#000088'>+ printf("Read only file system successfully mounted at /c/y/my_mount_point \n");
</font>
/*
* Create a directory that passes through the read only file system.
<font color='#997700'>@@ -277,11 +265,11 @@
</font>
printf("Verify a mount point returns EBUSY for another mount\n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
</font><font color='#000088'>+ "null",
+ "/c/y/my_mount_point",
+ "imfs",
</font> RTEMS_FILESYSTEM_READ_ONLY,
<font color='#880000'>- NULL,
- "/c/y/my_mount_point" );
</font><font color='#000088'>+ NULL );
</font> rtems_test_assert( status == -1 );
rtems_test_assert( errno == EBUSY);
<font color='#997700'>@@ -291,11 +279,11 @@
</font>
printf("Mount on a file should fail with ENOTDIR\n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
- RTEMS_FILESYSTEM_READ_ONLY,
- NULL,
- "/b/my_file" );
</font><font color='#000088'>+ "null",
+ "/b/my_file",
+ "imfs",
+ RTEMS_FILESYSTEM_READ_ONLY,
+ NULL );
</font> rtems_test_assert( status == -1 );
rtems_test_assert( errno == ENOTDIR );
<font color='#997700'>@@ -343,11 +331,11 @@
</font>
printf("Mount /c/y/my_mount_point\n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
- RTEMS_FILESYSTEM_READ_ONLY,
- NULL,
- "/c/y/my_mount_point" );
</font><font color='#000088'>+ "null",
+ "/c/y/my_mount_point",
+ "imfs",
+ RTEMS_FILESYSTEM_READ_ONLY,
+ NULL );
</font> rtems_test_assert( status == 0 );
/*
<font color='#997700'>@@ -392,11 +380,11 @@
</font>
printf("Mount a file system at /c/y/my_mount_point/my_dir\n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
</font><font color='#000088'>+ "null",
+ "/c/y/my_mount_point/my_dir",
+ "imfs",
</font> RTEMS_FILESYSTEM_READ_WRITE,
<font color='#880000'>- NULL,
- "/c/y/my_mount_point/my_dir");
</font><font color='#000088'>+ NULL );
</font> rtems_test_assert( status == 0 );
printf("unmount /c/y/my_mount_point should fail with EBUSY\n");
<font color='#006600'>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
</font><font color='#997700'>@@ -183,8 +183,7 @@
</font>
void test_across_mount(void)
{
<font color='#880000'>- rtems_filesystem_mount_table_entry_t *mt_entry;
- int status;
</font><font color='#000088'>+ int status;
</font>
/*
* Verify Readdir works correctly over mount points.
<font color='#997700'>@@ -196,15 +195,12 @@
</font> complete_printdir("/imfs" );
printf("Attempting to mount IMFS file system at /imfs \n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
</font><font color='#000088'>+ "null",
+ "/imfs",
+ "imfs",
</font> RTEMS_FILESYSTEM_READ_WRITE,
<font color='#880000'>- NULL,
- "/imfs" );
</font><font color='#000088'>+ NULL );
</font> rtems_test_assert( status == 0 );
<font color='#880000'>- if( mt_entry == NULL ){
- printf(" NULL mount table entry was returned\n");
- }
</font> printf( "create /imfs/testdir and /imfs/testdir/testsubdir\n");
status = mkdir( "/imfs/testdir", 0777 );
<font color='#006600'>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
</font><font color='#997700'>@@ -468,7 +468,6 @@
</font> int fd;
int status;
char longer_name[100];
<font color='#880000'>- rtems_filesystem_mount_table_entry_t *mt_entry;
</font>
/*
* Verify chmod with an invalid type.
<font color='#997700'>@@ -650,11 +649,11 @@
</font>
printf("Attempting to mount IMFS file system at /dir1/my_mount_point \n");
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
</font><font color='#000088'>+ "null",
+ "/my_mount_point/dir1/my_mount_point",
+ "imfs",
</font> RTEMS_FILESYSTEM_READ_WRITE,
<font color='#880000'>- NULL,
- "/my_mount_point/dir1/my_mount_point" );
</font><font color='#000088'>+ NULL );
</font> rtems_test_assert( status == 0 );
printf("rmdir /dir1/my_mount_point should fail with EBUSY\n");
<font color='#997700'>@@ -730,9 +729,8 @@
</font> )
#endif
{
<font color='#880000'>- rtems_status_code status;
- rtems_time_of_day time;
- rtems_filesystem_mount_table_entry_t *mt_entry;
</font><font color='#000088'>+ rtems_status_code status;
+ rtems_time_of_day time;
</font>
puts( "\n\n*** STAT TEST 01 ***" );
<font color='#997700'>@@ -749,11 +747,11 @@
</font> status = mkdir("/my_mount_point", S_IRWXU );
rtems_test_assert( status == 0 );
status = mount(
<font color='#880000'>- &mt_entry,
- &IMFS_ops,
</font><font color='#000088'>+ "null",
+ "my_mount_point",
+ "imfs",
</font> RTEMS_FILESYSTEM_READ_WRITE,
<font color='#880000'>- NULL,
- "my_mount_point" );
</font><font color='#000088'>+ NULL );
</font> rtems_test_assert( status == 0 );
status = chdir( "/my_mount_point" );
rtems_test_assert( status == 0 );
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>