<!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-05-15)</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-05-15 Chris Johns <chrisj@rtems.org>
* libfs/src/imfs/imfs_initsupp.c, libfs/src/imfs/imfs.h,
libfs/src/imfs/imfs_stat.c: PR1419. Return a device for the IMFS.
</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.2292&r2=text&tr2=1.2293&diff_format=h">M</a></td><td width='1%'>1.2293</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/imfs.h.diff?r1=text&tr1=1.38&r2=text&tr2=1.39&diff_format=h">M</a></td><td width='1%'>1.39</td><td width='100%'>cpukit/libfs/src/imfs/imfs.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/imfs_initsupp.c.diff?r1=text&tr1=1.20&r2=text&tr2=1.21&diff_format=h">M</a></td><td width='1%'>1.21</td><td width='100%'>cpukit/libfs/src/imfs/imfs_initsupp.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/imfs_stat.c.diff?r1=text&tr1=1.13&r2=text&tr2=1.14&diff_format=h">M</a></td><td width='1%'>1.14</td><td width='100%'>cpukit/libfs/src/imfs/imfs_stat.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2292 rtems/cpukit/ChangeLog:1.2293
--- rtems/cpukit/ChangeLog:1.2292 Thu May 13 22:59:11 2010
+++ rtems/cpukit/ChangeLog Sat May 15 01:29:55 2010
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+2010-05-15 Chris Johns <chrisj@rtems.org>
+
+ * libfs/src/imfs/imfs_initsupp.c, libfs/src/imfs/imfs.h,
+ libfs/src/imfs/imfs_stat.c: PR1419. Return a device for the IMFS.
+
</font> 2010-05-14 Chris Johns <chrisj@rtems.org>
* libblock/src/flashdisk.c: Clean up on initialisation errors.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/imfs/imfs.h:1.38 rtems/cpukit/libfs/src/imfs/imfs.h:1.39
--- rtems/cpukit/libfs/src/imfs/imfs.h:1.38 Thu Mar 4 00:36:51 2010
+++ rtems/cpukit/libfs/src/imfs/imfs.h Sat May 15 01:29:55 2010
</font><font color='#997700'>@@ -156,6 +156,12 @@
</font> } IMFS_types_union;
/*
<font color='#000088'>+ * Major device number for the IMFS. This is not a real device number because
+ * the IMFS is just a file system and does not have a driver.
+ */
+#define IMFS_DEVICE_MAJOR_NUMBER (0xfffe)
+
+/*
</font> * Maximum length of a "basename" of an IMFS file/node.
*/
<font color='#997700'>@@ -213,6 +219,7 @@
</font> } while (0)
typedef struct {
<font color='#000088'>+ int instance;
</font> ino_t ino_count;
const rtems_filesystem_file_handlers_r *memfile_handlers;
const rtems_filesystem_file_handlers_r *directory_handlers;
<font color='#006600'>diff -u rtems/cpukit/libfs/src/imfs/imfs_initsupp.c:1.20 rtems/cpukit/libfs/src/imfs/imfs_initsupp.c:1.21
--- rtems/cpukit/libfs/src/imfs/imfs_initsupp.c:1.20 Tue Jan 19 13:31:00 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_initsupp.c Sat May 15 01:29:55 2010
</font><font color='#997700'>@@ -69,6 +69,7 @@
</font> const rtems_filesystem_file_handlers_r *directory_handlers
)
{
<font color='#000088'>+ static int imfs_instance;
</font> IMFS_fs_info_t *fs_info;
IMFS_jnode_t *jnode;
<font color='#997700'>@@ -103,6 +104,7 @@
</font> * Set st_ino for the root to 1.
*/
<font color='#000088'>+ fs_info->instance = imfs_instance++;
</font> fs_info->ino_count = 1;
fs_info->memfile_handlers = memfile_handlers;
fs_info->directory_handlers = directory_handlers;
<font color='#006600'>diff -u rtems/cpukit/libfs/src/imfs/imfs_stat.c:1.13 rtems/cpukit/libfs/src/imfs/imfs_stat.c:1.14
--- rtems/cpukit/libfs/src/imfs/imfs_stat.c:1.13 Thu Jun 11 20:53:33 2009
+++ rtems/cpukit/libfs/src/imfs/imfs_stat.c Sat May 15 01:29:55 2010
</font><font color='#997700'>@@ -27,6 +27,7 @@
</font> struct stat *buf
)
{
<font color='#000088'>+ IMFS_fs_info_t *fs_info;
</font> IMFS_jnode_t *the_jnode;
IMFS_device_t *io;
<font color='#997700'>@@ -58,6 +59,14 @@
</font> break;
}
<font color='#000088'>+ /*
+ * The device number of the IMFS is the major number and the minor is the
+ * instance.
+ */
+ fs_info = loc->mt_entry->fs_info;
+ buf->st_dev =
+ rtems_filesystem_make_dev_t( IMFS_DEVICE_MAJOR_NUMBER, fs_info->instance );
+<span style="background-color: #FF0000"> </span>
</font> buf->st_mode = the_jnode->st_mode;
buf->st_nlink = the_jnode->st_nlink;
buf->st_ino = the_jnode->st_ino;
</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>